病组调整

bsoft-api/src/main/java/com/bsoft/api/model/SerDisease.java

@@ -24,7 +24,7 @@ public class SerDisease {
 
     private BigDecimal level;
 
-    private BigDecimal orgId;
+    private String orgId;
 
     private String orgName;
 
@@ -110,11 +110,11 @@ public class SerDisease {
         this.level = level;
     }
 
-    public BigDecimal getOrgId() {
+    public String getOrgId() {
         return orgId;
     }
 
-    public void setOrgId(BigDecimal orgId) {
+    public void setOrgId(String orgId) {
         this.orgId = orgId;
     }
 

bsoft-api/src/main/resources/application-test.properties

 #### \u6D4B\u8BD5\u73AF\u5883 ###################################################
-spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_mzx?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://192.168.18.179:3306/scml_mzx?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/mapper/SerDiseaseMapper.xml

@@ -12,7 +12,7 @@
         <result column="MDC_NUM" jdbcType="VARCHAR" property="mdcNum"/>
         <result column="PARENT_ID" jdbcType="DECIMAL" property="parentId"/>
         <result column="LEVEL" jdbcType="DECIMAL" property="level"/>
-        <result column="ORG_ID" jdbcType="DECIMAL" property="orgId"/>
+        <result column="ORG_ID" jdbcType="VARCHAR" property="orgId"/>
         <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
         <result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode"/>
     </resultMap>
@@ -59,14 +59,10 @@
         from SER_DISEASE
     </select>
     <select id="selectByCode" 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
-        from SER_DISEASE d,SER_DISEASE_DOC_RS rs
-        where d.STATE=1
-        and rs.MDC_CODE=d.MDC_CODE and rs.MDC_CODE = #{code,jdbcType=VARCHAR}
-        <if test="deptCode!=null">
-            and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
-        </if>
+        select *
+        from SER_DISEASE d
+        where d.STATE = 1
+          and d.MDC_CODE = #{code,jdbcType=VARCHAR}
     </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,