From 0504ff01219c6bd2a285f75f8ab546d634375b02 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sat, 12 Oct 2024 10:44:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/health/domain/HealthDoctorRecord.java  | 16 ++++++++++++++++
 .../health/domain/HealthMedicineStockIn.java     |  8 ++++++++
 .../mapper/health/HealthDoctorRecordMapper.xml   | 15 +++++++++++++++
 .../health/HealthMedicineStockInMapper.xml       | 10 ++++++++++
 4 files changed, 49 insertions(+)

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"
         <result property="personId"    column="person_id"    />
         <result property="personName"    column="person_name"    />
         <result property="healthRecordName"    column="health_record_name"    />
+        <result property="totalCost"    column="total_cost"    />
+        <result property="partner"    column="partner"    />
+        <result property="costDetail"    column="cost_detail"    />
     </resultMap>
 
     <sql id="selectHealthDoctorRecordVo">
@@ -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"
             <if test="visitingTime != null">visiting_time,</if>
             <if test="prescribe != null and prescribe != ''">prescribe,</if>
             <if test="personId != null">person_id,</if>
+            <if test="totalCost != null">total_cost,</if>
+            <if test="partner != null">partner,</if>
+            <if test="costDetail != null">cost_detail,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -109,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visitingTime != null">#{visitingTime},</if>
             <if test="prescribe != null and prescribe != ''">#{prescribe},</if>
             <if test="personId != null">#{personId},</if>
+            <if test="totalCost != null">#{totalCost},</if>
+            <if test="partner != null">#{partner},</if>
+            <if test="costDetail != null">#{costDetail},</if>
          </trim>
     </insert>
 
@@ -128,6 +140,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="visitingTime != null">visiting_time = #{visitingTime},</if>
             <if test="prescribe != null and prescribe != ''">prescribe = #{prescribe},</if>
             <if test="personId != null">person_id = #{personId},</if>
+            <if test="totalCost != null">total_cost = #{totalCost},</if>
+            <if test="partner != null">partner = #{partner},</if>
+            <if test="costDetail != null">cost_detail = #{costDetail},</if>
         </trim>
         where id = #{id}
     </update>
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"
         <result property="purchaseAddress"    column="purchase_address"    />
         <result property="totalPrice"    column="total_price"    />
         <result property="medicineName"    column="medicine_name"    />
+        <result property="usage"    column="usage"    />
+        <result property="ageWeight"    column="age_weight"    />
     </resultMap>
 
     <sql id="selectHealthMedicineStockInVo">
@@ -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"
             <if test="usedCount != null">used_count,</if>
             <if test="purchaseAddress != null">purchase_address,</if>
             <if test="totalPrice != null">total_price,</if>
+            <if test="usage != null">usage,</if>
+            <if test="ageWeight != null">age_weight,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -125,6 +131,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="usedCount != null">#{usedCount},</if>
             <if test="purchaseAddress != null">#{purchaseAddress},</if>
             <if test="totalPrice != null">#{totalPrice},</if>
+            <if test="usage != null">#{usage},</if>
+            <if test="ageWeight != null">#{ageWeight},</if>
          </trim>
     </insert>
 
@@ -149,6 +157,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="usedCount != null">used_count = #{usedCount},</if>
             <if test="purchaseAddress != null">purchase_address = #{purchaseAddress},</if>
             <if test="totalPrice != null">total_price = #{totalPrice},</if>
+            <if test="usage != null">usage = #{usage},</if>
+            <if test="ageWeight != null">age_weight = #{ageWeight},</if>
         </trim>
         where id = #{id}
     </update>