From 72f6490f736d60710b930d68dc087e6e503a9625 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 24 六月 2025 15:36:05 +0800
Subject: [PATCH] zjh20250624

---
 ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml |   73 ++++++++++++++++++++++++++++++++----
 1 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
index 1708d8b..dfbbb14 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
@@ -36,10 +36,14 @@
             <result property="deleted" column="deleted"/>
             <result property="fromBy" column="from_by"/>
             <result property="zzsjj" column="zzsjj" typeHandler="com.ltkj.common.mybatis.JsonStringArrayTypeHandler"/>
-        <result property="contactPoison" column="contact_poison"/>
-        <result property="gongZhong" column="gong_zhong"/>
-        <result property="gongLing" column="gong_ling"/>
-        <result property="jhgl" column="jhgl"/>
+            <result property="contactPoison" column="contact_poison"/>
+            <result property="gongZhong" column="gong_zhong"/>
+            <result property="gongLing" column="gong_ling"/>
+            <result property="jhgl" column="jhgl"/>
+            <result property="medicalHistoryIds" column="medical_history_ids"/>
+            <result property="medicalHistoryOther" column="medical_history_other"/>
+            <result property="dwmc" column="dwmc"/>
+            <result property="ygdw" column="ygdw"/>
     </resultMap>
 
         <resultMap id="TjAskMedicalHistoryTjAskHistorysResult" type="TjAskMedicalHistory" extends="TjAskMedicalHistoryResult">
@@ -63,9 +67,46 @@
         </resultMap>
 
     <sql id="selectTjAskMedicalHistoryVo">
-        select ask_id, cus_id, cus_name, work, work_status, medical_history, chuchao, jingqi, zhouqi, mociage, zinv, liuchan,
-               zaochan, sichan, yichangtai, xiyan, xiyanpinlv, xiyanyear, yinjiu, yinjiupinlv, yinjiuyear, qita, remark, create_by,
-               create_time, update_by, update_time, deleted,from_by,zzsjj,contact_poison,gong_zhong,gong_ling,jhgl
+        select ask_id,
+               cus_id,
+               cus_name,
+            work,
+            work_status,
+            medical_history_ids,
+            medical_history,
+            medical_history_other,
+            chuchao,
+            jingqi,
+            zhouqi,
+            mociage,
+            zinv,
+            liuchan,
+            zaochan,
+            sichan,
+            yichangtai,
+            xiyan,
+            xiyanpinlv,
+            xiyanyear,
+            yinjiu,
+            yinjiupinlv,
+            yinjiuyear,
+            qita,
+            remark,
+            create_by,
+            create_time,
+            update_by,
+            update_time,
+            deleted,
+            from_by,
+            zzsjj,
+            contact_poison,
+            gong_zhong,
+            gong_ling,
+            jhgl,
+            dwmc,
+            ygdw,
+            tjwhys,
+            jcwhys,yjsfyc
         from tj_ask_medical_history
     </sql>
 
@@ -93,7 +134,9 @@
                 sub_create_time, b.update_by as
                 sub_update_by, b.update_time as
                 sub_update_time, b.deleted as
-                sub_deleted
+                sub_deleted,
+                   a.dwmc,
+                   a.ygdw
             from tj_ask_medical_history a
             left join tj_ask_historys b on b.ask_id = a.ask_id
             where a.ask_id = #{askId}
@@ -159,6 +202,10 @@
                     </if>
                     <if test="fromBy != null">from_by,
                     </if>
+            <if test="dwmc != null">dwmc,
+            </if>
+            <if test="ygdw != null">ygdw,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                     <if test="cusId != null">#{cusId},
@@ -217,6 +264,10 @@
                     </if>
                     <if test="fromBy != null">#{fromBy},
                     </if>
+            <if test="dwmc != null">#{dwmc},
+            </if>
+            <if test="ygdw != null">#{ygdw},
+            </if>
         </trim>
     </insert>
 
@@ -307,6 +358,12 @@
                     <if test="fromBy != null">from_By =
                         #{fromBy},
                     </if>
+            <if test="dwmc != null">dwmc =
+                #{dwmc},
+            </if>
+            <if test="ygdw != null">ygdw =
+                #{ygdw},
+            </if>
         </trim>
         where ask_id = #{askId}
     </update>

--
Gitblit v1.8.0