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

acupuncture-admin/src/main/resources/TreamtmentPgTemplate.docx

@@ -1,18 +1,14 @@
 --------------------------------------------------------------------------------
 {{h_name}}评估报告
-                                       
 基本信息
 姓名：{{name}}
 性别：{{sex}}
 年龄：{{age}}
 编号：{{visitNum}}
 责任医生：{{doctor}} 
-检查日期：{{visitTime}}
-
+检查日期：{{report_date}}
 主要诊断
 {{Clinical_diagnosis}}
-
-
 病情评估
 --------------------------------------------------------------------------------
 {{?rtcf_flag}}
@@ -81,15 +77,10 @@
                                        2
                                焦虑自评(SAS)
                                   {{score8}}
-
 {{/jlpg_flag}}
 
 
 
-
-
-
-
  测评人：
 审核人：
 报告日期：{{report_date}}

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);