diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java
index 8f0e268f..7fdcf95b 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java
@@ -161,7 +161,6 @@ public class ScreeningController {
         screeningService.exportRzScreen(response, param.getParam());
     }
 
-
 //    @Anonymous
 //    @ApiOperation(value = "导出筛查记录", notes = "")
 //    @RequestMapping(value = "/export", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java
index 8287394c..dc32bdc0 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/PmsTreatmentVo.java
@@ -70,6 +70,8 @@ public class PmsTreatmentVo {
 
         private String name;
 
+        private String tenantName;
+
         private String pinyinFull;
 
         private String pinyinSimple;
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java
index 9e48157e..06a526c9 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java
@@ -257,6 +257,8 @@ public class PmsPatientServiceImpl implements PmsPatientService {
                         writer.writeCellValue(7, row, "港澳居民来往内地通行证");
                         break;
                     case 3:
+                        writer.writeCellValue(7, row, "台湾居民来往大陆通行证");
+                    case 4:
                         writer.writeCellValue(7, row, "其他");
                 }
             }
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 742e0358..76d701be 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
@@ -585,17 +585,39 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
             Map<String, Object> map = new HashMap<>();
             map.put("name", treatmentRecordVO.getName());
             map.put("sex", treatmentRecordVO.getGender() == 0 ? "男" : "女");
-            map.put("age", treatmentRecordVO.getAge());
+            map.put("age", treatmentRecordVO.getAge() + " 岁");
             map.put("phone", treatmentRecordVO.getPhone());
             map.put("visitNum", treatmentRecordVO.getVisitNumber());
