zjh20250411

zjh

2025-04-11 15dc099b8335a87d2c4d1046f199fb28f4b6338f

zjh20250411

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java

@@ -25,6 +25,7 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.NoTransactionException;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
@@ -212,6 +213,7 @@
    @Transactional
    @PostMapping("/asyncPacs")
    public AjaxResult asyncPacs(@RequestBody String json) {
        try {
        log.info("合并检测同步参数 ->{}",json);
//        try {
//            Thread.sleep(2000);
@@ -411,6 +413,11 @@
            }
            return AjaxResult.success();
        }
        } catch (NoTransactionException e) {
            log.error(String.valueOf(e));
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return AjaxResult.error("同步失败请重试");
        }

    }


 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProAdvicerules.java

@@ -132,6 +132,8 @@
    @ExcelImport(value = "是否重大疾病", kv = "Y-✓")
    private String sfzdjb;

    private String xb;


    @Override
    public String toString() {

 ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml

@@ -25,10 +25,31 @@
            <result property="createBy" column="create_by"/>
            <result property="updateBy" column="update_by"/>
            <result property="deleted" column="deleted"/>
        <result property="xb" column="xb"/>
    </resultMap>

    <sql id="selectTjProAdvicerulesVo">
        select id, bm, ks, jcxm, zyzd, jymc, jynr, fwz, fwzxz, fwzdz, ycbz, sfjb, sfcjb, sfmxb, sfzdjb, create_time, update_time, create_by, update_by, deleted
        select id,
               bm,
               ks,
               jcxm,
               zyzd,
               jymc,
               jynr,
               fwz,
               fwzxz,
               fwzdz,
               ycbz,
               sfjb,
               sfcjb,
               sfmxb,
               sfzdjb,
               create_time,
               update_time,
               create_by,
               update_by,
               deleted,
               xb
        from tj_pro_advicerules
    </sql>

@@ -64,6 +85,9 @@
                        </if>
                        <if test="sfzdjb != null  and sfzdjb != ''">
                            and sfzdjb = #{sfzdjb}
            </if>
            <if test="xb != null  and xb != ''">
                and xb = #{xb}
                        </if>
        </where>
        ORDER BY ks
@@ -118,6 +142,9 @@
                    </if>
                    <if test="deleted != null">deleted,
                    </if>

            <if test="xb != null">xb,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                    <if test="id != null">#{id},
@@ -159,6 +186,8 @@
                    <if test="updateBy != null">#{updateBy},
                    </if>
                    <if test="deleted != null">#{deleted},
            </if>
            <if test="xb != null">#{xb},
                    </if>
        </trim>
    </insert>
@@ -223,13 +252,17 @@
                    <if test="deleted != null">deleted =
                        #{deleted},
                    </if>
            <if test="xb != null">xb =
                #{xb},
            </if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteTjProAdvicerulesById" parameterType="Long">
        delete
        from tj_pro_advicerules where id = #{id}
        from tj_pro_advicerules
        where id = #{id}
    </delete>

    <delete id="deleteTjProAdvicerulesByIds" parameterType="String">