生命礼赞订单添加字段

fs-admin/src/main/java/com/fs/his/controller/LifeSaluteOrderController.java

@@ -241,6 +241,9 @@ public class LifeSaluteOrderController extends BaseController {
         order.setSalesChannel(dto.getSalesChannel());
         order.setOrderAmount(dto.getOrderAmount());
         order.setCustomInfo(dto.getCustomInfo());
+        order.setAge(dto.getAge());
+        order.setSex(dto.getSex());
+        order.setIllnessCondition(dto.getIllnessCondition());
         order.setOrderStatus(dto.getOrderStatus());
         return order;
     }

fs-company/src/main/java/com/fs/company/controller/company/LifeSaluteOrderController.java

@@ -240,6 +240,9 @@ public class LifeSaluteOrderController extends BaseController
         order.setSalesChannel(dto.getSalesChannel());
         order.setOrderAmount(dto.getOrderAmount());
         order.setCustomInfo(dto.getCustomInfo());
+        order.setAge(dto.getAge());
+        order.setSex(dto.getSex());
+        order.setIllnessCondition(dto.getIllnessCondition());
         order.setOrderStatus(dto.getOrderStatus());
         return order;
     }

fs-service/src/main/java/com/fs/his/domain/LifeSaluteOrder.java

@@ -71,6 +71,18 @@ public class LifeSaluteOrder extends BaseEntity
     @Excel(name = "处方人姓名")
     private String prescriptionName;
 
+    /** 患者年龄 */
+    @Excel(name = "患者年龄")
+    private Integer age;
+
+    /** 患者性别 */
+    @Excel(name = "患者性别")
+    private String sex;
+
+    /** 病情描述 */
+    @Excel(name = "病情描述")
+    private String illnessCondition;
+
     /** 寄件人姓名 */
     @Excel(name = "寄件人姓名")
     private String senderName;

fs-service/src/main/java/com/fs/his/dto/LifeSaluteOrderImportDTO.java

@@ -223,6 +223,18 @@ public class LifeSaluteOrderImportDTO extends BaseEntity
     @Excel(name = "自定义信息")
     private String customInfo;
 
+    /** 患者年龄 */
+    @Excel(name = "年龄")
+    private Integer age;
+
+    /** 患者性别 */
+    @Excel(name = "性别")
+    private String sex;
+
+    /** 病情描述 */
+    @Excel(name = "病情")
+    private String illnessCondition;
+
     /** 订单状态 */
     @Excel(name = "订单状态", readConverterExp = "0=待处理,1=处理中,2=已完成,3=已取消")
     private Integer orderStatus;

fs-service/src/main/java/com/fs/his/param/LifeSaluteOrderCreateParam.java

@@ -38,6 +38,15 @@ public class LifeSaluteOrderCreateParam {
     /** 处方人姓名 */
     private String prescriptionName;
 
+    /** 患者年龄 */
+    private Integer age;
+
+    /** 患者性别 */
+    private String sex;
+
+    /** 病情描述 */
+    private String illnessCondition;
+
     /** 寄件人姓名 */
     private String senderName;
 

fs-service/src/main/resources/mapper/his/LifeSaluteOrderMapper.xml

@@ -20,6 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deliveryUpdateTime"    column="delivery_update_time"    />
         <result property="prescriptionNo"    column="prescription_no"    />
         <result property="prescriptionName"    column="prescription_name"    />
+        <result property="age"    column="age"    />
+        <result property="sex"    column="sex"    />
+        <result property="illnessCondition"    column="illness_condition"    />
         <result property="senderName"    column="sender_name"    />
         <result property="senderMobile"    column="sender_mobile"    />
         <result property="senderTel"    column="sender_tel"    />
@@ -76,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, company_id, company_user_id, order_no, merchant_order_no, platform_order_no, pre_waybill_no, waybill_no, delivery_code,
                delivery_status, delivery_type, delivery_update_time,
                prescription_no, prescription_name,
+               age, sex, illness_condition,
                sender_name, sender_mobile, sender_tel, sender_company, sender_province, sender_city, sender_district, sender_address,
                receiver_name, receiver_mobile, receiver_tel, receiver_company, receiver_province, receiver_city, receiver_district, receiver_address,
                goods_type, package_count, weight, length, width, height, temperature_type,
@@ -158,6 +162,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryUpdateTime != null">delivery_update_time,</if>
             <if test="prescriptionNo != null and prescriptionNo != ''">prescription_no,</if>
             <if test="prescriptionName != null and prescriptionName != ''">prescription_name,</if>
+            <if test="age != null">age,</if>
+            <if test="sex != null and sex != ''">sex,</if>
+            <if test="illnessCondition != null and illnessCondition != ''">illness_condition,</if>
             <if test="senderName != null and senderName != ''">sender_name,</if>
             <if test="senderMobile != null and senderMobile != ''">sender_mobile,</if>
             <if test="senderTel != null and senderTel != ''">sender_tel,</if>
@@ -221,6 +228,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryUpdateTime != null">#{deliveryUpdateTime},</if>
             <if test="prescriptionNo != null and prescriptionNo != ''">#{prescriptionNo},</if>
             <if test="prescriptionName != null and prescriptionName != ''">#{prescriptionName},</if>
+            <if test="age != null">#{age},</if>
+            <if test="sex != null and sex != ''">#{sex},</if>
+            <if test="illnessCondition != null and illnessCondition != ''">#{illnessCondition},</if>
             <if test="senderName != null and senderName != ''">#{senderName},</if>
             <if test="senderMobile != null and senderMobile != ''">#{senderMobile},</if>
             <if test="senderTel != null and senderTel != ''">#{senderTel},</if>
@@ -289,6 +299,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryUpdateTime != null">delivery_update_time = #{deliveryUpdateTime},</if>
             <if test="prescriptionNo != null and prescriptionNo != ''">prescription_no = #{prescriptionNo},</if>
             <if test="prescriptionName != null and prescriptionName != ''">prescription_name = #{prescriptionName},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="sex != null and sex != ''">sex = #{sex},</if>
+            <if test="illnessCondition != null and illnessCondition != ''">illness_condition = #{illnessCondition},</if>
             <if test="senderName != null and senderName != ''">sender_name = #{senderName},</if>
             <if test="senderMobile != null and senderMobile != ''">sender_mobile = #{senderMobile},</if>
             <if test="senderTel != null and senderTel != ''">sender_tel = #{senderTel},</if>