From 58fadcca4f47db2e7d82fe8fdf5b823d6ed640ec Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 12 十月 2026 14:28:44 +0800
Subject: [PATCH] 【丽水】妇保字段更新
---
smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml | 47 ++++++++++++++++++++---
smartor/src/main/java/com/smartor/domain/PatChildArchive.java | 40 +++++++++++++++++--
2 files changed, 76 insertions(+), 11 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatChildArchive.java b/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
index 7822b7b..013137d 100644
--- a/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -93,11 +94,6 @@
@ApiModelProperty(value = "鎷熼殢璁挎椂闂�")
private Date plannedFollowTime;
- /** 闅忚鍛ㄦ湡(娆℃暟) */
- @Excel(name = "闅忚鍛ㄦ湡(娆℃暟)")
- @ApiModelProperty(value = "闅忚鍛ㄦ湡(娆℃暟)")
- private String followupCycleTimes;
-
/** 鎬у埆 1:鐢� 2:濂� */
@Excel(name = "鎬у埆")
@ApiModelProperty(value = "鎬у埆 1:鐢� 2:濂�")
@@ -153,11 +149,45 @@
@ApiModelProperty(value = "璇婃柇鍚嶇О")
private String diagname;
+ /** 棰勭害鎯呭喌 */
+ @ApiModelProperty(value = "棰勭害鎯呭喌")
+ private String appointmentSituation;
+
/** 缁撴鐘舵�� */
@Excel(name = "缁撴鐘舵��")
@ApiModelProperty(value = "缁撴鐘舵��")
private String closeStatus;
+ /** 钀ュ吇鎬х柧鐥匢D */
+ @Excel(name = "钀ュ吇鎬х柧鐥匢D")
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥匢D")
+ private String nutritionIcd10Code;
+
+ /** 钀ュ吇鎬х柧鐥呭悕绉� */
+ @Excel(name = "钀ュ吇鎬х柧鐥呭悕绉�")
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥呭悕绉�")
+ private String nutritionDiagName;
+
+ /** 鍑虹敓瀛曞懆 */
+ @Excel(name = "鍑虹敓瀛曞懆")
+ @ApiModelProperty(value = "鍑虹敓瀛曞懆")
+ private BigDecimal gestationalWeek;
+
+ /** 鍑虹敓浣撻噸(kg) */
+ @Excel(name = "鍑虹敓浣撻噸(kg)")
+ @ApiModelProperty(value = "鍑虹敓浣撻噸(kg)")
+ private BigDecimal birthWeight;
+
+ /** 楂樺嵄鍎垮垎绫� */
+ @Excel(name = "楂樺嵄鍎垮垎绫�")
+ @ApiModelProperty(value = "楂樺嵄鍎垮垎绫�")
+ private String highRiskChildType;
+
+ /** 楂樺嵄鍎垮悕绉� */
+ @Excel(name = "楂樺嵄鍎垮悕绉�")
+ @ApiModelProperty(value = "楂樺嵄鍎垮悕绉�")
+ private String highRiskChildName;
+
/** 鐧昏浜哄憳 */
@Excel(name = "鐧昏浜哄憳")
@ApiModelProperty(value = "鐧昏浜哄憳")
diff --git a/smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml
index 4092c18..7e6ee5e 100644
--- a/smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml
@@ -19,7 +19,6 @@
<result property="diagTime" column="diag_time"/>
<result property="archiveTime" column="archive_time"/>
<result property="plannedFollowTime" column="planned_follow_time"/>
- <result property="followupCycleTimes" column="followup_cycle_times"/>
<result property="sex" column="sex"/>
<result property="doctorCode" column="doctor_code"/>
<result property="doctorName" column="doctor_name"/>
@@ -31,7 +30,14 @@
<result property="wardname" column="wardname"/>
<result property="icd10code" column="icd10code"/>
<result property="diagname" column="diagname"/>
+ <result property="appointmentSituation" column="appointment_situation"/>
<result property="closeStatus" column="close_status"/>
+ <result property="nutritionIcd10Code" column="nutrition_icd10_code"/>
+ <result property="nutritionDiagName" column="nutrition_diag_name"/>
+ <result property="gestationalWeek" column="gestational_week"/>
+ <result property="birthWeight" column="birth_weight"/>
+ <result property="highRiskChildType" column="high_risk_child_type"/>
+ <result property="highRiskChildName" column="high_risk_child_name"/>
<result property="registerUser" column="register_user"/>
<result property="remark" column="remark"/>
<result property="orgid" column="orgid"/>
@@ -58,7 +64,6 @@
diag_time,
archive_time,
planned_follow_time,
- followup_cycle_times,
sex,
doctor_code,
doctor_name,
@@ -70,7 +75,14 @@
wardname,
icd10code,
diagname,
+ appointment_situation,
close_status,
+ nutrition_icd10_code,
+ nutrition_diag_name,
+ gestational_week,
+ birth_weight,
+ high_risk_child_type,
+ high_risk_child_name,
register_user,
remark,
orgid,
@@ -100,7 +112,6 @@
<if test="phone != null and phone != ''">and phone = #{phone}</if>
<if test="diagTime != null">and diag_time = #{diagTime}</if>
<if test="plannedFollowTime != null">and planned_follow_time = #{plannedFollowTime}</if>
- <if test="followupCycleTimes != null and followupCycleTimes != ''">and followup_cycle_times = #{followupCycleTimes}</if>
<if test="sex != null">and sex = #{sex}</if>
<if test="doctorCode != null and doctorCode != ''">and doctor_code = #{doctorCode}</if>
<if test="doctorName != null and doctorName != ''">and doctor_name like concat('%', #{doctorName}, '%')</if>
@@ -112,7 +123,13 @@
<if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
<if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
<if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
+ <if test="nutritionIcd10Code != null and nutritionIcd10Code != ''">and nutrition_icd10_code = #{nutritionIcd10Code}</if>
+ <if test="nutritionDiagName != null and nutritionDiagName != ''">and nutrition_diag_name like concat('%', #{nutritionDiagName}, '%')</if>
+ <if test="highRiskChildType != null and highRiskChildType != ''">and high_risk_child_type = #{highRiskChildType}</if>
+ <if test="highRiskChildName != null and highRiskChildName != ''">and high_risk_child_name like concat('%', #{highRiskChildName}, '%')</if>
<if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
+ <if test="gestationalWeek != null">and gestational_week = #{gestationalWeek}</if>
+ <if test="birthWeight != null">and birth_weight = #{birthWeight}</if>
<if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
@@ -146,7 +163,6 @@
<if test="diagTime != null">diag_time,</if>
<if test="archiveTime != null">archive_time,</if>
<if test="plannedFollowTime != null">planned_follow_time,</if>
- <if test="followupCycleTimes != null">followup_cycle_times,</if>
<if test="sex != null">sex,</if>
<if test="doctorCode != null">doctor_code,</if>
<if test="doctorName != null">doctor_name,</if>
@@ -158,7 +174,14 @@
<if test="wardname != null">wardname,</if>
<if test="icd10code != null">icd10code,</if>
<if test="diagname != null">diagname,</if>
+ <if test="appointmentSituation != null">appointment_situation,</if>
<if test="closeStatus != null">close_status,</if>
+ <if test="nutritionIcd10Code != null">nutrition_icd10_code,</if>
+ <if test="nutritionDiagName != null">nutrition_diag_name,</if>
+ <if test="gestationalWeek != null">gestational_week,</if>
+ <if test="birthWeight != null">birth_weight,</if>
+ <if test="highRiskChildType != null">high_risk_child_type,</if>
+ <if test="highRiskChildName != null">high_risk_child_name,</if>
<if test="registerUser != null">register_user,</if>
<if test="remark != null">remark,</if>
<if test="orgid != null">orgid,</if>
@@ -183,7 +206,6 @@
<if test="diagTime != null">#{diagTime},</if>
<if test="archiveTime != null">#{archiveTime},</if>
<if test="plannedFollowTime != null">#{plannedFollowTime},</if>
- <if test="followupCycleTimes != null">#{followupCycleTimes},</if>
<if test="sex != null">#{sex},</if>
<if test="doctorCode != null">#{doctorCode},</if>
<if test="doctorName != null">#{doctorName},</if>
@@ -195,7 +217,14 @@
<if test="wardname != null">#{wardname},</if>
<if test="icd10code != null">#{icd10code},</if>
<if test="diagname != null">#{diagname},</if>
+ <if test="appointmentSituation != null">#{appointmentSituation},</if>
<if test="closeStatus != null">#{closeStatus},</if>
+ <if test="nutritionIcd10Code != null">#{nutritionIcd10Code},</if>
+ <if test="nutritionDiagName != null">#{nutritionDiagName},</if>
+ <if test="gestationalWeek != null">#{gestationalWeek},</if>
+ <if test="birthWeight != null">#{birthWeight},</if>
+ <if test="highRiskChildType != null">#{highRiskChildType},</if>
+ <if test="highRiskChildName != null">#{highRiskChildName},</if>
<if test="registerUser != null">#{registerUser},</if>
<if test="remark != null">#{remark},</if>
<if test="orgid != null">#{orgid},</if>
@@ -224,7 +253,6 @@
<if test="diagTime != null">diag_time = #{diagTime},</if>
<if test="archiveTime != null">archive_time = #{archiveTime},</if>
<if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
- <if test="followupCycleTimes != null">followup_cycle_times = #{followupCycleTimes},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="doctorCode != null">doctor_code = #{doctorCode},</if>
<if test="doctorName != null">doctor_name = #{doctorName},</if>
@@ -236,7 +264,14 @@
<if test="wardname != null">wardname = #{wardname},</if>
<if test="icd10code != null">icd10code = #{icd10code},</if>
<if test="diagname != null">diagname = #{diagname},</if>
+ <if test="appointmentSituation != null">appointment_situation = #{appointmentSituation},</if>
<if test="closeStatus != null">close_status = #{closeStatus},</if>
+ <if test="nutritionIcd10Code != null">nutrition_icd10_code = #{nutritionIcd10Code},</if>
+ <if test="nutritionDiagName != null">nutrition_diag_name = #{nutritionDiagName},</if>
+ <if test="gestationalWeek != null">gestational_week = #{gestationalWeek},</if>
+ <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
+ <if test="highRiskChildType != null">high_risk_child_type = #{highRiskChildType},</if>
+ <if test="highRiskChildName != null">high_risk_child_name = #{highRiskChildName},</if>
<if test="registerUser != null">register_user = #{registerUser},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="orgid != null">orgid = #{orgid},</if>
--
Gitblit v1.9.3