From edbc470e7baac2ca4b8feaf54bdc562169a7da92 Mon Sep 17 00:00:00 2001
From: zzc <Zhengzhic18@163.com>
Date: Wed, 9 Apr 2025 08:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=8A=E7=96=97=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=BAmemberId=E6=88=96=E9=97=A8=E8=AF=8A?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PmsTreatmentServiceImpl.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java
index 94e951ae..6fc267f9 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java
@@ -547,7 +547,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
             map.put("sex", pmsTreatment.getGender() == 0 ? "男" : "女");
             map.put("age", pmsTreatment.getAge() + " 岁");
             map.put("phone", pmsTreatment.getPhone());
-            map.put("visitNum", pmsTreatment.getVisitNumber());
+            map.put("visitNum", StrUtil.isEmpty(pmsTreatment.getVisitNumber()) ? pmsTreatment.getMemberId() : pmsTreatment.getVisitNumber());
             map.put("visitTime", DateUtil.format(pmsTreatment.getVisitTime(), "yyyy-MM-dd"));
             map.put("doctor", pmsTreatment.getDoctor());
             map.put("createBy", pmsTreatment.getCreateBy());
@@ -563,7 +563,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
                 String txlx = recordMap.get("PG_RTCF_TXLX") == null ? "" : recordMap.get("PG_RTCF_TXLX").getAnswer();
                 if (StrUtil.isEmpty(txlx)) {
                     map.put("rtcf_flag", false);
-                }else {
+                } else {
                     map.put("rtcf_flag", true);
                 }
                 map.put("PG_RTCF_TXLX", txlx);
@@ -585,7 +585,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
                 String tzbs = recordMap.get("PG_TZBS_ZYTZ") == null ? "" : recordMap.get("PG_TZBS_ZYTZ").getAnswer();
                 if (StrUtil.isEmpty(tzbs)) {
                     map.put("bsjg_flag", false);
-                }else {
+                } else {
                     map.put("bsjg_flag", true);
                 }
                 map.put("PG_TZBS_ZYTZ", tzbs);
@@ -596,7 +596,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
                 String score3 = recordMap.get("PG_TT_SRS22_DF") == null ? "" : recordMap.get("PG_TT_SRS22_DF").getAnswer();
                 if (StrUtil.isEmpty(score1) && StrUtil.isEmpty(score2) && StrUtil.isEmpty(score3)) {
                     map.put("ttpg_flag", false);
-                }else {
+                } else {
                     map.put("ttpg_flag", true);
                 }
                 map.put("score1", score1);
@@ -608,13 +608,13 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
 
                 if (StrUtil.isEmpty(score4) && StrUtil.isEmpty(score5) && StrUtil.isEmpty(score6)) {
                     map.put("smpg_flag", false);
-                }else {
+                } else {
                     map.put("smpg_flag", true);
                 }
 
-                map.put("table0", Tables.of(new String[][] {
-                        new String[] { "00", "01" },
-                        new String[] { "10", "11" }
+                map.put("table0", Tables.of(new String[][]{
+                        new String[]{"00", "01"},
+                        new String[]{"10", "11"}
                 }).border(BorderStyle.DEFAULT).create());
 
 
@@ -626,7 +626,7 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
                 String score8 = recordMap.get("PG_JL_SAS_DF") == null ? "" : recordMap.get("PG_JL_SAS_DF").getAnswer();
                 if (StrUtil.isEmpty(score7) && StrUtil.isEmpty(score8)) {
                     map.put("jlpg_flag", false);
-                }else {
+                } else {
                     map.put("jlpg_flag", true);
                 }
                 map.put("score7", score7);