Skip to content

D
data_management_system
Commit 5f58c5c4 authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

修改 危重症人员

parent d315935c
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 12 deletions
ruoyi-system/src/main/java/com/ruoyi/system/domain/Wzzry.java
View file @ 5f58c5c4
......@@ -43,7 +43,7 @@ public class Wzzry extends BaseEntity
private String community;
/** 楼号 */
@Excel(name = "楼号")
@Excel(name = "楼栋号")
private String building;
/** 单元号 */
......@@ -55,31 +55,67 @@ public class Wzzry extends BaseEntity
private String floor;
/** 门牌号 */
@Excel(name = "门牌号")
@Excel(name = "门牌号或自然村地址")
private String house;
/** 住址 */
@Excel(name = "住址")
// @Excel(name = "住址")
private String address;
/** 人员类型 */
@Excel(name = "人员类型",dictType = "user_style")
private String userStyle;
/** 其他情况 */
@Excel(name = "其他情况")
private String otherSituation;
/** 基础病情况（逗号分割） */
@Excel(name = "基础病情况", readConverterExp = "逗=号分割")
@Excel(name = "基础病情况",dictType = "basic_disease")
private String basicDisease;
/** 基础病情况说明 */
@Excel(name = "基础病情况说明")
private String basicDiseaseDetail;
/** 状态（0正常 1停用） */
// @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 经常就诊医院 */
@Excel(name = "经常就诊医院",dictType = "hospital")
private String hospital;
/** 生活能否自理（0：能自理，1：不能自理） */
@Excel(name = "生活能否自理", readConverterExp = "0=能自理,1=不能自理")
private String isSelf;
/** 是否有人照顾（0：是，1：否） */
@Excel(name = "是否有人照顾", readConverterExp = "0=：是，1：否")
@Excel(name = "是否有人照顾", readConverterExp = "0=是,1=否")
private String isCare;
/** 同住人数(不包括自己) */
@Excel(name = "同住人数(不包括自己)")
private Long cohabitantsNumber;
/** 状态（0正常 1停用） */
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
private String status;
@Excel(name = "备注")
private String remark;
/** 情况是否属实（0：是，1否） */
@Excel(name = "情况是否属实", readConverterExp = "0=是,1=否")
private String situationTrue;
/** 包联人员姓名 */
@Excel(name = "包联人员姓名")
private String otherName;
/** 包联人员手机号码 */
@Excel(name = "包联人员手机号码")
private String otherPhone;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
public void setId(Long id)
{
......@@ -262,4 +298,78 @@ public class Wzzry extends BaseEntity
.append("remark", getRemark())
.toString();
}
public String getUserStyle() {
return userStyle;
}
public void setUserStyle(String userStyle) {
this.userStyle = userStyle;
}
public String getOtherSituation() {
return otherSituation;
}
public void setOtherSituation(String otherSituation) {
this.otherSituation = otherSituation;
}
public String getBasicDiseaseDetail() {
return basicDiseaseDetail;
}
public void setBasicDiseaseDetail(String basicDiseaseDetail) {
this.basicDiseaseDetail = basicDiseaseDetail;
}
public String getHospital() {
return hospital;
}
public void setHospital(String hospital) {
this.hospital = hospital;
}
public String getIsSelf() {
return isSelf;
}
public void setIsSelf(String isSelf) {
this.isSelf = isSelf;
}
public String getSituationTrue() {
return situationTrue;
}
public void setSituationTrue(String situationTrue) {
this.situationTrue = situationTrue;
}
public String getOtherName() {
return otherName;
}
public void setOtherName(String otherName) {
this.otherName = otherName;
}
public String getOtherPhone() {
return otherPhone;
}
public void setOtherPhone(String otherPhone) {
this.otherPhone = otherPhone;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
}
ruoyi-system/src/main/resources/mapper/system/WzzryMapper.xml
View file @ 5f58c5c4
......@@ -27,16 +27,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="userStyle" column="user_style" />
<result property="otherSituation" column="other_situation" />
<result property="basicDiseaseDetail" column="basic_disease_detail" />
<result property="hospital" column="hospital" />
<result property="isSelf" column="is_self" />
<result property="situationTrue" column="situation_true" />
<result property="otherName" column="other_name" />
<result property="otherPhone" column="other_phone" />
</resultMap>
<sql id="selectWzzryVo">
select id, user_name, card_no, phone, street, committee, community, building, unit, floor, house, address, basic_disease, is_care, cohabitants_number, status, del_flag, create_by, create_time, update_by, update_time, remark from wzzry
select id, user_name, card_no, phone, street, committee, community, building, unit, floor, house, address,
basic_disease, is_care, cohabitants_number, status, del_flag, create_by, create_time, update_by,
update_time, remark, user_style, other_situation, basic_disease_detail, hospital, is_self, situation_true,
other_name, other_phone from wzzry
</sql>
<select id="selectWzzryList" parameterType="Wzzry" resultMap="WzzryResult">
select a.id, a.user_name, a.card_no, a.phone, a.street, a.committee, a.community, a.building, a.unit, a.floor,
a.house, a.address, a.basic_disease, a.is_care, a.cohabitants_number, a.status, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.remark from wzzry a
a.create_time, a.update_by, a.update_time, a.remark,a.user_style, a.other_situation, a.basic_disease_detail,
a.hospital, a.is_self, a.situation_true, a.other_name, a.other_phone from wzzry a
left join sys_user u on u.user_id = a.create_by
left join sys_dept d on u.dept_id = d.dept_id
where a.del_flag = 0
......@@ -55,6 +67,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCare != null and isCare != ''"> and a.is_care = #{isCare}</if>
<if test="cohabitantsNumber != null "> and a.cohabitants_number like concat('%', #{cohabitantsNumber}, '%')</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
<if test="userStyle != null and userStyle != ''"> and a.user_style = #{userStyle}</if>
<if test="otherSituation != null and otherSituation != ''"> and a.other_situation = #{otherSituation}</if>
<if test="basicDiseaseDetail != null and basicDiseaseDetail != ''"> and a.basic_disease_detail = #{basicDiseaseDetail}</if>
<if test="hospital != null and hospital != ''"> and a.hospital = #{hospital}</if>
<if test="isSelf != null and isSelf != ''"> and a.is_self = #{isSelf}</if>
<if test="situationTrue != null and situationTrue != ''"> and a.situation_true = #{situationTrue}</if>
<if test="otherName != null and otherName != ''"> and a.other_name like concat('%', #{otherName}, '%')</if>
<if test="otherPhone != null and otherPhone != ''"> and a.other_phone = #{otherPhone}</if>
${params.dataScope}
order by a.create_time desc
</select>
......@@ -93,6 +113,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="userStyle != null">user_style,</if>
<if test="otherSituation != null">other_situation,</if>
<if test="basicDiseaseDetail != null">basic_disease_detail,</if>
<if test="hospital != null">hospital,</if>
<if test="isSelf != null">is_self,</if>
<if test="situationTrue != null">situation_true,</if>
<if test="otherName != null">other_name,</if>
<if test="otherPhone != null">other_phone,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userName != null">#{userName},</if>
......@@ -116,6 +144,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="userStyle != null">#{userStyle},</if>
<if test="otherSituation != null">#{otherSituation},</if>
<if test="basicDiseaseDetail != null">#{basicDiseaseDetail},</if>
<if test="hospital != null">#{hospital},</if>
<if test="isSelf != null">#{isSelf},</if>
<if test="situationTrue != null">#{situationTrue},</if>
<if test="otherName != null">#{otherName},</if>
<if test="otherPhone != null">#{otherPhone},</if>
</trim>
</insert>
......@@ -143,6 +179,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="userStyle != null">user_style = #{userStyle},</if>
<if test="otherSituation != null">other_situation = #{otherSituation},</if>
<if test="basicDiseaseDetail != null">basic_disease_detail = #{basicDiseaseDetail},</if>
<if test="hospital != null">hospital = #{hospital},</if>
<if test="isSelf != null">is_self = #{isSelf},</if>
<if test="situationTrue != null">situation_true = #{situationTrue},</if>
<if test="otherName != null">other_name = #{otherName},</if>
<if test="otherPhone != null">other_phone = #{otherPhone},</if>
</trim>
where id = #{id}
</update>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment