患者档案导出修改

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java

@@ -136,6 +136,8 @@ public class PmsPatientServiceImpl implements PmsPatientService {
                         writer.writeCellValue(7, row, "港澳居民来往内地通行证");
                         break;
                     case 3:
+                        writer.writeCellValue(7, row, "台湾居民来往大陆通行证");
+                    case 4:
                         writer.writeCellValue(7, row, "其他");
                 }
             }
@@ -154,6 +156,8 @@ public class PmsPatientServiceImpl implements PmsPatientService {
                 }
             }
             writer.writeCellValue(10, row, patientList.get(i).getCurrentIllnessHistory());
+            writer.writeCellValue(11, row, patientList.get(i).getCurrentIllnessHistoryQt());
+            writer.writeCellValue(12, row, patientList.get(i).getTenantName());
         }
         String filename = StrUtil.format("患者档案-{}.xlsx", DateUtil.date().toString("yyyyMMdd"));
 

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsTreatmentServiceImpl.java

@@ -455,13 +455,15 @@ public class PmsTreatmentServiceImpl implements PmsTreatmentService {
                         writer.writeCellValue(7, row, "港澳居民来往内地通行证");
                         break;
                     case 3:
+                        writer.writeCellValue(7, row, "台湾居民来往大陆通行证");
+                    case 4:
                         writer.writeCellValue(7, row, "其他");
                 }
             }
             writer.writeCellValue(8, row, treatmentVOList.get(i).getIdCard());
             writer.writeCellValue(9, row, treatmentVOList.get(i).getVisitType() == 0 ? "门诊" : "住院");
-            writer.writeCellValue(9, row, treatmentVOList.get(i).getVisitNumber());
-            writer.writeCellValue(10, row, DateUtil.format(treatmentVOList.get(i).getVisitTime(), "yyyy-MM-dd HH:mm:ss"));
+            writer.writeCellValue(10, row, treatmentVOList.get(i).getVisitNumber());
+            writer.writeCellValue(11, row, DateUtil.format(treatmentVOList.get(i).getVisitTime(), "yyyy-MM-dd HH:mm:ss"));
             writer.writeCellValue(12, row, DateUtil.format(treatmentVOList.get(i).getDischargeTime(), "yyyy-MM-dd HH:mm:ss"));
             writer.writeCellValue(13, row, treatmentVOList.get(i).getDoctor());
             writer.writeCellValue(14, row, treatmentVOList.get(i).getCreateBy());