diff --git a/acupuncture-前台/src/views/screening/h5.vue b/acupuncture-前台/src/views/screening/h5.vue
index effd7d26..65705777 100644
--- a/acupuncture-前台/src/views/screening/h5.vue
+++ b/acupuncture-前台/src/views/screening/h5.vue
@@ -1,28 +1,31 @@
 <template>
   <div class="app-container">
-    <div class="hospital">南宁市健康体重管理活动知情同意书</div>
+    <div class="hospital">
+      南宁市“享‘瘦’美好·邕抱健康”
+      <br />
+      全民科学减重活动知情同意书
+    </div>
     <div class="zqty">
       <div class="text-bt">尊敬的先生/女士：</div>
       <div class="text-dl">
-        您好！非常感谢您参与南宁市“享瘦美好邕抱健康”健康体重管理活动。本次活动是由南宁市卫生健康委组织的南宁市“体重管理年”系列活动之一，旨在通过建立“筛查-干预-追踪”全流程的体重管理服务体系，全面提升南宁市民的健康水平。
-      </div>
-      <div class="text-dl">
-        在您参与此次活动前，请您仔细阅读以下内容，这将帮助您充分了解本次活动并保障您的权益：
+        您好！非常感谢您参与南宁市“享‘瘦’美好·邕抱健康”全民科学减重活动。本次活动是南宁市“体重管理年”系列活动之一，旨在倡导市民树立“每个人是健康第一责任人”理念，科学管理体重，提升健康水平。
       </div>
+      <div class="text-dl">在您参与此次活动前，请您仔细阅读以下内容：</div>
       <div class="text-dl">
-        1.减重方法安全性：本次采用的减重方法已通过严格的医学验证与实践检验，安全可靠，不会对您的身体造成任何伤害。
+        1.本活动按照自愿参加、知情同意、公益健康的原则，倡导符合入选标准的市民参加。
       </div>
       <div class="text-dl">
-        2.生活影响说明：参与本次活动仅需您投入少量时间，整个过程不会干扰您的日常生活节奏，不会给您带来任何不利影响。
+        2.请您如实填写报名信息，身体质量指数（BMI）以市第七人民医院现场测量的数据作为评判最终入选的标准；报名信息提交成功后，请您按照小程序的提示预约现场测量时间地点。
       </div>
       <div class="text-dl">
-        3.个人信息保护：我们高度重视您的隐私，将严格遵循相关法律法规，采用严密的信息安全防护措施，对您提供的所有个人信息和数据进行严格保密，绝不会泄露给未经授权的第三方。
+        3.科学减重需循序渐进，进行合理的饮食控制和定期的体育锻炼，请您在市第七人民医院专业减重团队的指导下，自律遵守有关项目管理要求，自觉改变不利于体重管理的行为习惯，按时参与数据填报及回访工作。
       </div>
       <div class="text-dl">
-        4.信息填报与回访要求：您所提供的信息是南宁市民健康体重管理数据的重要组成部分，关乎整体数据的准确性与有效性。请您务必如实填写各项信息，并按照活动组织者的要求，按时参与后续的数据填报及回访工作，这对确保活动的完整性至关重要。
+        4.市第七人民医院采用的体重管理方法已通过严格的医学验证与实践检验，安全可靠。
       </div>
       <div class="text-dl">
-        5.退出机制：若在活动过程中，您因身体突发状况或其他不可抗力因素需要退出，请及时告知活动组织者，我们将尊重您的决定，并妥善处理后续事宜。
+        5.若在活动过程中，您因身体突发状况或其他不可抗力因素需要退出，请及时告知市第七人民医院，我们将尊重您的决定，并妥善处理后续事宜
+        。
       </div>
       <div class="text-dl">
         本人已仔细阅读并充分理解上述内容，同意自愿参与本次活动，愿意积极配合组织者完成后续各项任务。