-            map.put("visitTime", DateUtil.format(treatmentRecordVO.getVisitTime(), "yyyy-MM-dd HH:mm:ss"));
+            map.put("visitTime", DateUtil.format(treatmentRecordVO.getVisitTime(), "yyyy-MM-dd"));
             map.put("doctor", treatmentRecordVO.getDoctor());
             map.put("createBy", treatmentRecordVO.getCreateBy());
             map.put("createTime", DateUtil.format(treatmentRecordVO.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             map.put("status", treatmentRecordVO.getStatus() == 0 ? "未完成" : "已完成");
-
+            map.put("report_date", DateUtil.format(new Date(), "yyyy-MM-dd"));
+            if (treatmentRecordVO != null) {
+                map.put("h_name", treatmentRecordVO.getTenantName());
+            }
             if (CollectionUtil.isNotEmpty(pmsTreatmentRecords)) {
                 Map<String, PmsTreatmentRecord> recordMap = pmsTreatmentRecords.stream().collect(Collectors.toMap(PmsTreatmentRecord::getQuestionCode, Function.identity()));
+                map.put("Clinical_diagnosis", recordMap.get("JBXX_ZYZD") == null ? "" : StrUtil.split(recordMap.get("JBXX_ZYZD").getAnswer(), UserConstants.ANSWER_JOIN_STRING).stream().collect(Collectors.joining(", ")));
+                map.put("PG_RTCF_TXLX", recordMap.get("PG_RTCF_TXLX") == null ? "" : recordMap.get("PG_RTCF_TXLX").getAnswer());
+                map.put("PG_RTCF_STNL", recordMap.get("PG_RTCF_STNL") == null ? "" : recordMap.get("PG_RTCF_STNL").getAnswer());
+                map.put("PG_RTCF_JKPF", recordMap.get("PG_RTCF_JKPF") == null ? "" : recordMap.get("PG_RTCF_JKPF").getAnswer());
+                map.put("PG_RTCF_TZ", recordMap.get("PG_RTCF_TZ") == null ? "" : recordMap.get("PG_RTCF_TZ").getAnswer());
+                map.put("PG_RTCF_QZTZ", recordMap.get("PG_RTCF_QZTZ") == null ? "" : recordMap.get("PG_RTCF_QZTZ").getAnswer());
+                map.put("PG_RTCF_JRL", recordMap.get("PG_RTCF_JRL") == null ? "" : recordMap.get("PG_RTCF_JRL").getAnswer());
+                map.put("PG_RTCF_TBW", recordMap.get("PG_RTCF_TBW") == null ? "" : recordMap.get("PG_RTCF_TBW").getAnswer());
+                map.put("PG_RTCF_DBZ", recordMap.get("PG_RTCF_DBZ") == null ? "" : recordMap.get("PG_RTCF_DBZ").getAnswer());
+                map.put("PG_RTCF_GZ", recordMap.get("PG_RTCF_GZ") == null ? "" : recordMap.get("PG_RTCF_GZ").getAnswer());
+                map.put("PG_RTCF_GGJ", recordMap.get("PG_RTCF_GGJ") == null ? "" : recordMap.get("PG_RTCF_GGJ").getAnswer());
+                map.put("PG_RTCF_ZF", recordMap.get("PG_RTCF_ZF") == null ? "" : recordMap.get("PG_RTCF_ZF").getAnswer());
+                map.put("PG_RTCF_WHR", recordMap.get("PG_RTCF_WHR") == null ? "" : recordMap.get("PG_RTCF_WHR").getAnswer());
+                map.put("PG_RTCF_BMI", recordMap.get("PG_RTCF_BMI") == null ? "" : recordMap.get("PG_RTCF_BMI").getAnswer());
+                map.put("PG_RTCF_PBF", recordMap.get("PG_RTCF_PBF") == null ? "" : recordMap.get("PG_RTCF_PBF").getAnswer());
+                map.put("PG_RTCF_NZZFSP", recordMap.get("PG_RTCF_NZZFSP") == null ? "" : recordMap.get("PG_RTCF_NZZFSP").getAnswer());
+                map.put("PG_TZBS_ZYTZ", recordMap.get("PG_TZBS_ZYTZ") == null ? "" : recordMap.get("PG_TZBS_ZYTZ").getAnswer());
+                map.put("PG_TZBS_JJTZ", recordMap.get("PG_TZBS_JJTZ") == null ? "" : StrUtil.split(recordMap.get("PG_TZBS_JJTZ").getAnswer(), UserConstants.ANSWER_JOIN_STRING).stream().collect(Collectors.joining(",")));
+
                 map.put("score1", recordMap.get("PG_TT_TAPS_DF") == null ? "" : recordMap.get("PG_TT_TAPS_DF").getAnswer());
                 map.put("score2", recordMap.get("PG_TT_TRACE_DF") == null ? "" : recordMap.get("PG_TT_TRACE_DF").getAnswer());
                 map.put("score3", recordMap.get("PG_TT_SRS22_DF") == null ? "" : recordMap.get("PG_TT_SRS22_DF").getAnswer());
@@ -735,6 +757,8 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
                         writer.writeCellValue(7, row, "港澳居民来往内地通行证");
                         break;
                     case 3:
+                        writer.writeCellValue(7, row, "台湾居民来往大陆通行证");
+                    case 4:
                         writer.writeCellValue(7, row, "其他");
                 }
             }
diff --git a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml
index c88a27d1..3ce02773 100644
--- a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml
+++ b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml
@@ -141,32 +141,35 @@
 
     <select id="adminQueryTreatment"  resultType="com.acupuncture.system.domain.vo.PmsTreatmentVo$TreatmentRecordVO">
         select
-            id,
-            patient_id as patientId,
-            name,
-            gender,
-            age,
-            birth_date as birthDate,
-            ethnicity,
-            education_years as educationYears,
-            phone,
-            id_card_type as idCardType,
-            id_card as idCard,
-            visit_type as visitType,
-            visit_number as visitNumber,
-            visit_time as visitTime,
-            discharge_time as dischargeTime,
-            doctor,
-            dept_name as deptName,
-            diagnosis_code as diagnosisCode,
-            diagnosis_name as diagnosisName,
-            status,
-            create_by as createBy,
-            create_time as createTime
+            t.id,
+            t.patient_id as patientId,
+            t.name,
+            t.gender,
+            t.age,
+            t.birth_date as birthDate,
+            t.ethnicity,
+            t.education_years as educationYears,
+            t.phone,
+            t.id_card_type as idCardType,
+            t.id_card as idCard,
+            t.visit_type as visitType,
+            t.visit_number as visitNumber,
+            t.visit_time as visitTime,
+            t.discharge_time as dischargeTime,
+            t.doctor,
+            t.dept_name as deptName,
+            t.diagnosis_code as diagnosisCode,
+            t.diagnosis_name as diagnosisName,
+            t.status,
+            t.create_by as createBy,
+            t.create_time as createTime,
+            d.name as tenantName
         from
-            v_pms_treatment
-        where del_flag = 0
-        and id = #{id}
+            v_pms_treatment t
+        left join
+                dms_tenant d on t.tenant_id = d.id
+        where t.del_flag = 0
+        and t.id = #{id}
     </select>
 
     <insert id="batchInsertRecord">
@@ -207,7 +210,9 @@
         create_by as createBy,
         create_time as createTime
         from pms_treatment_record
-        where treatment_id = #{treatmentId}
+        where
+            del_flag = 0
+            treatment_id = #{treatmentId}
         <if test="codeList != null and codeList.size() > 0">
             and question_code in
             <foreach collection="codeList" item="item" index="index" open="(" close=")" separator=",">