diff --git a/running/pdf/contract.pdf b/running/pdf/contract.pdf index 4daa96abc..f3cf0193e 100644 Binary files a/running/pdf/contract.pdf and b/running/pdf/contract.pdf differ diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java index 8fa32eb22..d642b6122 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthyExtended.java @@ -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; } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java index b4cc5a2bd..3e22eddef 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java @@ -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); // 审核后的订单才生成食谱 diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml index 479a15449..39cca1466 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyExtendedMapper.xml @@ -11,6 +11,9 @@ + + + @@ -18,12 +21,15 @@ + + - 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 @@ -44,6 +50,9 @@ hipline, eat_fruits_message, long_eat_drug_message, + medication_compliance, + adverse_reactions_flag, + adverse_reactions, blood_sugar_message, depressed_state_message, blood_pressure_message, @@ -51,6 +60,8 @@ menstruation_message, gastrointestinal_message, postpartum_conditioning_message, + hypertension_message, + hyperlipidemia_message, del_flag, @@ -59,6 +70,9 @@ #{hipline}, #{eatFruitsMessage}, #{longEatDrugMessage}, + #{medicationCompliance}, + #{adverseReactionsFlag}, + #{adverseReactions}, #{bloodSugarMessage}, #{depressedStateMessage}, #{bloodPressureMessage}, @@ -66,6 +80,8 @@ #{menstruationMessage}, #{gastrointestinalMessage}, #{postpartumConditioningMessage}, + #{hypertensionMessage}, + #{hyperlipidemiaMessage}, #{delFlag}, @@ -78,6 +94,9 @@ hipline = #{hipline}, eat_fruits_message = #{eatFruitsMessage}, long_eat_drug_message = #{longEatDrugMessage}, + medication_compliance = #{medicationCompliance}, + adverse_reactions_flag = #{adverseReactionsFlag}, + adverse_reactions = #{adverseReactions}, blood_sugar_message = #{bloodSugarMessage}, depressed_state_message = #{depressedStateMessage}, blood_pressure_message = #{bloodPressureMessage}, @@ -85,6 +104,8 @@ menstruation_message = #{menstruationMessage}, gastrointestinal_message = #{gastrointestinalMessage}, postpartum_conditioning_message = #{postpartumConditioningMessage}, + hypertension_message = #{hypertensionMessage}, + hyperlipidemia_message = #{hyperlipidemiaMessage}, del_flag = #{delFlag}, where id = #{id} diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml index ad06934a0..2b2f6c02c 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml @@ -549,6 +549,9 @@ + + + @@ -556,12 +559,15 @@ + + diff --git a/stdiet-ui/src/components/HealthyForm/Form8.vue b/stdiet-ui/src/components/HealthyForm/Form8.vue index 589bc3e35..78bd36344 100644 --- a/stdiet-ui/src/components/HealthyForm/Form8.vue +++ b/stdiet-ui/src/components/HealthyForm/Form8.vue @@ -109,6 +109,26 @@ > + + + {{ item.name }} + + + + + 是 + 否 + +
若存在药物不良反应，请描述下情况 + +
+

6、过敏史

@@ -280,6 +300,18 @@ export default { margin-right: 5px; } + .text-span{ + color:#606266; + font-weight: 700; + font-size: 14px + } + + .text-span-min{ + color:#606266; + font-weight: 400; + font-size: 13px + } + diff --git a/stdiet-ui/src/components/HealthyForm/FormExtended.vue b/stdiet-ui/src/components/HealthyForm/FormExtended.vue index e373a3e65..00fc07105 100644 --- a/stdiet-ui/src/components/HealthyForm/FormExtended.vue +++ b/stdiet-ui/src/components/HealthyForm/FormExtended.vue @@ -61,7 +61,7 @@ -

2、体重变化情况

+

3、体重变化情况

是 @@ -79,7 +79,7 @@ -
+ + +
+

1、现病史

+
+ +
+

2、血压情况

+ +
+ 收缩压/高压 + + mmHg +
+
+ 舒张压/低压 + + mmHg +
+ + +
+ 日期 + +
+
+ 收缩压/高压 + + mmHg +
+
+ 舒张压/低压 + + mmHg +
+
+ 静息心率 + + 次/分 +
+ + + + {{ item.name }} + + +

3、实验室检查结果

+ +
+ 总胆固醇 + + mmol/L +
+
+ 高密度脂蛋白胆固醇 + + mmol/L +
+
+ 低密度脂蛋白胆固醇 + + mmol/L +
+ + +
+ 甘油三酯 + + mmol/L +
+ + +
+ 血糖 + + mmol/L +
+ + + +
-

3、焦虑状态评估

+

4、焦虑状态评估

是 @@ -171,7 +264,7 @@ 否 -

4、郁抑状态评估

+

5、郁抑状态评估

是 @@ -198,6 +291,7 @@
+

1、月经基础情况

@@ -543,6 +637,44 @@
+ +
+

1、实验室检查结果

+ +
+ 总胆固醇 + + mmol/L +
+
+ 高密度脂蛋白胆固醇 + + mmol/L +
+
+ 低密度脂蛋白胆固醇 + + mmol/L +
+ + +
+ 甘油三酯 + + mmol/L +
+ + + + + +