Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml

@@ -45,8 +45,8 @@

    <select id="selectIcd10List" parameterType="com.smartor.domain.Icd10" resultMap="Icd10Result">
        <include refid="selectIcd10Vo"/>
        <where>
            del_flag=0
        where 1=1
            and del_flag = 0
            <if test="icdcode != null  and icdcode != ''">and icdcode = #{icdcode}</if>
            <if test="lastflag != null  and lastflag != ''">and lastflag = #{lastflag}</if>
            <if test="chimedflag != null  and chimedflag != ''">and chimedflag = #{chimedflag}</if>
@@ -57,7 +57,6 @@
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="hisIcdid != null  and hisIcdid != ''">and his_icdid = #{hisIcdid}</if>
        </where>
    </select>

    <select id="selectIcd10ByIcdid" parameterType="Long" resultMap="Icd10Result">
@@ -103,6 +102,46 @@
        </trim>
    </insert>

    <insert id="batchIcd10">
        insert into icd10
        (
        icdcode,
        icdname,
        icdpym,
        icdwbm,
        orgid,
        del_flag,
        create_by,
        create_time,
        update_by,
        update_time,
        pid,
        guid,
        lastflag,
        chimedflag,
        his_icdid)
        VALUES
        <foreach collection="list" item="item" separator=",">
            (
            #{item.icdcode},
            #{item.icdname},
            #{item.icdpym},
            #{item.icdwbm},
            #{item.orgid},
            #{item.delFlag},
            #{item.createBy},
            #{item.createTime},
            #{item.updateBy},
            #{item.updateTime},
            #{item.pid},
            #{item.guid},
            #{item.lastflag},
            #{item.chimedflag},
            #{item.hisIcdid}
            )
        </foreach>
    </insert>

    <update id="updateIcd10" parameterType="com.smartor.domain.Icd10">
        update icd10
        <trim prefix="SET" suffixOverrides=",">