Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

高血压高血脂问卷、合同修改5.1时间修改

Browse Source
This commit is contained in:
xiezhijun
2021-07-02 18:33:11 +08:00
parent 60ca29c320
commit 0d3d7081a7
11 changed files with 395 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java
View File

@ -41,6 +41,18 @@ public class SysCustomerHealthyExtended extends BaseEntity
@Excel(name = "长时间服用药物信息：药物类型、药物名称、用药量、用药时间")
private String longEatDrugMessage;
/** 服药依从性 */
@Excel(name = "服药依从性")
private String medicationCompliance;
/** 药物不良反应标识 */
@Excel(name = "药物不良反应标识")
private Long adverseReactionsFlag;
/** 药物不良反应 */
@Excel(name = "药物不良反应")
private String adverseReactions;
/** 血糖相关信息 */
@Excel(name = "血糖相关信息")
private String bloodSugarMessage;
@ -69,6 +81,14 @@ public class SysCustomerHealthyExtended extends BaseEntity
@Excel(name = "产后调理信息")
private String postpartumConditioningMessage;
/** 高血压信息 */
@Excel(name = "高血压信息")
private String hypertensionMessage;
/** 高血脂信息 */
@Excel(name = "高血脂信息")
private String hyperlipidemiaMessage;
/** 删除标识 0未删除 1已删除 */
private Long delFlag;
}

6
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java
View File

@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
@ -285,6 +286,11 @@ public class SysOrderServiceImpl implements ISysOrderService {
sysOrder.setCommissStartTime(sysOrder.getStartTime());
}
}
//旧开始时间为空时，提成计算时间修改为订单成交时间的后三天
if(oldSysOrder.getStartTime() == null){
LocalDate orderDate = DateUtils.dateToLocalDate(sysOrder.getOrderTime()).plusDays(3);
sysOrder.setCommissStartTime(DateUtils.localDateToDate(orderDate));
}
//更新订单
int row = sysOrderMapper.updateSysOrder(sysOrder);
// 审核后的订单才生成食谱

25
stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml
View File

