diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java
index 493f68e..a1cde37 100644
--- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java
+++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java
@@ -68,6 +68,19 @@ public class HealthDoctorRecord extends BaseEntity
@Excel(name = "人员id")
private Long personId;
+ /** 总费用 */
+ @ApiModelProperty(value="总费用")
+ @Excel(name = "总费用")
+ private Double totalCost;
+
+ /** 成员 */
+ @ApiModelProperty(value="成员")
+ @Excel(name = "成员")
+ private String partner;
+
+ /** 费用明细 */
+ private String costDetail;
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -85,6 +98,9 @@ public class HealthDoctorRecord extends BaseEntity
.append("visitingTime", getVisitingTime())
.append("prescribe", getPrescribe())
.append("personId", getPersonId())
+ .append("totalCost", getTotalCost())
+ .append("partner", getPartner())
+ .append("costDetail", getCostDetail())
.toString();
}
}
diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java
index 40e5334..96a8a47 100644
--- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java
+++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java
@@ -99,6 +99,12 @@ public class HealthMedicineStockIn extends BaseEntity
@Excel(name = "总价")
private Double totalPrice;
+ /** 医嘱 */
+ private String usage;
+
+ /** 年龄体重 */
+ private String ageWeight;
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -121,6 +127,8 @@ public class HealthMedicineStockIn extends BaseEntity
.append("usedCount", getUsedCount())
.append("purchaseAddress", getPurchaseAddress())
.append("totalPrice", getTotalPrice())
+ .append("usage", getUsage())
+ .append("ageWeight", getAgeWeight())
.toString();
}
}
diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml
index dd8e4df..f724d60 100644
--- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml
+++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml
@@ -21,6 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
@@ -39,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.visiting_time,
a.prescribe,
a.person_id,
+ a.total_cost,
+ a.partner,
+ a.cost_detail,
hp."name" as person_name ,
hr."name" as health_record_name
from
@@ -93,6 +99,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
visiting_time,
prescribe,
person_id,
+ total_cost,
+ partner,
+ cost_detail,
#{id},
@@ -109,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{visitingTime},
#{prescribe},
#{personId},
+ #{totalCost},
+ #{partner},
+ #{costDetail},
@@ -128,6 +140,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
visiting_time = #{visitingTime},
prescribe = #{prescribe},
person_id = #{personId},
+ total_cost = #{totalCost},
+ partner = #{partner},
+ cost_detail = #{costDetail},
where id = #{id}
diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml
index 0c6d1bb..7b4a9e2 100644
--- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml
+++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml
@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -32,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.id,
a.medicine_id,
a.quantity,
+ a.usage,
+ a.age_weight,
a.production_date,
a.expiring_date,
a.purchase_date,
@@ -104,6 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
used_count,
purchase_address,
total_price,
+ usage,
+ age_weight,
#{id},
@@ -125,6 +131,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{usedCount},
#{purchaseAddress},
#{totalPrice},
+ #{usage},
+ #{ageWeight},
@@ -149,6 +157,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
used_count = #{usedCount},
purchase_address = #{purchaseAddress},
total_price = #{totalPrice},
+ usage = #{usage},
+ age_weight = #{ageWeight},
where id = #{id}