下单流程优化和红包余额明细导出优化

fs-service/src/main/java/com/fs/company/domain/CompanyRedPacketBalanceLogs.java

@@ -1,6 +1,9 @@
 package com.fs.company.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
@@ -28,7 +31,7 @@ public class CompanyRedPacketBalanceLogs extends BaseEntity{
     private String companyName;
 
     /** 金额 */
-    @Excel(name = "金额")
+    @Excel(name = "消耗金额")
     private BigDecimal money;
 
     /** 余额 */
@@ -36,11 +39,18 @@ public class CompanyRedPacketBalanceLogs extends BaseEntity{
     private BigDecimal balance;
 
     /** 类型 字典字段 */
-    @Excel(name = "类型")
+
     private Integer logsType;
 
     /** 是否处理状态（0-初始化，1-已同步） */
     private Long status;
 
+    @Excel(name = "类型")
+    @TableField(exist = false)
+    private  String statusName;
+
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date logTime;
 
 }

fs-service/src/main/java/com/fs/company/param/HelpAddPatientParam.java

@@ -54,4 +54,14 @@ public class HelpAddPatientParam implements Serializable {
     private Integer isFurther;
     private String primaryHospital;
     private String primaryImages;
+
+    /**
+     * 是否是否因慢病在线下就诊?且对该处方内的产品无过敏或不良反应?0:是，我线下就诊过;  1: 否
+     */
+    private Integer isOfflineConsultation;
+
+    /**
+     * 是否已详细阅读疗法说明，确认自己符合疗法产品的适用人群，并了解使用方法，使用禁忌等?0:是 1：否
+     */
+    private Integer isReadTherapy;
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyRedPacketBalanceLogsServiceImpl.java

@@ -3,6 +3,7 @@ package com.fs.company.service.impl;
 import java.util.List;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.common.utils.DictUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.company.mapper.CompanyRedPacketBalanceLogsMapper;
@@ -39,7 +40,15 @@ public class CompanyRedPacketBalanceLogsServiceImpl extends ServiceImpl<CompanyR
     @Override
     public List<CompanyRedPacketBalanceLogs> selectCompanyRedPacketBalanceLogsList(CompanyRedPacketBalanceLogs companyRedPacketBalanceLogs)
     {
-        return baseMapper.selectCompanyRedPacketBalanceLogsList(companyRedPacketBalanceLogs);
+        List<CompanyRedPacketBalanceLogs> packetBalanceLogsList = baseMapper.selectCompanyRedPacketBalanceLogsList(companyRedPacketBalanceLogs);
+        //获取字段名称
+
+        if(packetBalanceLogsList != null && !packetBalanceLogsList.isEmpty()){
+            packetBalanceLogsList.forEach(item -> {
+                item.setStatusName(DictUtils.getDictLabel("sys_company_money_logs_type", String.valueOf(item.getStatus())));
+            });
+        }
+        return  packetBalanceLogsList;
     }
 
     /**

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

@@ -71,6 +71,32 @@ public class FsPatient extends BaseEntity
     private Integer isConfirm;
     private Long helpCompanyUserId;
 
+    /**
+     * 是否是否因慢病在线下就诊?且对该处方内的产品无过敏或不良反应?0:是，我线下就诊过;  1: 否
+     */
+    private Integer isOfflineConsultation;
+
+    /**
+     * 是否已详细阅读疗法说明，确认自己符合疗法产品的适用人群，并了解使用方法，使用禁忌等?0:是 1：否
+     */
+    private Integer isReadTherapy;
+
+    public Integer getIsOfflineConsultation() {
+        return isOfflineConsultation;
+    }
+
+    public Integer getIsReadTherapy() {
+        return isReadTherapy;
+    }
+
+    public void setIsOfflineConsultation(Integer isOfflineConsultation) {
+        this.isOfflineConsultation = isOfflineConsultation;
+    }
+
+    public void setIsReadTherapy(Integer isReadTherapy) {
+        this.isReadTherapy = isReadTherapy;
+    }
+
     public Integer getIsConfirm() {
         return isConfirm;
     }

fs-service/src/main/java/com/fs/his/service/impl/FsUserAddressServiceImpl.java

@@ -149,7 +149,17 @@ public class FsUserAddressServiceImpl implements IFsUserAddressService
 
     @Override
     public FsUserAddress selectFsUserAddressByDefault(long userId) {
-        return fsUserAddressMapper.selectFsUserAddressByDefault(userId);
+        FsUserAddress fsUserAddress = fsUserAddressMapper.selectFsUserAddressByDefault(userId);
+        if(fsUserAddress==null){
+            // 没有默认地址 则返回第一个地址
+            FsUserAddress fsUserAddress1 = new FsUserAddress();
+            fsUserAddress1.setUserId(userId);
+            List<FsUserAddress> list = fsUserAddressMapper.selectFsUserAddressList(fsUserAddress1);
+            if(list!=null&& !list.isEmpty()){
+                fsUserAddress=list.get(0);
+            }
+        }
+        return fsUserAddress;
     }
 
     @Override

fs-service/src/main/resources/mapper/company/CompanyRedPacketBalanceLogsMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectCompanyRedPacketBalanceLogsList" parameterType="CompanyRedPacketBalanceLogs" resultMap="CompanyRedPacketBalanceLogsResult">
-        select l.logs_id, l.company_id, l.money, l.remark, l.create_time, l.balance, l.logs_type, l.status,c.company_name
+        select l.logs_id, l.company_id, l.money, l.remark,l.create_time,l.create_time as logTime, l.balance, l.logs_type, l.status,c.company_name
         from
         company_red_packet_balance_logs l
         left join company c on c.company_id = l.company_id

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

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectFsPatientVo">
         select patient_id,is_further,primary_hospital,primary_images,renal_unusual,liver_unusual,is_default,relation,
                patient_name,self_med_history,family_med_history,history_allergic, user_id, id_card, birthday, sex,
-               weight, mobile, is_del, status, create_time, update_time, is_confirm, help_company_user_id from fs_patient
+               weight, mobile, is_del, status, create_time, update_time, is_confirm, help_company_user_id, is_offline_consultation, is_read_therapy from fs_patient
     </sql>
 
     <select id="selectFsPatientList" parameterType="FsPatient" resultMap="FsPatientResult">
@@ -86,6 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="primaryImages != null">primary_images,</if>
             <if test="isConfirm != null">is_confirm,</if>
             <if test="helpCompanyUserId != null">help_company_user_id,</if>
+            <if test="isOfflineConsultation != null">is_offline_consultation,</if>
+            <if test="isReadTherapy != null">is_read_therapy,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="patientName != null">#{patientName},</if>
@@ -111,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="primaryImages != null">#{primaryImages},</if>
             <if test="isConfirm != null">#{isConfirm},</if>
             <if test="helpCompanyUserId != null">#{helpCompanyUserId},</if>
+            <if test="isOfflineConsultation != null">#{isOfflineConsultation},</if>
+            <if test="isReadTherapy != null">#{isReadTherapy},</if>
         </trim>
     </insert>
 
@@ -140,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="primaryImages != null">primary_images = #{primaryImages},</if>
             <if test="isConfirm != null">is_confirm = #{isConfirm},</if>
             <if test="helpCompanyUserId != null">help_company_user_id = #{helpCompanyUserId},</if>
+            <if test="isOfflineConsultation != null">is_offline_consultation = #{isOfflineConsultation},</if>
+            <if test="isReadTherapy != null">is_read_therapy = #{isReadTherapy},</if>
         </trim>
         where patient_id = #{patientId}
     </update>

fs-user-app/src/main/java/com/fs/app/param/FsPatientAddEditParam.java

@@ -55,4 +55,13 @@ public class FsPatientAddEditParam implements Serializable {
     private Integer isFurther;
     private String primaryHospital;
     private String primaryImages;
+    /**
+     * 是否是否因慢病在线下就诊?且对该处方内的产品无过敏或不良反应?0:是，我线下就诊过;  1: 否
+     */
+    private Integer isOfflineConsultation;
+
+    /**
+     * 是否已详细阅读疗法说明，确认自己符合疗法产品的适用人群，并了解使用方法，使用禁忌等?0:是 1：否
+     */
+    private Integer isReadTherapy;
 }