@ -11,6 +11,9 @@
<result property="hipline" column="hipline" />
<result property="eatFruitsMessage" column="eat_fruits_message" />
<result property="longEatDrugMessage" column="long_eat_drug_message" />
<result property="medicationCompliance" column="medication_compliance" />
<result property="adverseReactionsFlag" column="adverse_reactions_flag" />
<result property="adverseReactions" column="adverse_reactions" />
<result property="bloodSugarMessage" column="blood_sugar_message" />
<result property="depressedStateMessage" column="depressed_state_message" />
<result property="bloodPressureMessage" column="blood_pressure_message" />
@ -18,12 +21,15 @@
<result property="menstruationMessage" column="menstruation_message" />
<result property="gastrointestinalMessage" column="gastrointestinal_message" />
<result property="postpartumConditioningMessage" column="postpartum_conditioning_message" />
<result property="hypertensionMessage" column="hypertension_message" />
<result property="hyperlipidemiaMessage" column="hyperlipidemia_message" />
<result property="delFlag" column="del_flag" />
</resultMap>
<sql id="selectSysCustomerHealthyExtendedVo">
select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, blood_sugar_message, depressed_state_message, blood_pressure_message, anxiety_state_message, menstruation_messag,
gastrointestinal_message,postpartum_conditioning_message,del_flag
select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, medication_compliance,adverse_reactions_flag,adverse_reactions,
blood_sugar_message, depressed_state_message, blood_pressure_message, anxiety_state_message, menstruation_messag,
gastrointestinal_message,postpartum_conditioning_message,hypertension_message,hyperlipidemia_message,del_flag
from sys_customer_healthy_extended
</sql>
@ -44,6 +50,9 @@
<if test="hipline != null">hipline,</if>
<if test="eatFruitsMessage != null">eat_fruits_message,</if>
<if test="longEatDrugMessage != null">long_eat_drug_message,</if>
<if test="medicationCompliance != null">medication_compliance,</if>
<if test="adverseReactionsFlag != null">adverse_reactions_flag,</if>
<if test="adverseReactions != null">adverse_reactions,</if>
<if test="bloodSugarMessage != null">blood_sugar_message,</if>
<if test="depressedStateMessage != null">depressed_state_message,</if>
<if test="bloodPressureMessage != null">blood_pressure_message,</if>
@ -51,6 +60,8 @@
<if test="menstruationMessage != null">menstruation_message,</if>
<if test="gastrointestinalMessage != null">gastrointestinal_message,</if>
<if test="postpartumConditioningMessage != null">postpartum_conditioning_message,</if>
<if test="hypertensionMessage != null">hypertension_message,</if>
<if test="hyperlipidemiaMessage != null">hyperlipidemia_message,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -59,6 +70,9 @@
<if test="hipline != null">#{hipline},</if>
<if test="eatFruitsMessage != null">#{eatFruitsMessage},</if>
<if test="longEatDrugMessage != null">#{longEatDrugMessage},</if>
<if test="medicationCompliance != null">#{medicationCompliance},</if>
<if test="adverseReactionsFlag != null">#{adverseReactionsFlag},</if>
<if test="adverseReactions != null">#{adverseReactions},</if>
<if test="bloodSugarMessage != null">#{bloodSugarMessage},</if>
<if test="depressedStateMessage != null">#{depressedStateMessage},</if>
<if test="bloodPressureMessage != null">#{bloodPressureMessage},</if>
@ -66,6 +80,8 @@
<if test="menstruationMessage != null">#{menstruationMessage},</if>
<if test="gastrointestinalMessage != null">#{gastrointestinalMessage},</if>
<if test="postpartumConditioningMessage != null">#{postpartumConditioningMessage},</if>
<if test="hypertensionMessage != null">#{hypertensionMessage},</if>
<if test="hyperlipidemiaMessage != null">#{hyperlipidemiaMessage},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
@ -78,6 +94,9 @@
<if test="hipline != null">hipline = #{hipline},</if>
<if test="eatFruitsMessage != null">eat_fruits_message = #{eatFruitsMessage},</if>
<if test="longEatDrugMessage != null">long_eat_drug_message = #{longEatDrugMessage},</if>
<if test="medicationCompliance != null">medication_compliance = #{medicationCompliance},</if>
<if test="adverseReactionsFlag != null">adverse_reactions_flag = #{adverseReactionsFlag},</if>
<if test="adverseReactions != null">adverse_reactions = #{adverseReactions},</if>
<if test="bloodSugarMessage != null">blood_sugar_message = #{bloodSugarMessage},</if>
<if test="depressedStateMessage != null">depressed_state_message = #{depressedStateMessage},</if>
<if test="bloodPressureMessage != null">blood_pressure_message = #{bloodPressureMessage},</if>
@ -85,6 +104,8 @@
<if test="menstruationMessage != null">menstruation_message = #{menstruationMessage},</if>
<if test="gastrointestinalMessage != null">gastrointestinal_message = #{gastrointestinalMessage},</if>
<if test="postpartumConditioningMessage != null">postpartum_conditioning_message = #{postpartumConditioningMessage},</if>
<if test="hypertensionMessage != null">hypertension_message = #{hypertensionMessage},</if>
<if test="hyperlipidemiaMessage != null">hyperlipidemia_message = #{hyperlipidemiaMessage},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where id = #{id}

10
stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
View File

@ -549,6 +549,9 @@
<result property="hipline" column="hipline" />
<result property="eatFruitsMessage" column="eat_fruits_message" />
<result property="longEatDrugMessage" column="long_eat_drug_message" />
<result property="medicationCompliance" column="medication_compliance" />
<result property="adverseReactionsFlag" column="adverse_reactions_flag" />
<result property="adverseReactions" column="adverse_reactions" />
<result property="bloodSugarMessage" column="blood_sugar_message" />
<result property="depressedStateMessage" column="depressed_state_message" />
<result property="bloodPressureMessage" column="blood_pressure_message" />
@ -556,12 +559,15 @@
<result property="menstruationMessage" column="menstruation_message" />
<result property="gastrointestinalMessage" column="gastrointestinal_message" />
<result property="postpartumConditioningMessage" column="postpartum_conditioning_message" />
<result property="hypertensionMessage" column="hypertension_message" />
<result property="hyperlipidemiaMessage" column="hyperlipidemia_message" />
<result property="delFlag" column="del_flag" />
</resultMap>
<select id="getHealthyExtendedByHealthyId" parameterType="Long" resultMap="HealthyExtendedResult">
select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, blood_sugar_message, depressed_state_message,
blood_pressure_message, anxiety_state_message,menstruation_message,gastrointestinal_message,postpartum_conditioning_message
select id, healthy_id, waist, hipline, eat_fruits_message, long_eat_drug_message, medication_compliance,adverse_reactions_flag,adverse_reactions,
blood_sugar_message, depressed_state_message,blood_pressure_message, anxiety_state_message,menstruation_message,gastrointestinal_message,postpartum_conditioning_message,
hypertension_message,hyperlipidemia_message
from sys_customer_healthy_extended where del_flag = 0 and healthy_id = #{id} limit 1
</select>