qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 慢性病管理自测问题修复。

Browse Source
This commit is contained in:
tianyongbao
2026-03-21 10:51:35 +08:00
parent 191f6e1caf
commit 8821e01422
20 changed files with 140 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
intc-modules/intc-health/src/main/resources/mapper/health/MedicationPlanMapper.xml
View File

@@ -4,8 +4,8 @@
<resultMap type="com.intc.health.domain.vo.MedicationPlanVo" id="MedicationPlanResult">
<id property="id" column="id"/>
<result property="memberId" column="member_id"/>
<result property="memberName" column="member_name"/>
<result property="personId" column="person_id"/>
<result property="personName" column="person_name"/>
<result property="chronicDiseaseId" column="chronic_disease_id"/>
<result property="chronicDiseaseName" column="chronic_disease_name"/>
<result property="planName" column="plan_name"/>
@@ -28,14 +28,14 @@
</resultMap>
<sql id="selectVo">
select a.id, a.member_id, p.name as member_name, a.chronic_disease_id,
select a.id, a.person_id, p.name as person_name, a.chronic_disease_id,
c.disease_name as chronic_disease_name, a.plan_name, a.medicine_id,
a.medicine_name, a.specification, a.dosage_per_time, a.dosage_unit,
a.frequency_type, a.frequency_config, a.time_slots, a.start_date, a.end_date,
a.remind_enabled, a.remind_advance_min, a.notify_family, a.family_member_ids,
a.status, a.create_time
from medication_plan a
left join health_person p on a.member_id = p.id
left join health_person p on a.person_id = p.id
left join chronic_disease_record c on a.chronic_disease_id = c.id
</sql>
@@ -48,7 +48,7 @@
<include refid="selectVo"/>
<where>
a.del_flag = 0
<if test="memberId != null"> and a.member_id = #{memberId}</if>
<if test="personId != null"> and a.person_id = #{personId}</if>
<if test="chronicDiseaseId != null"> and a.chronic_disease_id = #{chronicDiseaseId}</if>
<if test="planName != null and planName != ''"> and a.plan_name like '%' || #{planName} || '%'</if>
<if test="medicineId != null"> and a.medicine_id = #{medicineId}</if>
@@ -71,29 +71,61 @@
</select>
<insert id="insert" parameterType="com.intc.health.domain.MedicationPlan" useGeneratedKeys="true" keyProperty="id">
insert into medication_plan (
member_id, chronic_disease_id, plan_name, medicine_id, medicine_name,
specification, dosage_per_time, dosage_unit, frequency_type,
frequency_config, time_slots, start_date, end_date,
remind_enabled, remind_advance_min, notify_family, family_member_ids, status,
create_by, create_time, remark, del_flag
) values (
#{memberId}, #{chronicDiseaseId}, #{planName}, #{medicineId}, #{medicineName},
#{specification}, #{dosagePerTime}, #{dosageUnit}, #{frequencyType},
#{frequencyConfig, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler},
#{timeSlots, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler},
#{startDate}, #{endDate},
#{remindEnabled}, #{remindAdvanceMin}, #{notifyFamily},
#{familyMemberIds, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler},
#{status},
#{createBy}, #{createTime}, #{remark}, 0
)
insert into medication_plan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="personId != null">person_id,</if>
<if test="chronicDiseaseId != null">chronic_disease_id,</if>
<if test="planName != null and planName != ''">plan_name,</if>
<if test="medicineId != null">medicine_id,</if>
<if test="medicineName != null">medicine_name,</if>
<if test="specification != null">specification,</if>
<if test="dosagePerTime != null">dosage_per_time,</if>
<if test="dosageUnit != null">dosage_unit,</if>
<if test="frequencyType != null">frequency_type,</if>
<if test="frequencyConfig != null">frequency_config,</if>
<if test="timeSlots != null">time_slots,</if>
<if test="startDate != null">start_date,</if>
<if test="endDate != null">end_date,</if>
<if test="remindEnabled != null">remind_enabled,</if>
<if test="remindAdvanceMin != null">remind_advance_min,</if>
<if test="notifyFamily != null">notify_family,</if>
<if test="familyMemberIds != null">family_member_ids,</if>
<if test="status != null">status,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="remark != null">remark,</if>
del_flag,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="personId != null">#{personId},</if>
<if test="chronicDiseaseId != null">#{chronicDiseaseId},</if>
<if test="planName != null and planName != ''">#{planName},</if>
<if test="medicineId != null">#{medicineId},</if>
<if test="medicineName != null">#{medicineName},</if>
<if test="specification != null">#{specification},</if>
<if test="dosagePerTime != null">#{dosagePerTime},</if>
<if test="dosageUnit != null">#{dosageUnit},</if>
<if test="frequencyType != null">#{frequencyType},</if>
<if test="frequencyConfig != null">#{frequencyConfig, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler},</if>
<if test="timeSlots != null">#{timeSlots, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler},</if>
<if test="startDate != null">#{startDate},</if>
<if test="endDate != null">#{endDate},</if>
<if test="remindEnabled != null">#{remindEnabled},</if>
<if test="remindAdvanceMin != null">#{remindAdvanceMin},</if>
<if test="notifyFamily != null">#{notifyFamily},</if>
<if test="familyMemberIds != null">#{familyMemberIds, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="remark != null">#{remark},</if>
0,
</trim>
</insert>
<update id="update" parameterType="com.intc.health.domain.MedicationPlan">
update medication_plan
<set>
<if test="memberId != null">member_id = #{memberId},</if>
<if test="personId != null">person_id = #{personId},</if>
<if test="chronicDiseaseId != null">chronic_disease_id = #{chronicDiseaseId},</if>
<if test="planName != null">plan_name = #{planName},</if>
<if test="medicineId != null">medicine_id = #{medicineId},</if>