diff --git a/acupuncture-前台/src/views/screening/h5Result.vue b/acupuncture-前台/src/views/screening/h5Result.vue
index 17443fb3..9dbacb5f 100644
--- a/acupuncture-前台/src/views/screening/h5Result.vue
+++ b/acupuncture-前台/src/views/screening/h5Result.vue
@@ -7,24 +7,27 @@
         <span class="lable">您的体重指数（BMI）为：</span>
         <span>{{ form["SCWJ-BMI"] }}</span>
       </div>
-      <div :style="{ color: weightShow ? 'red' : 'green' }">
-        {{ weightShow ? "" : "您的筛查结论是正常的" }}
-      </div>
+
       <div class="card-tips-item">
         <span class="lable">您的睡眠效率为：</span>
         <span>{{ form["SCWJ-SMXL"] }}%</span>
       </div>
-      <div :style="{ color: sleepShow ? 'red' : 'green' }">
-        {{
-          sleepShow ? "您的睡眠筛查结论是欠佳的" : "您的睡眠筛查结论是正常的"
-        }}
+      <div>
+        <span :style="{ color: sleepShow ? 'red' : 'green' }">
+          {{
+            sleepShow
+              ? "您的睡眠筛查结论是欠佳的，"
+              : "您的睡眠筛查结论是正常的，"
+          }}</span
+        ><span :style="{ color: weightShow ? 'red' : 'green' }">{{
+          weightShow
+            ? `您属于${form["SCWJ-JL"]}型肥胖`
+            : "您的体重筛查结论是正常的"
+        }}</span>
       </div>
     </div>
     <div class="card card1" v-if="weightShow">
-      您已成功报名此次减重活动！您属于<span
-        :class="`BIMTips${BMIVerdict[form['SCWJ-JL']]}`"
-        >{{ form["SCWJ-JL"] || "-" }}</span
-      >型肥胖，下一步请扫码关注南宁市第七人民医院微信公众号，预约体重管理中心医师进一步评估。流程为：
+      您已成功报名此次减重活动！下一步请扫码关注南宁市第七人民医院微信公众号，预约体重管理中心医师进一步评估。流程为：
       <br />
       公众号→体重管理→减重预约挂号→体重管理中心→选择医师。咨询电话0771-2312932。
       <div>
diff --git a/acupuncture-前台/src/views/screening/h5eva.vue b/acupuncture-前台/src/views/screening/h5eva.vue
index 99f8e0fc..09c754dc 100644
--- a/acupuncture-前台/src/views/screening/h5eva.vue
+++ b/acupuncture-前台/src/views/screening/h5eva.vue
@@ -6,7 +6,7 @@
       :rules="rules"
       ref="form"
       :model="form"
-      label-width="105px"
+      label-width="135px"
     >
       <!-- 姓名、性别（单选）、出生日期、年龄、联系方式 -->
       <div class="card">
@@ -32,7 +32,7 @@
               <span>扫描身份证</span>
             </div>
           </el-upload> -->
-          <el-form-item label="单位" prop="SCWJ-DW">
+          <el-form-item label="单位（全称/无）" prop="SCWJ-DW">
             <el-input
               v-model="form['SCWJ-DW']"
               placeholder="请输入单位"
@@ -276,19 +276,30 @@
     <div class="hospital1">{{ tenantName || "-" }}</div>
     <el-dialog
       class="popup"
-      title="筛查结论"
+      title="提示"
       :visible.sync="open"
       width="80%"
       append-to-body
       :show-close="false"
       :close-on-click-modal="false"
     >
-      属于<span :class="`BIMTips${BMIVerdict[form['SCWJ-JL']]}`">{{
-        form["SCWJ-JL"] || "-"
-      }}</span
-      >型肥胖，建议扫码关注医院公众号，预约体重管理中心医师进一步评估。
-      <div>
-        <img src="./gzh.jpg" style="max-width: 100%" />
+      <div class="popup-box">
+        <el-radio v-model="popupRadio" :label="1" class="popup-radio">
+          编辑信息</el-radio
+        >
+        <el-radio v-model="popupRadio" :label="2" class="popup-radio"
+          >查看结论</el-radio
+        >
+      </div>
+
+      <div class="submit-box submit-box1">
+        <el-button
+          type="primary"
+          class="submit-box-but"
+          @click="handlePopupVerify"
+        >
+          确认
+        </el-button>
       </div>
     </el-dialog>
   </div>
