feat: 药品基础信息,就医记录,活动记录,新增附件上传功能。
This commit is contained in:
@@ -80,6 +80,11 @@ public class HealthActivity extends BaseEntity
|
|||||||
/** 费用明细 */
|
/** 费用明细 */
|
||||||
private String costDetail;
|
private String costDetail;
|
||||||
|
|
||||||
|
/** 附件 */
|
||||||
|
@ApiModelProperty(value="附件")
|
||||||
|
@Excel(name = "附件")
|
||||||
|
private String attachment;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||||
@@ -102,6 +107,7 @@ public class HealthActivity extends BaseEntity
|
|||||||
.append("totalCost", getTotalCost())
|
.append("totalCost", getTotalCost())
|
||||||
.append("partner", getPartner())
|
.append("partner", getPartner())
|
||||||
.append("costDetail", getCostDetail())
|
.append("costDetail", getCostDetail())
|
||||||
|
.append("attachment", getAttachment())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,6 +92,11 @@ public class HealthDoctorRecord extends BaseEntity
|
|||||||
@Excel(name = "就诊类型")
|
@Excel(name = "就诊类型")
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
|
/** 附件 */
|
||||||
|
@ApiModelProperty(value="附件")
|
||||||
|
@Excel(name = "附件")
|
||||||
|
private String attachment;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
@@ -114,6 +119,7 @@ public class HealthDoctorRecord extends BaseEntity
|
|||||||
.append("partner", getPartner())
|
.append("partner", getPartner())
|
||||||
.append("costDetail", getCostDetail())
|
.append("costDetail", getCostDetail())
|
||||||
.append("type", getType())
|
.append("type", getType())
|
||||||
|
.append("attachment", getAttachment())
|
||||||
.append("diagnosis", getDiagnosis())
|
.append("diagnosis", getDiagnosis())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -129,6 +129,11 @@ public class HealthMedicineBasic extends BaseEntity
|
|||||||
@Excel(name = "包装单位")
|
@Excel(name = "包装单位")
|
||||||
private String packageUnit;
|
private String packageUnit;
|
||||||
|
|
||||||
|
/** 附件 */
|
||||||
|
@ApiModelProperty(value="附件")
|
||||||
|
@Excel(name = "附件")
|
||||||
|
private String attachment;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||||
@@ -162,6 +167,7 @@ public class HealthMedicineBasic extends BaseEntity
|
|||||||
.append("indications", getIndications())
|
.append("indications", getIndications())
|
||||||
.append("shortName", getShortName())
|
.append("shortName", getShortName())
|
||||||
.append("packageUnit", getPackageUnit())
|
.append("packageUnit", getPackageUnit())
|
||||||
|
.append("attachment", getAttachment())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="totalCost" column="total_cost" />
|
<result property="totalCost" column="total_cost" />
|
||||||
<result property="partner" column="partner" />
|
<result property="partner" column="partner" />
|
||||||
<result property="costDetail" column="cost_detail" />
|
<result property="costDetail" column="cost_detail" />
|
||||||
|
<result property="attachment" column="attachment" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectHealthActivityVo">
|
<sql id="selectHealthActivityVo">
|
||||||
select a.id, a.name, a.type, a.place, a.activity_volume, a.exercise_time, a.start_time, a.end_time, a.harvest, a.foods, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.total_cost, a.partner, a.cost_detail from health_activity a
|
select a.id, a.name, a.type, a.place, a.activity_volume, a.exercise_time, a.start_time, a.end_time, a.harvest, a.foods, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.total_cost, a.partner, a.cost_detail, a.attachment from health_activity a
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectHealthActivityList" parameterType="HealthActivityDto" resultMap="HealthActivityResult">
|
<select id="selectHealthActivityList" parameterType="HealthActivityDto" resultMap="HealthActivityResult">
|
||||||
@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="totalCost != null">total_cost,</if>
|
<if test="totalCost != null">total_cost,</if>
|
||||||
<if test="partner != null">partner,</if>
|
<if test="partner != null">partner,</if>
|
||||||
<if test="costDetail != null">cost_detail,</if>
|
<if test="costDetail != null">cost_detail,</if>
|
||||||
|
<if test="attachment != null">attachment,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">#{id},</if>
|
<if test="id != null">#{id},</if>
|
||||||
@@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="totalCost != null">#{totalCost},</if>
|
<if test="totalCost != null">#{totalCost},</if>
|
||||||
<if test="partner != null">#{partner},</if>
|
<if test="partner != null">#{partner},</if>
|
||||||
<if test="costDetail != null">#{costDetail},</if>
|
<if test="costDetail != null">#{costDetail},</if>
|
||||||
|
<if test="attachment != null">#{attachment},</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="totalCost != null">total_cost = #{totalCost},</if>
|
<if test="totalCost != null">total_cost = #{totalCost},</if>
|
||||||
<if test="partner != null">partner = #{partner},</if>
|
<if test="partner != null">partner = #{partner},</if>
|
||||||
<if test="costDetail != null">cost_detail = #{costDetail},</if>
|
<if test="costDetail != null">cost_detail = #{costDetail},</if>
|
||||||
|
<if test="attachment != null">attachment = #{attachment},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="partner" column="partner" />
|
<result property="partner" column="partner" />
|
||||||
<result property="costDetail" column="cost_detail" />
|
<result property="costDetail" column="cost_detail" />
|
||||||
<result property="type" column="type" />
|
<result property="type" column="type" />
|
||||||
|
<result property="attachment" column="attachment" />
|
||||||
<result property="diagnosis" column="diagnosis" />
|
<result property="diagnosis" column="diagnosis" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
@@ -48,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
a.total_cost,
|
a.total_cost,
|
||||||
a.partner,
|
a.partner,
|
||||||
a.cost_detail,
|
a.cost_detail,
|
||||||
|
a.attachment,
|
||||||
a.diagnosis,
|
a.diagnosis,
|
||||||
hp."name" as person_name ,
|
hp."name" as person_name ,
|
||||||
hr."name" as health_record_name
|
hr."name" as health_record_name
|
||||||
@@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="partner != null">partner,</if>
|
<if test="partner != null">partner,</if>
|
||||||
<if test="costDetail != null">cost_detail,</if>
|
<if test="costDetail != null">cost_detail,</if>
|
||||||
<if test="type != null and type != ''">type,</if>
|
<if test="type != null and type != ''">type,</if>
|
||||||
|
<if test="attachment != null">attachment,</if>
|
||||||
<if test="diagnosis != null and diagnosis != ''">diagnosis,</if>
|
<if test="diagnosis != null and diagnosis != ''">diagnosis,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
@@ -129,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="partner != null">#{partner},</if>
|
<if test="partner != null">#{partner},</if>
|
||||||
<if test="costDetail != null">#{costDetail},</if>
|
<if test="costDetail != null">#{costDetail},</if>
|
||||||
<if test="type != null and type != ''">#{type},</if>
|
<if test="type != null and type != ''">#{type},</if>
|
||||||
|
<if test="attachment != null">#{attachment},</if>
|
||||||
<if test="diagnosis != null and diagnosis != ''">#{diagnosis},</if>
|
<if test="diagnosis != null and diagnosis != ''">#{diagnosis},</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
@@ -153,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="partner != null">partner = #{partner},</if>
|
<if test="partner != null">partner = #{partner},</if>
|
||||||
<if test="costDetail != null">cost_detail = #{costDetail},</if>
|
<if test="costDetail != null">cost_detail = #{costDetail},</if>
|
||||||
<if test="type != null and type != ''">type = #{type},</if>
|
<if test="type != null and type != ''">type = #{type},</if>
|
||||||
|
<if test="attachment != null">attachment = #{attachment},</if>
|
||||||
<if test="diagnosis != null and diagnosis != ''">diagnosis = #{diagnosis},</if>
|
<if test="diagnosis != null and diagnosis != ''">diagnosis = #{diagnosis},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<result property="indications" column="indications" />
|
<result property="indications" column="indications" />
|
||||||
<result property="shortName" column="short_name" />
|
<result property="shortName" column="short_name" />
|
||||||
<result property="packageUnit" column="package_unit" />
|
<result property="packageUnit" column="package_unit" />
|
||||||
|
<result property="attachment" column="attachment" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectHealthMedicineBasicVo">
|
<sql id="selectHealthMedicineBasicVo">
|
||||||
@@ -68,7 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
a.storage,
|
a.storage,
|
||||||
a.indications,
|
a.indications,
|
||||||
a.short_name,
|
a.short_name,
|
||||||
a.package_unit
|
a.package_unit,
|
||||||
|
a.attachment
|
||||||
from
|
from
|
||||||
health_medicine_basic a
|
health_medicine_basic a
|
||||||
|
|
||||||
@@ -134,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="indications != null">indications,</if>
|
<if test="indications != null">indications,</if>
|
||||||
<if test="shortName != null">short_name,</if>
|
<if test="shortName != null">short_name,</if>
|
||||||
<if test="packageUnit != null">package_unit,</if>
|
<if test="packageUnit != null">package_unit,</if>
|
||||||
|
<if test="attachment != null">attachment,</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">#{id},</if>
|
<if test="id != null">#{id},</if>
|
||||||
@@ -166,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="indications != null">#{indications},</if>
|
<if test="indications != null">#{indications},</if>
|
||||||
<if test="shortName != null">#{shortName},</if>
|
<if test="shortName != null">#{shortName},</if>
|
||||||
<if test="packageUnit != null">#{packageUnit},</if>
|
<if test="packageUnit != null">#{packageUnit},</if>
|
||||||
|
<if test="attachment != null">#{attachment},</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
@@ -201,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<if test="indications != null">indications = #{indications},</if>
|
<if test="indications != null">indications = #{indications},</if>
|
||||||
<if test="shortName != null">short_name = #{shortName},</if>
|
<if test="shortName != null">short_name = #{shortName},</if>
|
||||||
<if test="packageUnit != null">package_unit = #{packageUnit},</if>
|
<if test="packageUnit != null">package_unit = #{packageUnit},</if>
|
||||||
|
<if test="attachment != null">attachment = #{attachment},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|||||||
Reference in New Issue
Block a user