diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthActivity.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthActivity.java index 873e434..9452a84 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthActivity.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthActivity.java @@ -80,6 +80,11 @@ public class HealthActivity extends BaseEntity /** 费用明细 */ private String costDetail; + /** 附件 */ + @ApiModelProperty(value="附件") + @Excel(name = "附件") + private String attachment; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -102,6 +107,7 @@ public class HealthActivity extends BaseEntity .append("totalCost", getTotalCost()) .append("partner", getPartner()) .append("costDetail", getCostDetail()) + .append("attachment", getAttachment()) .toString(); } } diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthDoctorRecord.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthDoctorRecord.java index 0484bb6..fc9b3d6 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthDoctorRecord.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthDoctorRecord.java @@ -92,6 +92,11 @@ public class HealthDoctorRecord extends BaseEntity @Excel(name = "就诊类型") private String type; + /** 附件 */ + @ApiModelProperty(value="附件") + @Excel(name = "附件") + private String attachment; + @Override public String toString() { @@ -114,6 +119,7 @@ public class HealthDoctorRecord extends BaseEntity .append("partner", getPartner()) .append("costDetail", getCostDetail()) .append("type", getType()) + .append("attachment", getAttachment()) .append("diagnosis", getDiagnosis()) .toString(); } diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMedicineBasic.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMedicineBasic.java index 9463645..c60afa1 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMedicineBasic.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMedicineBasic.java @@ -129,6 +129,11 @@ public class HealthMedicineBasic extends BaseEntity @Excel(name = "包装单位") private String packageUnit; + /** 附件 */ + @ApiModelProperty(value="附件") + @Excel(name = "附件") + private String attachment; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -162,6 +167,7 @@ public class HealthMedicineBasic extends BaseEntity .append("indications", getIndications()) .append("shortName", getShortName()) .append("packageUnit", getPackageUnit()) + .append("attachment", getAttachment()) .toString(); } } diff --git a/intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml index 11adb9b..239c41e 100644 --- a/intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml @@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - 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