@@ -307,10 +318,12 @@ export default {
   name: "Notice",
   data() {
     return {
+      popupRadio: 1,
       open: false,
       loading: false,
       disabled: true,
-
+      detailList: {}, // 筛查患者详情
+      detailId: null, // 筛查患者id
       tenantId: "",
       tenantName: "",
       stepNum: 1, // 步骤数
@@ -527,42 +540,42 @@ export default {
           {
             required: true,
             message: "单位不能为空",
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-NAME": [
           {
             required: true,
             message: "姓名不能为空",
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-SEX": [
           {
             required: true,
             message: "性别不能为空",
-            trigger: "change",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-BIRTH": [
           {
             required: true,
             message: "出生日期不能为空",
-            trigger: "change",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-AGE": [
           {
             required: true,
             message: "年龄不能为空",
-            trigger: "change",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-PHONE": [
           {
             required: true,
             message: "联系方式不能为空",
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
           {
             pattern: /^1[3456789]\d{9}$/,
@@ -574,49 +587,49 @@ export default {
           {
             required: true,
             message: "身高不能为空",
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-WEIGHT": [
           {
             required: true,
             message: "体重不能为空",
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-BMI": [
           {
             required: false,
             message: "BMI不能为空",
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-SCSJ": [
           {
             required: true,
             message: "上床睡觉不能为空",
-            trigger: "change",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-RSSJ": [
           {
             required: true,
             message: "入睡时间不能为空",
-            trigger: "change",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-SXSJ": [
           {
             required: true,
             message: "睡醒时间不能为空",
-            trigger: "change",
+            trigger: ["blur", "change"],
           },
         ],
         "SCWJ-QCSJ": [
           {
             required: true,
             message: "起床时间不能为空",
-            trigger: "change",
+            trigger: ["blur", "change"],
           },
         ],
       },
@@ -640,39 +653,44 @@ export default {
     },
   },
   methods: {
+    // 编辑信息
+    handlePopupVerify() {
+      if (this.popupRadio === 1) {
+        this.form = { ...this.form, ...this.detailList };
+        setTimeout(() => {
+          this.open = false;
+        }, 500);
+      } else {
+        this.$router.replace({
+          path: "/screening/h5Result",
+          query: {
+            tenantName: this.tenantName,
+            data: JSON.stringify(this.detailList),
+          },
+        });
+        this.open = false;
+      }
+    },
     // 通过手机号查询
     getqueryDetailNoToken() {
       let phone = this.form["SCWJ-PHONE"];
       let name = this.form["SCWJ-NAME"];
       // // 手机号是否格式正确
       if (name && phone && /^1[3456789]\d{9}$/.test(phone)) {
-        queryDetailNoToken({ param: { keywords: phone } }).then((res) => {
-          let flat = false;
-          let detailList = null;
-          res.data.list.forEach((item) => {
-            let data = {};
-            if (item.detailList) {
-              item.detailList?.forEach((row) => {
-                item[row.questionCode] = row.answer;
-                data[row.questionCode] = row.answer;
+        queryDetailNoToken({ param: { name: name, phone: phone } }).then(
+          (res) => {
+            this.detailList = {};
+            if (res.data.list.length) {
+              let data = res.data.list[0];
+              this.detailId = data.id;
+              console.log("this.detailId", this.detailId);
+              data.detailList.forEach((item) => {
+                this.detailList[item.questionCode] = item.answer;
               });
+              this.open = true;
             }
-            if (item["SCWJ-NAME"] == name && item["SCWJ-PHONE"] == phone) {
-              flat = true;
-              detailList = data;
-              console.log("已经筛查过，直接显示结果");
-            }
-          });
-          if (flat) {
-            this.$router.replace({
-              path: "/screening/h5Result",
-              query: {
-                tenantName: this.tenantName,
-                data: JSON.stringify(detailList),
-              },
-            });
           }
-        });
+        );
       }
     },
     // 获取筛查结论
@@ -743,6 +761,7 @@ export default {
 
     // 通过出生日期计算年龄
     calculateAge() {
+      if (!this.form["SCWJ-BIRTH"]) return;
       const birthDate = new Date(this.form["SCWJ-BIRTH"]);
       const today = new Date();
       let age = today.getFullYear() - birthDate.getFullYear();
@@ -894,58 +913,17 @@ export default {
                 centerId: this.tenantId,
               },
             };
-            create(params).then(async (res) => {
+            // detailId 存在，说明是编辑
+            if (this.detailId) {
               this.loading = true;
-              this.detailId = res.data.detailId;
-              this.id = res.data.id;
-              // ------ 保存答案 ------
-              // 基本信息
-              await this.saveAnswer(this.form["SCWJ-DW"], "SCWJ-DW");
-              await this.saveAnswer(this.form["SCWJ-NAME"], "SCWJ-NAME");
-              await this.saveAnswer(this.form["SCWJ-SEX"], "SCWJ-SEX");
-              await this.saveAnswer(this.form["SCWJ-BIRTH"], "SCWJ-BIRTH");
-              await this.saveAnswer(this.form["SCWJ-AGE"], "SCWJ-AGE");
-              await this.saveAnswer(this.form["SCWJ-PHONE"], "SCWJ-PHONE");
-              await this.saveAnswer(this.form["SCWJ-HEIGHT"], "SCWJ-HEIGHT");
-              await this.saveAnswer(this.form["SCWJ-WEIGHT"], "SCWJ-WEIGHT");
-              await this.saveAnswer(this.form["SCWJ-BMI"], "SCWJ-BMI");
-              await this.saveAnswer(this.form["SCWJ-JL"], "SCWJ-JL");
-              await this.saveAnswer(this.form["SCWJ-SCSJ"], "SCWJ-SCSJ");
-              await this.saveAnswer(this.form["SCWJ-RSSJ"], "SCWJ-RSSJ");
-              await this.saveAnswer(this.form["SCWJ-SXSJ"], "SCWJ-SXSJ");
-              await this.saveAnswer(this.form["SCWJ-QCSJ"], "SCWJ-QCSJ");
-              await this.saveAnswer(this.form["SCWJ-SMXL"], "SCWJ-SMXL");
-              // 现病史暂时去掉（甲方：把疾病风险选择去掉，领导说太占时间了）
-              // await this.saveAnswer(
-              //   this.form["SCWJ-XBS"].toString(),
-              //   "SCWJ-XBS"
-              // );
-              // await this.saveAnswer(this.form["SCWJ-XBS-QT"], "SCWJ-XBS-QT");
-              await this.saveAnswer(this.tips, "SCREEN-JL");
-
-              // 筛查总分
-              // await this.saveAnswer(score, "SCWJ-RESULT");
-              // await this.saveAnswer(
-              //   this.form["SCWJ-ZLFS"].toString(),
-              //   "SCWJ-ZLFS"
-              // ); // 治疗方式
-              // await this.saveAnswer(this.form["SCWJ-ZLZQ"], "SCWJ-ZLZQ"); // 治疗周期
-              // ------ 提交筛查 ------
-              const submitParams = { param: { detailId: this.detailId } };
-              await screenSubmit(submitParams).then((response) => {
-                this.loading = false;
-                this.disabled = false;
-                this.$modal.msgSuccess("提交成功");
+              this.handlesaveCommit();
+            } else {
+              create(params).then(async (res) => {
+                this.loading = true;
+                this.detailId = res.data.detailId;
+                this.handlesaveCommit();
               });
-              // 根据筛查结果，判断是否需要显示二维码
-              this.$router.replace({
-                path: "/screening/h5Result",
-                query: {
-                  tenantName: this.tenantName,
-                  data: JSON.stringify(this.form),
-                },
-              });
-            });
+            }
           }
         });
       } catch (error) {
@@ -955,6 +933,42 @@ export default {
         this.$message.error("提交失败，请稍后重试！");
       }
     },
+    // 保存答案、提交
+    async handlesaveCommit() {
+      // ------ 保存答案 ------
+      // 基本信息
+      await this.saveAnswer(this.form["SCWJ-DW"], "SCWJ-DW");
+      await this.saveAnswer(this.form["SCWJ-NAME"], "SCWJ-NAME");
+      await this.saveAnswer(this.form["SCWJ-SEX"], "SCWJ-SEX");
+      await this.saveAnswer(this.form["SCWJ-BIRTH"], "SCWJ-BIRTH");
+      await this.saveAnswer(this.form["SCWJ-AGE"], "SCWJ-AGE");
+      await this.saveAnswer(this.form["SCWJ-PHONE"], "SCWJ-PHONE");
+      await this.saveAnswer(this.form["SCWJ-HEIGHT"], "SCWJ-HEIGHT");
+      await this.saveAnswer(this.form["SCWJ-WEIGHT"], "SCWJ-WEIGHT");
+      await this.saveAnswer(this.form["SCWJ-BMI"], "SCWJ-BMI");
+      await this.saveAnswer(this.form["SCWJ-JL"], "SCWJ-JL");
+      await this.saveAnswer(this.form["SCWJ-SCSJ"], "SCWJ-SCSJ");
+      await this.saveAnswer(this.form["SCWJ-RSSJ"], "SCWJ-RSSJ");
+      await this.saveAnswer(this.form["SCWJ-SXSJ"], "SCWJ-SXSJ");
+      await this.saveAnswer(this.form["SCWJ-QCSJ"], "SCWJ-QCSJ");
+      await this.saveAnswer(this.form["SCWJ-SMXL"], "SCWJ-SMXL");
+      await this.saveAnswer(this.tips, "SCREEN-JL");
+      // ------ 提交筛查 ------
+      const submitParams = { param: { detailId: this.detailId } };
+      await screenSubmit(submitParams).then((response) => {
+        this.loading = false;
+        this.disabled = false;
+        this.$modal.msgSuccess("提交成功");
+      });
+      // 根据筛查结果，判断是否需要显示二维码
+      this.$router.replace({
+        path: "/screening/h5Result",
+        query: {
+          tenantName: this.tenantName,
+          data: JSON.stringify(this.form),
+        },
+      });
+    },
     // 保存答案
     async saveAnswer(value, str) {
       try {
@@ -978,6 +992,19 @@ export default {
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
+.popup-item {
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+.popup-title {
+  font-size: 20px;
+  color: #333333;
+  margin-bottom: 20px;
+  text-align: center;
+}
 >>> .el-dialog__header {
   padding-bottom: 0;
 }
@@ -1061,17 +1088,27 @@ export default {
   color: #555555;
   line-height: 20px;
 }
+.popup-box {
+  display: flex;
+}
 .submit-box {
   display: flex;
   justify-content: center;
   align-items: center;
 }
+
 .submit-box .submit-box-but {
   background: #c6a268;
   width: 100%;
   font-size: 16px;
   margin-bottom: 10px;
 }
+.submit-box1 .submit-box-but {
+  width: 65% !important;
+  border: none;
+  margin-top: 30px;
+  margin-bottom: 0;
+}
 .card {
   padding: 16px;
   background: #fff;
diff --git a/acupuncture-前台/针灸前台client-1.zip b/acupuncture-前台/针灸前台client-2.zip
similarity index 92%
rename from acupuncture-前台/针灸前台client-1.zip
rename to acupuncture-前台/针灸前台client-2.zip
index a838ec0c..53075f22 100644
Binary files a/acupuncture-前台/针灸前台client-1.zip and b/acupuncture-前台/针灸前台client-2.zip differ
diff --git a/acupuncture-前台/针灸前台clientssl-1.zip b/acupuncture-前台/针灸前台clientssl-2.zip
similarity index 92%
rename from acupuncture-前台/针灸前台clientssl-1.zip
rename to acupuncture-前台/针灸前台clientssl-2.zip
index 2d71d669..e63d1a07 100644
Binary files a/acupuncture-前台/针灸前台clientssl-1.zip and b/acupuncture-前台/针灸前台clientssl-2.zip differ