Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-前台/src/views/medicalFile/index.vue

@@ -884,74 +884,69 @@ export default {
             trigger: "blur",
           },
         ],
-        ethnicity: [
-          {
-            required: true,
-            message: "民族不能为空",
-            trigger: "blur",
-          },
-        ],
-        idCardType: [
-          {
-            required: true,
-            message: "证件类型不能为空",
-            trigger: "blur",
-          },
-        ],
-        idCard: [
-          {
-            required: true,
-            message: "证件号码不能为空",
-            trigger: "blur",
-          },
-        ],
-        visitType: [
-          {
-            required: true,
-            message: "诊疗类型不能为空",
-            trigger: "blur",
-          },
-        ],
-        visitNumber: [
-          {
-            required: true,
-            message: "门诊号/住院号不能为空",
-            trigger: "blur",
-          },
-        ],
-        visitTime: [
-          {
-            required: true,
-            message: "门诊时间/住院时间不能为空",
-            trigger: "change",
-          },
-        ],
-        dischargeTime: [
-          {
-            required: true,
-            message: "出院时间不能为空",
-            trigger: "change",
-          },
-        ],
-        doctor: [
-          {
-            required: true,
-            message: "责任医生不能为空",
-            trigger: "blur",
-          },
-        ],
-        educationYears: [
-          {
-            required: true,
-            message: "受教育年限不能为空",
-            trigger: "blur",
-          },
-        ],
-        // queueIdList: [{
+        // ethnicity: [
+        //   {
+        //     required: true,
+        //     message: "民族不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // idCardType: [
+        //   {
+        //     required: true,
+        //     message: "证件类型不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // idCard: [
+        //   {
         //     required: true,
-        // 	message: "随访队列不能为空",
+        //     message: "证件号码不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // visitType: [
+        //   {
+        //     required: true,
+        //     message: "诊疗类型不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // visitNumber: [
+        //   {
+        //     required: true,
+        //     message: "门诊号/住院号不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // visitTime: [
+        //   {
+        //     required: true,
+        //     message: "门诊时间/住院时间不能为空",
         //     trigger: "change",
-        // }],
+        //   },
+        // ],
+        // dischargeTime: [
+        //   {
+        //     required: true,
+        //     message: "出院时间不能为空",
+        //     trigger: "change",
+        //   },
+        // ],
+        // doctor: [
+        //   {
+        //     required: true,
+        //     message: "责任医生不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // educationYears: [
+        //   {
+        //     required: true,
+        //     message: "受教育年限不能为空",
+        //     trigger: "blur",
+        //   },
+        // ],
         birthDate: [
           {
             required: true,

acupuncture-前台/src/views/screening/h5.vue

@@ -7,7 +7,7 @@
         您好！非常感谢您参与南宁市“享瘦美好邕抱健康”健康体重管理活动。本次活动是由南宁市卫生健康委组织的南宁市“体重管理年”系列活动之一，旨在通过建立“筛查-干预-追踪”全流程的体重管理服务体系，全面提升南宁市民的健康水平。
       </div>
       <div class="text-dl">
-        在您参与此次意义非凡的活动前，请您仔细阅读以下内容，这将帮助您充分了解本次活动并保障您的权益：
+        在您参与此次活动前，请您仔细阅读以下内容，这将帮助您充分了解本次活动并保障您的权益：
       </div>
       <div class="text-dl">
         1.减重方法安全性：本次采用的减重方法已通过严格的医学验证与实践检验，安全可靠，不会对您的身体造成任何伤害。

acupuncture-前台/src/views/screening/h5Result.vue

@@ -3,35 +3,25 @@
     <div class="hospital">{{ tenantName || "-" }}</div>
     <div class="card">
       <div class="card-title">筛查结论</div>
-      <div
-        style="
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 6px;
-        "
-      >
-        <span>您的体重指数（BMI）为：</span>
-        <span>{{ form["SCWJ-BMI"] || "-" }}</span>
+      <div class="card-tips-item">
+        <span class="lable">您的体重指数（BMI）为：</span>
+        <span class="div-value" v-if="weightShow">{{ form["SCWJ-BMI"] }}</span>
+        <div class="div-value1" v-else>您的筛查结论是正常的</div>
       </div>
-      <div
-        style="
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 6px;
-        "
-      >
-        <span>您的睡眠效率为：</span>
-        <span>{{ form["SCWJ-SMXL"] || "-" }}%</span>
+      <div class="card-tips-item">
+        <span class="lable">您的睡眠效率为：</span>
+        <span class="div-value" v-if="sleepShow">{{ form["SCWJ-SMXL"] }}%</span>
+        <div class="div-value1" v-else>您的筛查结论是正常的</div>
       </div>
     </div>
-    <div class="card" v-if="weightShow || sleepShow">
+    <div class="card card1" v-if="weightShow || sleepShow">
       <span v-if="weightShow">
         属于<span :class="`BIMTips${BMIVerdict[form['SCWJ-JL']]}`">{{
           form["SCWJ-JL"] || "-"
         }}</span
         >型肥胖，</span
       ><span v-if="sleepShow"><span class="BIMTips5">睡眠效率欠佳</span>，</span
-      >建议扫码关注医院公众号，预约体重管理中心医师进一步评估。
+      >您此次筛查报名已成功，建议扫码关注医院公众号，预约体重管理中心医师进一步评估。流程为：公众号→就诊服务→预约挂号→体重管理中心→选择医师。或可以电话0771-2312932进行咨询。
       <div>
         <img src="./gzh.jpg" style="max-width: 100%" />
       </div>
@@ -93,11 +83,46 @@ export default {
       this.sleepShow = true;
     }
   },
-  methods: {},
+  methods: {
+    getBmiTips(bmi) {
+      let weight = this.BMIVerdict[this.form["SCWJ-JL"]]; // 体重结论
+      if (weight >= 3) {
+        return bmi;
+      } else {
+        return "您的筛查结论是正常的";
+      }
+    },
+    getSmxlTips(smxl) {
+      let sleep = this.form["SCWJ-SMXL"]; // 睡眠效率
+      if (sleep < 80) {
+        return `${smxl}%`;
+      } else {
+        return "您的筛查结论是正常的";
+      }
+    },
+  },
 };
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
+.card-tips-item {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.div-value {
+  color: red;
+}
+.div-value1 {
+  width: 100%;
+  text-align: right;
+  color: green;
+}
+.lable {
+  text-align: right;
+  width: 194px;
+  flex-shrink: 0;
+}
 .hospital1 {
   text-align: center;
   font-size: 14px;
@@ -143,12 +168,15 @@ export default {
 }
 
 .card {
+  font-size: 16px;
   padding: 16px;
   background: #fff;
   border-radius: 6px;
   margin-bottom: 14px;
+  line-height: 26px;
+}
+.card1 {
 }
-
 .card-title {
   font-weight: 600;
   font-size: 20px;