Skip to content

S
sv-springboot
Commit 921e6fd4 by Suvalue
Options

病组添加分组字段

parent c0d10749
Showing with 40 additions and 16 deletions
bsoft-api/src/main/java/com/bsoft/api/model/SerDisease.java
......@@ -30,6 +30,8 @@ public class SerDisease {
private String parentCode;
private Integer groupType;
public BigDecimal getId() {
return id;
}
......@@ -126,6 +128,14 @@ public class SerDisease {
this.orgName = orgName;
}
public Integer getGroupType() {
return groupType;
}
public void setGroupType(Integer groupType) {
this.groupType = groupType;
}
public String getParentCode() {
return parentCode;
}
......
bsoft-api/src/main/java/com/bsoft/api/model/respmodel/DiseaseLevel.java
......@@ -14,6 +14,7 @@ public class DiseaseLevel {
private BigDecimal level;
private String orgId;
private String orgName;
private Integer groupType;
private List<DiseaseLevel> diseaseLevelList;
public BigDecimal getId() {
......@@ -88,6 +89,14 @@ public class DiseaseLevel {
this.orgName = orgName;
}
public Integer getGroupType() {
return groupType;
}
public void setGroupType(Integer groupType) {
this.groupType = groupType;
}
public List<DiseaseLevel> getDiseaseLevelList() {
return diseaseLevelList;
}
......@@ -103,11 +112,12 @@ public class DiseaseLevel {
", mdcCode='" + mdcCode + '\'' +
", mdcName='" + mdcName + '\'' +
", date=" + date +
", mdcNum=" + mdcNum +
", mdcNum='" + mdcNum + '\'' +
", parentId=" + parentId +
", level=" + level +
", orgId=" + orgId +
", orgId='" + orgId + '\'' +
", orgName='" + orgName + '\'' +
", groupType='" + groupType + '\'' +
", diseaseLevelList=" + diseaseLevelList +
'}';
}
......
bsoft-api/src/main/resources/application-test.properties
#### \u6D4B\u8BD5\u73AF\u5883 ###################################################
spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_sy_test1.0?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_zp_test1.0?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.username=root
spring.datasource.password=Suvalue2016
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
......
bsoft-api/src/main/resources/application.properties
......@@ -20,6 +20,6 @@ mybatis.configuration.call-setters-on-nulls=true
version.number=1.01.0707001
version.date=2020.07.07
version.remarks=\u767B\u5F55\u6DFB\u52A0\u75C5\u6848\u4FE1\u606F
\ No newline at end of file
version.number=1.02.0710001
version.date=2020.07.10
version.remarks=\u75C5\u7EC4\u6DFB\u52A0\u5206\u7EC4\u5B57\u6BB5
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml
......@@ -15,6 +15,7 @@
<result column="ORG_ID" jdbcType="VARCHAR" property="orgId"/>
<result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
<result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode"/>
<result column="GROUP_TYPE" jdbcType="VARCHAR" property="groupType"/>
</resultMap>
<resultMap id="DiseaseLevel" type="com.bsoft.api.model.respmodel.DiseaseLevel">
<id column="ID" jdbcType="DECIMAL" property="id"/>
......@@ -26,6 +27,7 @@
<result column="LEVEL" jdbcType="DECIMAL" property="level"/>
<result column="ORG_ID" jdbcType="VARCHAR" property="orgId"/>
<result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
<result column="GROUP_TYPE" jdbcType="VARCHAR" property="groupType"/>
</resultMap>
<insert id="insert" parameterType="com.bsoft.api.model.SerDisease">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
......@@ -34,12 +36,13 @@
insert into SER_DISEASE (CREATE_DATE, CREATE_USERID, `STATE`,
MDC_CODE, MDC_NAME, `DATE`,
MDC_NUM, PARENT_ID, `LEVEL`,
ORG_ID, ORG_NAME, PARENT_CODE
ORG_ID, ORG_NAME, PARENT_CODE,GROUP_TYPE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL},
#{mdcNum,jdbcType=VARCHAR}, #{parentId,jdbcType=DECIMAL}, #{level,jdbcType=DECIMAL},
#{orgId,jdbcType=DECIMAL}, #{orgName,jdbcType=VARCHAR}, #{parentCode,jdbcType=VARCHAR}
#{orgId,jdbcType=DECIMAL}, #{orgName,jdbcType=VARCHAR}, #{parentCode,jdbcType=VARCHAR},
#{groupType,jdbcType=VARCHAR}
)
</insert>
<select id="selectAll" resultMap="BaseResultMap">
......@@ -55,7 +58,8 @@
`LEVEL`,
ORG_ID,
ORG_NAME,
PARENT_CODE
PARENT_CODE,
GROUP_TYPE
from SER_DISEASE
</select>
<select id="selectByCode" resultMap="BaseResultMap">
......@@ -66,7 +70,7 @@
</select>
<select id="selectByMdcName" resultMap="BaseResultMap">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from SER_DISEASE d,SER_DISEASE_DOC_RS rs
where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
<if test="deptCode!=null">
......@@ -79,7 +83,7 @@
</select>
<select id="selectByLevel" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from SER_DISEASE d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
......@@ -102,7 +106,7 @@
</select>
<select id="selectByLevelNoZBZ" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from SER_DISEASE d
where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
<if test="level!=null">
......@@ -112,7 +116,7 @@
</select>
<select id="selectByParentId" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from SER_DISEASE d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
......@@ -135,7 +139,7 @@
</select>
<select id="selectByParentIdNoZbz" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from SER_DISEASE d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
......@@ -179,7 +183,7 @@
<!-- </select> -->
<select id="selectSonById" resultMap="DiseaseLevel">
select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from SER_DISEASE d
where 1 = 1 and STATE=1 and STATE=1
<if test="diseaseId!=null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment