LAPTOP-KB9HII50\70708 2 هفته پیش
والد
کامیت
bc979ec82f

+ 12 - 1
common/common-entity/src/db/2025.sql

@ -47,7 +47,7 @@ ALTER table wlyy_patient_medical_records_rehabilitation add COLUMN `con_no` varc
ALTER table wlyy_patient_medical_records_rehabilitation add COLUMN `event_type` varchar(1) DEFAULT NULL COMMENT '病历类型';
ALTER TABLE `wlyy_rehabilitation_template_detail`
ADD COLUMN `followup_form_type` varchar(100) DEFAULT NULL COMMENT '随访表单类型';
ADD COLUMN `followup_form_type` varchar(10) DEFAULT NULL COMMENT '随访表单类型';
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('followup_form_type1', NULL, 'followup_form_type', '1', '全院通用', NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '随访表单类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('followup_form_type2', NULL, 'followup_form_type', '2', '骨科患者术后随访', NULL, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '随访表单类型');
@ -58,6 +58,12 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict
-- ysj 2025-07-30
ALTER TABLE `wlyy_followup`
    ADD COLUMN `followup_form_type` varchar(10) DEFAULT NULL COMMENT '随访表单类型';
ALTER TABLE `wlyy_followup`
    ADD COLUMN `last_followup_id` int(11) DEFAULT NULL COMMENT '上次随访id';
update wlyy_followup set followup_form_type = '1' where followup_form_type is null;
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('wound_healing_status', NULL, 'wound_healing_status', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '伤口愈合情况');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('wound_healing_status0', NULL, 'wound_healing_status', '1', '干燥无渗液', NULL, '0', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '伤口愈合情况');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('wound_healing_status1', NULL, 'wound_healing_status', '2', '少量渗液', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '伤口愈合情况');
@ -179,3 +185,8 @@ INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`,
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('lifestyle1', NULL, 'lifestyle', '1', '戒烟', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '生活方式');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('lifestyle2', NULL, 'lifestyle', '2', '限酒', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '生活方式');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('lifestyle3', NULL, 'lifestyle', '3', '适量运动', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '生活方式');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('adl', NULL, 'adl', NULL, NULL, NULL, NULL, '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '日常生活能力');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('adl1', NULL, 'adl', '1', '独立进食/穿衣', NULL, '1', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '日常生活能力');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('adl2', NULL, 'adl', '2', '需部分辅助', NULL, '2', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '日常生活能力');
INSERT INTO `wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('adl3', NULL, 'adl', '3', '完全依赖他人', NULL, '3', '350211A1002', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '日常生活能力');

+ 19 - 5
common/common-entity/src/main/java/com/yihu/jw/entity/followup/Followup.java

@ -102,16 +102,13 @@ public class Followup extends LongIdentityEntity {
	private Integer bdStatus;//bd_status
	private Integer pgStatus;//pg_status
	private String visitCount;//访视次序 (中度到重度慢阻肺)
	private String followupFormType;//随访表单类型 字典followup_form_type 1通用(空值按通用的逻辑处理)
	private Long lastFollowupId;//上次随访id
	private String planId;
	private String planDetailId;
	private String planItemId;
	@Column(name = "doctor_read_status")
	public Integer getDoctorReadStatus() {
		return doctorReadStatus;
@ -516,4 +513,21 @@ public class Followup extends LongIdentityEntity {
	public void setPlanItemId(String planItemId) {
		this.planItemId = planItemId;
	}
	public String getFollowupFormType() {
		return followupFormType;
	}
	public void setFollowupFormType(String followupFormType) {
		this.followupFormType = followupFormType;
	}
	public Long getLastFollowupId() {
		return lastFollowupId;
	}
	public void setLastFollowupId(Long lastFollowupId) {
		this.lastFollowupId = lastFollowupId;
	}
}

+ 81 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/followup/FollowupHandFoot.java

@ -44,6 +44,15 @@ public class FollowupHandFoot extends IdEntityWithCreateTime {
    private String diabetesWoundHealing; // 糖尿病伤口愈合
    private String diabetesFootFeel; // 糖尿病足感觉
    private String diabetesBloodSugar; // 糖尿病血糖
    private String diabetesBloodSugarB;//糖尿病-血糖监测-餐前
    private String diabetesBloodSugarA;//糖尿病-血糖监测-餐后
    private String planTraining;//是否按计划进行康复训练 1是 0否
    private String planTrainingReason;//是否按计划进行康复训练-原因内容
    private String adl;//日常生活能力 字典adl
    private String specialNeeds;//特殊需求
    private String nextFollowupTime; // 下次随访时间
    private String nextFollowupWay; // 下次随访方式
    private String nextFocus; // 下次关注重点
    @Column(name = "patient")
    public String getPatient() {
@ -296,7 +305,79 @@ public class FollowupHandFoot extends IdEntityWithCreateTime {
    public void setDiabetesBloodSugar(String diabetesBloodSugar) {
        this.diabetesBloodSugar = diabetesBloodSugar;
    }
    @Column(name = "diabetes_blood_sugar_b")
    public String getDiabetesBloodSugarB() {
        return diabetesBloodSugarB;
    }
    public void setDiabetesBloodSugarB(String diabetesBloodSugarB) {
        this.diabetesBloodSugarB = diabetesBloodSugarB;
    }
    @Column(name = "diabetes_blood_sugar_a")
    public String getDiabetesBloodSugarA() {
        return diabetesBloodSugarA;
    }
    public void setDiabetesBloodSugarA(String diabetesBloodSugarA) {
        this.diabetesBloodSugarA = diabetesBloodSugarA;
    }
    @Column(name = "plan_training")
    public String getPlanTraining() {
        return planTraining;
    }
    public void setPlanTraining(String planTraining) {
        this.planTraining = planTraining;
    }
    @Column(name = "plan_training_reason")
    public String getPlanTrainingReason() {
        return planTrainingReason;
    }
    public void setPlanTrainingReason(String planTrainingReason) {
        this.planTrainingReason = planTrainingReason;
    }
    @Column(name = "adl")
    public String getAdl() {
        return adl;
    }
    public void setAdl(String adl) {
        this.adl = adl;
    }
    @Column(name = "special_needs")
    public String getSpecialNeeds() {
        return specialNeeds;
    }
    public void setSpecialNeeds(String specialNeeds) {
        this.specialNeeds = specialNeeds;
    }
    @Column(name = "next_followup_time")
    public String getNextFollowupTime() {
        return nextFollowupTime;
    }
    public void setNextFollowupTime(String nextFollowupTime) {
        this.nextFollowupTime = nextFollowupTime;
    }
    @Column(name = "next_followup_way")
    public String getNextFollowupWay() {
        return nextFollowupWay;
    }
    public void setNextFollowupWay(String nextFollowupWay) {
        this.nextFollowupWay = nextFollowupWay;
    }
    @Column(name = "next_focus")
    public String getNextFocus() {
        return nextFocus;
    }
    public void setNextFocus(String nextFocus) {
        this.nextFocus = nextFocus;
    }
}

+ 9 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationDetailDO.java

@ -82,6 +82,7 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    private String value1;
    private String value2;
    private String value3;
    private String followupFormType; // 随访表单类型,字典 followup_form_type
    @Column(name = "reservation_type")
    public Integer getReservationType() {
@ -418,4 +419,12 @@ public class RehabilitationDetailDO extends UuidIdentityEntity implements Serial
    public void setValue3(String value3) {
        this.value3 = value3;
    }
    @Transient
    public String getFollowupFormType() {
        return followupFormType;
    }
    public void setFollowupFormType(String followupFormType) {
        this.followupFormType = followupFormType;
    }
}