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/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java index c0a128add..b6e69ff43 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java @@ -533,12 +533,14 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { sysOrder.setCommissStartTime(DateUtils.localDateToDate(serverStartDate)); sysOrder.setServerEndTime(DateUtils.localDateToDate(serverEndDate)); sysOrder.setAfterSaleId(null); + sysOrder.setNutritionistId(orderNutritionistId); sysOrderCommisionDayDetailList.add(statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime())); } if(afterSaleRecord.size() == 0){ sysOrder.setCommissStartTime(DateUtils.localDateToDate(serverStartDate)); sysOrder.setServerEndTime(DateUtils.localDateToDate(serverEndDate)); sysOrder.setNutritionistId(null); + sysOrder.setAfterSaleId(orderAfterSaleId); sysOrderCommisionDayDetailList.add(statisticsOrderMessage(sysOrder, sysCommision.getServerScopeStartTime(), sysCommision.getServerScopeEndTime())); } 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 @@ <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} 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 @@ <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> 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 @@ ></el-input> </div> </el-form-item> + <el-form-item label="(3) 服药依从性" prop="" class="margin-left"> + <el-radio-group v-model="form.healthyExtend.medicationCompliance"> + <el-radio v-for="(item,index) in healthyData['medicationComplianceArray']" :label="item.value" :key="index">{{ item.name }}</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item label="(4)、是否存在药物不良反应" class="margin-left"> + <el-radio-group v-model="form.healthyExtend.adverseReactionsFlag"> + <el-radio :label="1" >是</el-radio> + <el-radio :label="0" >否</el-radio> + </el-radio-group> + <div style="margin-top:8px;"><span class="text-span">若存在药物不良反应,请描述下情况</span> + <el-input maxlength="200" + type="textarea" + v-model="form.healthyExtend.adverseReactions" + placeholder="请输入药物不良反应情况" + show-word-limit + rows="3" + ></el-input> + </div> + </el-form-item> <p class="p_title_2">6、过敏史</p> <el-form-item label="(1) 曾经是否出现过过敏" prop="allergyFlag" class="margin-left"> <el-radio-group v-model="form.allergyFlag"> @@ -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 + } + </style> 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 @@ </div> </el-form-item> - <p class="p_title_2">2、体重变化情况</p> + <p class="p_title_2">3、体重变化情况</p> <el-form-item :label="'(1) 近三个月体重是否有变化'" class="margin-left"> <el-radio-group v-model="form.healthyExtend.bloodSugarMessage.weightChangeFlag"> <el-radio :label="1" >是</el-radio> @@ -79,7 +79,7 @@ </el-form-item> </div> - <div v-show="form.conditioningProjectId == 5"> + <!--<div v-show="form.conditioningProjectId == 5"> <p class="p_title_2">1、餐前餐后血压</p> <div style="margin-top:10px"> <div class="margin-left"><span>餐前:</span><el-input placeholder="输入血压数值" maxlength="100" v-model="form.healthyExtend.bloodPressureMessage.beforeMealBloodPressure" style="width:50%"></el-input><span class="margin-left">mmHg</span></div> @@ -143,10 +143,103 @@ <el-radio :label="0" >否</el-radio> </el-radio-group> </el-form-item> + </div>--> + + <div v-show="form.conditioningProjectId == 5"> + <p class="p_title_2">1、现病史</p> + <div style="margin-top:10px"> + <el-input type="textarea" + v-model="form.healthyExtend.hypertensionMessage.historyOfPresentIllness" + placeholder="请描述自己发现高血压及治疗的过程" + maxlength="200" + show-word-limit + rows="3" + ></el-input> + </div> + <p class="p_title_2">2、血压情况</p> + <el-form-item label="(1)、历史最高血压" class="margin-left"> + <div class="margin-left"> + <span class="text-span">收缩压/高压</span> + <el-input placeholder="输入最高收缩压/高压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.maxHighPressure" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmHg</span> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">舒张压/低压</span> + <el-input placeholder="输入最高舒张压/低压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.maxLowPressure" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmHg</span> + </div> + </el-form-item> + <el-form-item label="(2)、近期血压" class="margin-left"> + <div class="margin-left"> + <span class="text-span">日期</span> + <el-input placeholder="输入近期血压日期" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.recentTime" style="width:60%;margin-left:10px"/> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">收缩压/高压</span> + <el-input placeholder="输入近期收缩压/高压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.recentHighPressure" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmHg</span> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">舒张压/低压</span> + <el-input placeholder="输入近期舒张压/低压" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.recentLowPressure" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmHg</span> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">静息心率</span> + <el-input placeholder="输入静息心率" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.restingHeartRate" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left">次/分</span> + </div> + </el-form-item> + <el-form-item label="(3)、是否规律测量血压" class="margin-left"> + <el-radio-group v-model="form.healthyExtend.hypertensionMessage.measureBloodPressure"> + <el-radio v-for="(item,index) in healthyData['measureBloodPressureArray']" :label="item.value" :key="index">{{ item.name }}</el-radio> + </el-radio-group> + </el-form-item> + <p class="p_title_2">3、实验室检查结果</p> + <el-form-item label="(1)、胆固醇结果" class="margin-left"> + <div class="margin-left"> + <span class="text-span">总胆固醇</span> + <el-input placeholder="输入总胆固醇" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.totalCholesterol" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">高密度脂蛋白胆固醇</span> + <el-input placeholder="输入高密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.highLipoproteinCholesterol" style="width:35%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">低密度脂蛋白胆固醇</span> + <el-input placeholder="输入低密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.lowLipoproteinCholesterol" style="width:35%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + </el-form-item> + <el-form-item label="(2)、甘油三酯结果" class="margin-left"> + <div class="margin-left"> + <span class="text-span">甘油三酯</span> + <el-input placeholder="输入甘油三酯" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.triglyceride" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + </el-form-item> + <el-form-item label="(3)、血糖结果" class="margin-left"> + <div class="margin-left"> + <span class="text-span">血糖</span> + <el-input placeholder="输入血糖" maxlength="20" v-model="form.healthyExtend.hypertensionMessage.bloodSugar" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + </el-form-item> + <el-form-item label="(4)、尿常规情况" class="margin-left"> + <el-input type="textarea" + v-model="form.healthyExtend.hypertensionMessage.urinalysis" + placeholder="请描述尿常规情况" + maxlength="200" + show-word-limit + rows="3" + ></el-input> + </el-form-item> </div> <div> - <p class="p_title_2">3、焦虑状态评估</p> + <p class="p_title_2">4、焦虑状态评估</p> <el-form-item label="(1) 你认为你是一个容易焦虑或紧张的人吗?" class="margin-left"> <el-radio-group v-model="form.healthyExtend.anxietyStateMessage.easyAnxiousFlag"> <el-radio :label="1" >是</el-radio> @@ -171,7 +264,7 @@ <el-radio :label="0" >否</el-radio> </el-radio-group> </el-form-item> - <p class="p_title_2">4、郁抑状态评估</p> + <p class="p_title_2">5、郁抑状态评估</p> <el-form-item label="(1) 过去几周(或几个月)是否感觉到无精打采、伤感、或对生活的乐趣减少?" class="margin-left"> <el-radio-group v-model="form.healthyExtend.depressedStateMessage.listlessRecentlyFlag"> <el-radio :label="1" >是</el-radio> @@ -198,6 +291,7 @@ </el-form-item> </div> </div> + <!-- 月经不调、多囊卵巢综合症 --> <div v-if="form.conditioningProjectId == 1 || form.conditioningProjectId == 2"> <p class="p_title_2">1、月经基础情况</p> @@ -543,6 +637,44 @@ </div> </div> + <!-- 高血脂 --> + <div v-if="form.conditioningProjectId == 7"> + <p class="p_title_2">1、实验室检查结果</p> + <el-form-item label="(1)、胆固醇结果" class="margin-left"> + <div class="margin-left"> + <span class="text-span">总胆固醇</span> + <el-input placeholder="输入总胆固醇" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.totalCholesterol" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">高密度脂蛋白胆固醇</span> + <el-input placeholder="输入高密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.highLipoproteinCholesterol" style="width:35%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + <div class="margin-left" style="margin-top:8px;"> + <span class="text-span">低密度脂蛋白胆固醇</span> + <el-input placeholder="输入低密度脂蛋白胆固醇" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.lowLipoproteinCholesterol" style="width:35%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + </el-form-item> + <el-form-item label="(2)、甘油三酯结果" class="margin-left"> + <div class="margin-left"> + <span class="text-span">甘油三酯</span> + <el-input placeholder="输入甘油三酯" maxlength="20" v-model="form.healthyExtend.hyperlipidemiaMessage.triglyceride" style="width:50%;margin-left:10px"/> + <span class="text-span margin-left" >mmol/L</span> + </div> + </el-form-item> + + <el-form-item label="(3)、肝功能情况" class="margin-left"> + <el-input type="textarea" + v-model="form.healthyExtend.hyperlipidemiaMessage.liverFunction" + placeholder="请描述肝功能情况" + maxlength="200" + show-word-limit + rows="3" + ></el-input> + </el-form-item> + </div> </div> </template> <script> diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue index 115ac94d3..897c203a2 100644 --- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue @@ -175,7 +175,7 @@ </div> </div> <div - v-for="(item, index) in dataList.slice(9, 16)" + v-for="(item, index) in dataList.slice(9, 17)" style="margin-bottom: 50px" :key="'sign'+index" > @@ -322,7 +322,7 @@ export default { healthyTitleData: healthyData['healthyTitleData'], // 健康评估属性 healthyValueData: healthyData['healthyValueData'], - extendedTitleArray:['十、高血糖信息评估',"十、高血压信息评估","十一、焦虑信息评估","十二、抑郁信息评估","九、月经不调、多囊信息评估","九、胃肠肿瘤信息评估","九、产后调理信息评估"], + extendedTitleArray:['十、高血糖信息评估',"十、高血压信息评估","十一、焦虑信息评估","十二、抑郁信息评估","九、月经不调、多囊信息评估","九、胃肠肿瘤信息评估","九、产后调理信息评估","九、高血脂信息评估"], copyValue: "", detailHealthy: null, dialogWidth: "950px", @@ -704,6 +704,8 @@ export default { return index == 5; }else if(this.healthyData.conditioningProjectId == 4){ return index == 6; + }else if(this.healthyData.conditioningProjectId == 7){ + return index == 7; } return false; }, diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js index 6f9ab044f..c286b1df6 100644 --- a/stdiet-ui/src/utils/healthyData.js +++ b/stdiet-ui/src/utils/healthyData.js @@ -437,6 +437,20 @@ export const postpartumSymptomsArray = [ {name: "虚弱怕冷", value: "11"} ] +//服药依从性 +export const medicationComplianceArray = [ + {name: "规律", value: "1" }, + {name: "间断", value: "2"}, + {name: "不服药", value: "3"} +]; + +//是否经常测量血压 +export const measureBloodPressureArray = [ + {name: "规律", value: "1" }, + {name: "偶尔", value: "2"}, + {name: "不测量", value: "3"} +]; + //需要将数组转成字符串的属性名称,包含对象数组、字符串数组 export const arrayName = [ @@ -621,7 +635,9 @@ export const needJSONFieldName = [ "depressedStateMessage", "menstruationMessage", "gastrointestinalMessage", - "postpartumConditioningMessage" + "postpartumConditioningMessage", + "hypertensionMessage", + "hyperlipidemiaMessage" ]; //健康信息处理,将数组转为字符串 @@ -807,12 +823,12 @@ export function dealHealthy(customerHealthy) { return customerHealthy; } -export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖","3": "备孕营养", "1": "月经不调", "2": "多囊调理", "11":"心脑血管调理","13":"胃肠肿瘤调理","4":"产后调理"}; -export const projectName = {"0":"减脂","5":"高血压","6":"高血糖","3": "备孕营养", "1":"月经不调", "2":"多囊卵巢综合症", "13":"胃肠肿瘤","4":"产后调理"}; +export const extendHealthyTitle = {"0":"减脂","5":"降血压","6":"降血糖","3": "备孕营养", "1": "月经不调", "2": "多囊调理", "11":"心脑血管调理","13":"胃肠肿瘤调理","4":"产后调理","7":"高血脂"}; +export const projectName = {"0":"减脂","5":"高血压","6":"高血糖","3": "备孕营养", "1":"月经不调", "2":"多囊卵巢综合症", "13":"胃肠肿瘤","4":"产后调理","7":"高血脂"}; //需要填写慢病调查问卷的项目 -export const extendHealthyIndex = [5, 6, 1, 2, 13,4]; +export const extendHealthyIndex = [5, 6, 1, 2, 13,4,7]; //跳过减脂经历问卷的项目 -export const notExperienceIndex = [3,1,2,13,4]; +export const notExperienceIndex = [3,1,2,13,4,7]; export function getTitleKey(projectId){ return extendHealthyTitle[projectId+""] != null ? extendHealthyTitle[projectId+""] : extendHealthyTitle["0"]; @@ -914,6 +930,7 @@ export const extendedYesNoAttrName = [ {"targetAttrName": "foodIntoleranceFlag", "healthyAttrName": "gastrointestinalMessage,foodIntoleranceFlag"}, {"targetAttrName": "resumeMenstruationFlag", "healthyAttrName": "postpartumConditioningMessage,resumeMenstruationFlag"} + ] //单选的value转成对应name @@ -959,6 +976,11 @@ export function dealHealthyExtend(detailHealthy){ }); } + //服药依从性 + detailHealthy.medicationCompliance = getStringBySigleValue(medicationComplianceArray, detailHealthy.healthyExtend.medicationCompliance); + detailHealthy.adverseReactionsFlag = detailHealthy.healthyExtend.adverseReactionsFlag == 0 ? "否" : "是"; + detailHealthy.adverseReactions = detailHealthy.healthyExtend.adverseReactions; + //高血糖 detailHealthy.healthyExtend.eatFruitsMessage = eatFruitsMessage; detailHealthy.mealBloodSugar = "餐前血糖:"+(detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar == null ? "" : (detailHealthy.healthyExtend.bloodSugarMessage.beforeMealBloodSugar+"mmol/L"))+", " @@ -972,7 +994,7 @@ export function dealHealthyExtend(detailHealthy){ detailHealthy.weightChangeFlag = detailHealthy.weightChangeFlag + ",具体变化情况:"+detailHealthy.healthyExtend.bloodSugarMessage.weightChangeDescribe; //高血压 - detailHealthy.mealBloodPressure = "餐前血压:"+(detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure+"mmHg"))+", " + /*detailHealthy.mealBloodPressure = "餐前血压:"+(detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.beforeMealBloodPressure+"mmHg"))+", " +"餐后两小时血压:"+(detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure == null ? "" : (detailHealthy.healthyExtend.bloodPressureMessage.afterMealBloodPressure+"mmHg")); detailHealthy.measureBloodPressureFlag = detailHealthy.healthyExtend.bloodPressureMessage.measureBloodPressureFlag == 1 ? "是" : "否"; detailHealthy.measureBloodPressureTime = detailHealthy.healthyExtend.bloodPressureMessage.measureBloodPressureTime; @@ -981,7 +1003,52 @@ export function dealHealthyExtend(detailHealthy){ detailHealthy.pressureComplicationFlag = detailHealthy.healthyExtend.bloodPressureMessage.complicationFlag == 1 ? "是" : "否"; detailHealthy.pressureComplication = detailHealthy.healthyExtend.bloodPressureMessage.complication; detailHealthy.pressureInferiorSymptom = (detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptomFlag == 1 ? "是" : "否") + ", 具体症状:"+getStringByMuchValue(syndromeNameArray,detailHealthy.healthyExtend.bloodPressureMessage.inferiorSymptom); - detailHealthy.pressureWeightChangeFlag = detailHealthy.healthyExtend.bloodPressureMessage.weightChangeFlag == 1 ? "是" : "否"; + detailHealthy.pressureWeightChangeFlag = detailHealthy.healthyExtend.bloodPressureMessage.weightChangeFlag == 1 ? "是" : "否";*/ + + detailHealthy.historyOfPresentIllness = detailHealthy.healthyExtend.hypertensionMessage.historyOfPresentIllness; + let maxPressure = ""; + let maxHighPressure = detailHealthy.healthyExtend.hypertensionMessage.maxHighPressure; + if(nullToString(maxHighPressure) != ""){ + maxPressure += "收缩压/高压:" + maxHighPressure + " mmHg"; + } + let maxLowPressure = detailHealthy.healthyExtend.hypertensionMessage.maxLowPressure; + if(nullToString(maxLowPressure) != ""){ + maxPressure += (maxPressure != "" ? "," : "") + "舒张压/低压:" + maxLowPressure + " mmHg"; + } + detailHealthy.maxPressure = maxPressure; + let recentPressure = "时间:" + nullToString(detailHealthy.healthyExtend.hypertensionMessage.recentTime); + let recentHighPressure = nullToString(detailHealthy.healthyExtend.hypertensionMessage.recentHighPressure); + recentPressure += ",收缩压/高压:" + recentHighPressure + (recentHighPressure != "" ? " mmHg" : ""); + let recentLowPressure = nullToString(detailHealthy.healthyExtend.hypertensionMessage.recentLowPressure); + recentPressure += ",舒张压/低压:" + recentLowPressure + (recentLowPressure != "" ? " mmHg" : ""); + detailHealthy.recentPressure = recentPressure; + detailHealthy.restingHeartRate = nullToString(detailHealthy.healthyExtend.hypertensionMessage.restingHeartRate); + if(detailHealthy.restingHeartRate != ""){ + detailHealthy.restingHeartRate += " 次/分" + } + detailHealthy.measureBloodPressure = getStringBySigleValue(measureBloodPressureArray, detailHealthy.healthyExtend.hypertensionMessage.measureBloodPressure); + detailHealthy.totalCholesterol = nullToString(detailHealthy.healthyExtend.hypertensionMessage.totalCholesterol); + if(detailHealthy.totalCholesterol != ""){ + detailHealthy.totalCholesterol += " mmol/L" + } + + detailHealthy.highLipoproteinCholesterol = nullToString(detailHealthy.healthyExtend.hypertensionMessage.highLipoproteinCholesterol); + if(detailHealthy.highLipoproteinCholesterol != ""){ + detailHealthy.highLipoproteinCholesterol += " mmol/L" + } + detailHealthy.lowLipoproteinCholesterol = nullToString(detailHealthy.healthyExtend.hypertensionMessage.lowLipoproteinCholesterol); + if(detailHealthy.lowLipoproteinCholesterol != ""){ + detailHealthy.lowLipoproteinCholesterol += " mmol/L" + } + detailHealthy.triglyceride = nullToString(detailHealthy.healthyExtend.hypertensionMessage.triglyceride); + if(detailHealthy.triglyceride != ""){ + detailHealthy.triglyceride += " mmol/L" + } + detailHealthy.bloodSugar = nullToString(detailHealthy.healthyExtend.hypertensionMessage.bloodSugar); + if(detailHealthy.bloodSugar != ""){ + detailHealthy.bloodSugar += " mmol/L" + } + detailHealthy.urinalysis = nullToString(detailHealthy.healthyExtend.hypertensionMessage.urinalysis); //月经不调、多囊 detailHealthy.menstrualCycle = "生理周期:" + nullToString(detailHealthy.healthyExtend.menstruationMessage.menstrualCycle) + ",生理天数:" + nullToString(detailHealthy.healthyExtend.menstruationMessage.menstrualDays); @@ -1063,6 +1130,26 @@ export function dealHealthyExtend(detailHealthy){ detailHealthy.productionNum = "生产次数:" + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.productionNum); detailHealthy.productionNum += ",流产次数:" + nullToString(detailHealthy.healthyExtend.postpartumConditioningMessage.abortionNum); + + + //高血脂 + detailHealthy.hyperlipidemiaTotalCholesterol = nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.totalCholesterol); + if(detailHealthy.hyperlipidemiaTotalCholesterol != ""){ + detailHealthy.hyperlipidemiaTotalCholesterol += " mmol/L" + } + detailHealthy.hyperlipidemiaHighLipoproteinCholesterol = nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.highLipoproteinCholesterol); + if(detailHealthy.hyperlipidemiaHighLipoproteinCholesterol != ""){ + detailHealthy.hyperlipidemiaHighLipoproteinCholesterol += " mmol/L" + } + detailHealthy.hyperlipidemiaLowLipoproteinCholesterol = nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.lowLipoproteinCholesterol); + if(detailHealthy.hyperlipidemiaLowLipoproteinCholesterol != ""){ + detailHealthy.hyperlipidemiaLowLipoproteinCholesterol += " mmol/L" + } + detailHealthy.hyperlipidemiaTriglyceride = nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.triglyceride); + if(detailHealthy.hyperlipidemiaTriglyceride != ""){ + detailHealthy.hyperlipidemiaTriglyceride += " mmol/L" + } + detailHealthy.hyperlipidemiaLiverFunction = nullToString(detailHealthy.healthyExtend.hyperlipidemiaMessage.liverFunction); } export function nullToString(val){ @@ -1127,6 +1214,7 @@ export const healthyTitleData = [ ["病史体征", "湿气数据", "气血数据"], ["家族疾病史", "手术史", "近期是否做过手术"], ["手术恢复情况", "是否长期服用药物", "长期服用的药物"], + ["服药依从性", "是否药物不良反应","药物不良反应"], ["是否出现过过敏症状", "过敏症状", "过敏源"], ], [["体检报告(1)", "体检报告(2)", "体检报告(3)"]], @@ -1137,10 +1225,16 @@ export const healthyTitleData = [ ], [ + ["现病史","历史最高血压","近期血压"], + ["静息心率","是否规律测量血压","总胆固醇"], + ["高密度脂蛋白胆固醇","低密度脂蛋白胆固醇","甘油三酯"], + ["血糖","尿常规",""] + ], + /*[ ["餐前餐后血压", "是否有规律测血压", "测量血压时间"], ["近期血压水平", "是否有低血压反应", "是否有出现并发症"], ["并发症情况", "存在症状", "近三个月体重是否有变化"] - ], + ],*/ [ ["你认为你是一个容易焦虑或紧张的人吗","最近一段时间,你是否比平时更感到焦虑或忐忑不安","是否有一些特殊场合或情景更容易使得你紧张、焦虑"], ["你曾经有过惊恐发作吗.即突然发生的强烈不适感或心慌、眩晕、感到憋气或呼吸困难等症状","",""] @@ -1165,6 +1259,10 @@ export const healthyTitleData = [ ["孕期增长","产后几个月","生产状况"], ["孕期疾病","喂养方式","乳汁状态"], ["产后症状","恢复月经","生育史"] + ], + [ + ["总胆固醇","高密度脂蛋白胆固醇","低密度脂蛋白胆固醇"], + ["甘油三酯","肝功能",""] ] ] @@ -1215,6 +1313,7 @@ export const healthyValueData = [ ["physicalSigns", "moistureDate", "bloodData"], ["familyIllnessHistory", "operationHistory", "nearOperationFlag"], ["recoveryeSituation", "longEatDrugFlag", "longEatDrugClassify"], + ["medicationCompliance", "adverseReactionsFlag","adverseReactions"], ["allergyFlag", "allergySituation", "allergen"], ], [["medicalReport_one", "medicalReport_two", "medicalReport_three"]], @@ -1223,10 +1322,16 @@ export const healthyValueData = [ ["nearBloodSugar", "lowBloodSugarFlag", "complicationFlag"], ["complication", "inferiorSymptom", "weightChangeFlag"] ], - [ + /*[ ["mealBloodPressure", "measureBloodPressureFlag", "measureBloodPressureTime"], ["nearBloodPressure", "lowBloodPressureFlag", "pressureComplicationFlag"], ["pressureComplication", "pressureInferiorSymptom", "pressureWeightChangeFlag"], + ],*/ + [ + ["historyOfPresentIllness","maxPressure","recentPressure"], + ["restingHeartRate","measureBloodPressure","totalCholesterol"], + ["highLipoproteinCholesterol","lowLipoproteinCholesterol","triglyceride"], + ["bloodSugar","urinalysis",""] ], [ ["easyAnxiousFlag","upsetRecently","nervousOnSpecialOccasionsFlag"], @@ -1252,6 +1357,10 @@ export const healthyValueData = [ ["weightGain","postpartumMonth","productionStatus"], ["pregnancyDisease","feedingMethods","milkState"], ["postpartumSymptoms","resumeMenstruationFlag","productionNum"] + ], + [ + ["hyperlipidemiaTotalCholesterol","hyperlipidemiaHighLipoproteinCholesterol","hyperlipidemiaLowLipoproteinCholesterol"], + ["hyperlipidemiaTriglyceride","hyperlipidemiaLiverFunction",""] ] ] diff --git a/stdiet-ui/src/views/custom/signContract/index.vue b/stdiet-ui/src/views/custom/signContract/index.vue index 64525a5d1..d3f2800a7 100644 --- a/stdiet-ui/src/views/custom/signContract/index.vue +++ b/stdiet-ui/src/views/custom/signContract/index.vue @@ -77,7 +77,7 @@ <div class="line-rule">3、甲方按与乙方约定事项及服务内容,通过定制营养减脂饮食方案为乙方提供减脂服务,服务中不使用任何仪器、针药、不使用医疗类药物等。</div> <div class="line-rule">4、甲方为乙方提供专业营养指导咨询服务。</div> <div class="line-rule">5、服务标准</div> - <div style="margin-left: 24px">5.1、甲方为乙方每周提供一对一有效咨询时间6日,每日咨询服务时间为早10:00—晚20:30。每日服务10.5小时(法定节假日除外)</div> + <div style="margin-left: 24px">5.1、甲方为乙方每周提供一对一有效咨询时间6日,每日咨询服务时间为早10:00—晚19:00。每日服务9小时(法定节假日除外)</div> <div style="margin-left: 24px">5.2、乙方可享受营养学基础知识学习,肥胖与生活习惯知识学习,享受营养师亲自培训初级自我体重管理知识。</div> <div style="margin-left: 24px">5.3、甲方为乙方定制营养减脂饮食方案,7天为一期,每期结束前1—2天,更新发送下一期饮食减脂方案。</div> <div style="margin-left: 24px">5.4、甲方对乙方所做出的承诺不得超出力所能及的范围,不得夸大、吹嘘、作假服务效果,双方明确,甲方只提供咨询服务,不含任何医疗行为。</div> @@ -86,7 +86,7 @@ <div style="margin-left: 24px">5.7、乙方不能在家佐餐,需要进行外食指导,甲方有责任及义务为乙方提供对应的指导。</div> <div style="margin-left: 24px">5.8、乙方自订购服务日起,享有单一营养师的指导及咨询服务,如需中途更换指导老师,需在当期方案执行结束至少3日内告知,以便于更换指导。</div> <div style="margin-left: 24px">5.9、甲方每日会敦促乙方进行服务效果反馈,一日三餐需进行打卡。</div> - <div style="margin-left: 24px">5.10、甲方在接收到乙方发送咨询需求3.5小时内需及时为乙方解答(周日及法定节假日除外)。</div> + <!--<div style="margin-left: 24px">5.10、甲方在接收到乙方发送咨询需求3.5小时内需及时为乙方解答(周日及法定节假日除外)。</div>--> </p> <p>第二条 合作内容及费用 diff --git a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue index b87bdfd74..b087c3948 100644 --- a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue +++ b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue @@ -210,6 +210,11 @@ export default { eatFruitsMessage:[], //长期服用药物JSON数组, [{'type': 1, 'drug':[{'name':'降压药1','num':'每天三粒','time':'早中晚'}]}] longEatDrugMessage:[], + //服药依从性 + medicationCompliance: "1", + //药物不良反应 + adverseReactionsFlag: 0, + adverseReactions: null, //高血糖评估 bloodSugarMessage: { beforeMealBloodSugar: null, @@ -356,6 +361,47 @@ export default { productionNum: null, //流产次数 abortionNum: null + }, + //高血压(第二版) + hypertensionMessage:{ + //现病史 + historyOfPresentIllness: null, + maxHighPressure: null, + maxLowPressure: null, + recentTime: null, + recentHighPressure: null, + recentLowPressure: null, + //静息心率 + restingHeartRate: null, + measureBloodPressure: "1", + + totalCholesterol: null, + //高密度脂蛋白胆固醇 + highLipoproteinCholesterol: null, + //低密度脂蛋白胆固醇 + lowLipoproteinCholesterol: null, + //甘油三酯 + triglyceride: null, + //血糖 + bloodSugar: null, + //尿常规 + urinalysis: null, + //月经史 + menstrualHistory: null, + //妊娠史 + historyOfPregnancy: null + }, + //高血脂 + hyperlipidemiaMessage:{ + totalCholesterol: null, + //高密度脂蛋白胆固醇 + highLipoproteinCholesterol: null, + //低密度脂蛋白胆固醇 + lowLipoproteinCholesterol: null, + //甘油三酯 + triglyceride: null, + //肝功能 + liverFunction: null } } },