diff --git a/openhis-server-new/core-admin/pom.xml b/openhis-server-new/core-admin/pom.xml
index 10d95504..cbfcd0ca 100644
--- a/openhis-server-new/core-admin/pom.xml
+++ b/openhis-server-new/core-admin/pom.xml
@@ -41,13 +41,11 @@
io.swagger
swagger-models
- 1.6.2
-
- mysql
- mysql-connector-java
+ com.mysql
+ mysql-connector-j
diff --git a/openhis-server-new/core-common/pom.xml b/openhis-server-new/core-common/pom.xml
index 19132d79..b73c4296 100644
--- a/openhis-server-new/core-common/pom.xml
+++ b/openhis-server-new/core-common/pom.xml
@@ -77,6 +77,10 @@
com.alibaba.fastjson2
fastjson2
+
+ com.alibaba
+ fastjson
+
@@ -136,12 +140,6 @@
com.belerweb
pinyin4j
- 2.5.1
-
-
-
- com.google.code.gson
- gson
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/ExcelExtra.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/ExcelExtra.java
deleted file mode 100644
index 9431c01f..00000000
--- a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/ExcelExtra.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.core.common.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * Excel额外表头信息注解
- *
- * @author swb
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface ExcelExtra {
- /**
- * 表头名称
- */
- String name();
-
- /**
- * 日期格式,如:yyyy-MM-dd HH:mm:ss
- */
- String dateFormat() default "";
-
- /**
- * 排序(越小越靠前)
- */
- int sort() default 0;
-
- /**
- * 默认值
- */
- String defaultValue() default "";
-
- /**
- * 是否导出
- */
- boolean isExport() default true;
-}
\ No newline at end of file
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/enums/DeleteFlag.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DeleteFlag.java
new file mode 100644
index 00000000..1668d536
--- /dev/null
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DeleteFlag.java
@@ -0,0 +1,26 @@
+package com.core.common.enums;
+
+/**
+ * 删除标志
+ *
+ * @author system
+ */
+public enum DeleteFlag {
+ NOT_DELETED("0", "未删除"), DELETED("1", "已删除");
+
+ private final String code;
+ private final String info;
+
+ DeleteFlag(String code, String info) {
+ this.code = code;
+ this.info = info;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+}
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
index cb4a48ab..a03a2d0f 100644
--- a/openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
+++ b/openhis-server-new/core-common/src/main/java/com/core/common/enums/TenantOptionDict.java
@@ -118,11 +118,11 @@ public enum TenantOptionDict {
*/
PACS_APP_SECRET("pacsAppSecret", "PACSAppSecret", 45),
/**
- * 电子发票-中转服务的路径
+ * PACSAppSecret
*/
INVOICE_FORWARD_URL("invoiceUrl", "电子发票-中转服务的路径", 46),
/**
- * 电子发票-中转服务开关
+ * PACSAppSecret
*/
FORWARD_SWITCH("forwardSwitch", "电子发票-中转服务开关", 47),
/**
@@ -160,7 +160,7 @@ public enum TenantOptionDict {
/**
* 电子发票开关
*/
- INVOICE_SWITCH("invoiceSwitch", "电子发票开关", 56),
+ INVOICE_SWITCH("invoiceSwitch", "电子发票开关 (0:关闭 1:开启)", 56),
/**
* 医嘱定价来源
@@ -170,163 +170,41 @@ public enum TenantOptionDict {
/**
* 三方支付(签到)
*/
- THREE_PART_SIGN_URL("threePartSignUrl", "三方支付【签到】请求路径", 58),
- /**
- * 三方支付(签到)
- */
- THREE_PART_SIGN_STATIC_PARAM("threePartSignStaticParam", "三方支付【签到】固定参数", 59),
- /**
- * 三方支付(签到)
- */
- THREE_PART_SIGN_ACTIVE_PARAM("threePartSignActiveParam", "三方支付【签到】可变参数", 60),
- /**
- * 三方支付(签到)
- */
- THREE_PART_SIGN_MAPPING_METHOD("threePartSignMappingMethod", "三方支付【签到】请求方式", 61),
+ THREE_PART_SIGN_URL("threePartSignUrl", "三方支付GET请求", 58),
/**
* 三方支付(消费)
*/
- THREE_PART_PAY_URL("threePartPayUrl", "三方支付【消费】请求路径", 62),
- /**
- * 三方支付(消费)
- */
- THREE_PART_PAY_STATIC_PARAM("threePartPayStaticParam", "三方支付【消费】固定参数", 63),
- /**
- * 三方支付(消费)
- */
- THREE_PART_PAY_ACTIVE_PARAM("threePartPayActiveParam", "三方支付【消费】可变参数", 64),
- /**
- * 三方支付(消费)
- */
- THREE_PART_PAY_MAPPING_METHOD("threePartPayMappingMethod", "三方支付【消费】请求方式", 65),
+ THREE_PART_PAY_URL("threePartPayUrl", "三方支付GET请求", 59),
/**
* 三方支付(退费)
*/
- THREE_PART_RETURN_URL("threePartReturnUrl", "三方支付【退费】请求路径", 66),
- /**
- * 三方支付(退费)
- */
- THREE_PART_RETURN_STATIC_PARAM("threePartReturnStaticParam", "三方支付【退费】固定参数", 67),
- /**
- * 三方支付(退费)
- */
- THREE_PART_RETURN_ACTIVE_PARAM("threePartReturnActiveParam", "三方支付【退费】可变参数", 68),
- /**
- * 三方支付(退费)
- */
- THREE_PART_RETURN_MAPPING_METHOD("threePartReturnMappingMethod", "三方支付【退费】请求方式", 69),
+ THREE_PART_RETURN_URL("threePartReturnUrl", "三方支付GET请求", 60),
/**
* 三方支付(隔天退费)
*/
- THREE_PART_NEXT_DAY_RETURN_URL("threePartNextDayReturnUrl", "三方支付【隔天退费】请求路径", 70),
- /**
- * 三方支付(隔天退费)
- */
- THREE_PART_NEXT_DAY_RETURN_STATIC_PARAM("threePartNextDayReturnStaticParam", "三方支付【隔天退费】固定参数", 71),
- /**
- * 三方支付(隔天退费)
- */
- THREE_PART_NEXT_DAY_RETURN_ACTIVE_PARAM("threePartNextDayReturnActiveParam", "三方支付【隔天退费】可变参数", 72),
- /**
- * 三方支付(隔天退费)
- */
- THREE_PART_NEXT_DAY_RETURN_MAPPING_METHOD("threePartNextDayReturnMappingMethod", "三方支付【隔天退费】请求方式", 73),
+ THREE_PART_NEXT_DAY_RETURN_URL("threePartNextDayReturnUrl", "三方支付GET请求", 61),
/**
* 三方支付路径(支付结果查询)
*/
- THREE_PART_PAY_QUERY_URL("threePartPayQueryUrl", "三方支付【支付结果查询】请求路径", 74),
- /**
- * 三方支付(支付结果查询)
- */
- THREE_PART_PAY_QUERY_STATIC_PARAM("threePartPayQueryStaticParam", "三方支付【支付结果查询】固定参数", 75),
- /**
- * 三方支付(支付结果查询)
- */
- THREE_PART_PAY_QUERY_ACTIVE_PARAM("threePartPayQueryActiveParam", "三方支付【支付结果查询】可变参数", 76),
- /**
- * 三方支付(支付结果查询)
- */
- THREE_PART_PAY_QUERY_MAPPING_METHOD("threePartPayQueryMappingMethod", "三方支付【支付结果查询】请求方式", 77),
+ THREE_PART_PAY_QUERY_URL("threePartPayQueryUrl", "三方支付GET请求", 62),
/**
* 三方支付路径(退费结果查询)
*/
- THREE_PART_RETURN_QUERY_URL("threePartReturnQueryUrl", "三方支付【退费结果查询】请求路径", 78),
- /**
- * 三方支付(退费结果查询)
- */
- THREE_PART_RETURN_QUERY_STATIC_PARAM("threePartReturnQueryStaticParam", "三方支付【退费结果查询】固定参数", 79),
- /**
- * 三方支付(退费结果查询)
- */
- THREE_PART_RETURN_QUERY_ACTIVE_PARAM("threePartReturnQueryActiveParam", "三方支付【退费结果查询】可变参数", 80),
- /**
- * 三方支付(退费结果查询)
- */
- THREE_PART_RETURN_QUERY_MAPPING_METHOD("threePartReturnQueryMappingMethod", "三方支付【退费结果查询】请求方式", 81),
+ THREE_PART_RETURN_QUERY_URL("threePartReturnQueryUrl", "三方支付GET请求", 63),
/**
* 三方支付路径(隔天退费结果查询)
*/
- THREE_PART_NEXT_DAY_RETURN_QUERY_URL("threePartNextDayReturnQueryUrl", "三方支付【隔天退费结果查询】请求路径", 82),
- /**
- * 三方支付(隔天退费结果查询)
- */
- THREE_PART_NEXT_DAY_RETURN_QUERY_STATIC_PARAM("threePartNextDayReturnQueryStaticParam", "三方支付【隔天退费结果查询】固定参数", 83),
- /**
- * 三方支付(隔天退费结果查询)
- */
- THREE_PART_NEXT_DAY_RETURN_QUERY_ACTIVE_PARAM("threePartNextDayReturnQueryActiveParam", "三方支付【隔天退费结果查询】可变参数", 84),
- /**
- * 三方支付(隔天退费结果查询)
- */
- THREE_PART_NEXT_DAY_RETURN_QUERY_MAPPING_METHOD("threePartNextDayReturnQueryMappingMethod", "三方支付【隔天退费结果查询】请求方式",
- 85),
+ THREE_PART_NEXT_DAY_RETURN_QUERY_URL("threePartNextDayReturnQueryUrl", "三方支付GET请求", 64),
/**
- * 三方支付(签出)
+ * 三方支付参数
*/
- THREE_PART_SIGN_OUT_URL("threePartSignOutUrl", "三方支付【签出】请求路径", 86),
- /**
- * 三方支付(签出)
- */
- THREE_PART_SIGN_OUT_STATIC_PARAM("threePartSignOutStaticParam", "三方支付【签出】固定参数", 87),
- /**
- * 三方支付(签出)
- */
- THREE_PART_SIGN_OUT_ACTIVE_PARAM("threePartSignOutActiveParam", "三方支付【签出】可变参数", 88),
- /**
- * 三方支付(签出)
- */
- THREE_PART_SIGN_OUT_MAPPING_METHOD("threePartSignOutMappingMethod", "三方支付【签出】请求方式", 89),
-
- /**
- * 三方支付(签出)
- */
- YB_INPATIENT_SETTLEMENT_UP_URL("ybInpatientSetlUp", "选填4101或4101A", 90),
-
- /**
- * PACS查看报告地址
- */
- PACS_REPORT_URL("pacsReportUrl", "PACS查看报告地址", 91),
-
- /**
- * LIS查看报告地址
- */
- LIS_REPORT_URL("lisReportUrl", "LIS查看报告地址", 92),
-
- /**
- * 开药时药房允许多选开关
- */
- PHARMACY_MULTIPLE_CHOICE_SWITCH("pharmacyMultipleChoiceSwitch", "开药时药房允许多选开关", 93),
-
- /**
- * PEIS服务地址
- */
- PEIS_SERVER_URL("peisServerUrl", "PEIS服务地址", 94);
+ THREE_PART_PARAM("threePartParam", "三方支付GET请求", 65);
private final String code;
private final String name;
diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java
deleted file mode 100644
index b41f18a0..00000000
--- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java
+++ /dev/null
@@ -1,1837 +0,0 @@
-package com.core.common.utils;
-
-import java.io.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.ss.util.RegionUtil;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.*;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.core.common.annotation.Excel;
-import com.core.common.annotation.Excel.ColumnType;
-import com.core.common.annotation.Excel.Type;
-import com.core.common.annotation.ExcelExtra;
-import com.core.common.annotation.Excels;
-import com.core.common.config.CoreConfig;
-import com.core.common.core.domain.AjaxResult;
-import com.core.common.core.text.Convert;
-import com.core.common.exception.UtilException;
-import com.core.common.utils.file.FileTypeUtils;
-import com.core.common.utils.file.FileUtils;
-import com.core.common.utils.file.ImageUtils;
-import com.core.common.utils.poi.ExcelHandlerAdapter;
-import com.core.common.utils.reflect.ReflectUtils;
-
-/**
- * Excel相关处理
- *
- * @author system
- */
-public class NewExcelUtil {
- public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
- public static final String[] FORMULA_STR = {"=", "-", "+", "@"};
- /**
- * Excel sheet最大行数,默认65536
- */
- public static final int sheetSize = 65536;
- private static final Logger log = LoggerFactory.getLogger(NewExcelUtil.class);
- /**
- * 数字格式
- */
- private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
- /**
- * 用于dictType属性数据存储,避免重复查缓存
- */
- public Map sysDictMap = new HashMap();
- /**
- * 实体对象
- */
- public Class clazz;
- /**
- * 需要显示列属性
- */
- public String[] includeFields;
- /**
- * 需要排除列属性
- */
- public String[] excludeFields;
- /**
- * 工作表名称
- */
- private String sheetName;
- /**
- * 导出类型(EXPORT:导出数据;IMPORT:导入模板)
- */
- private Type type;
- /**
- * 工作薄对象
- */
- private Workbook wb;
- /**
- * 工作表对象
- */
- private Sheet sheet;
- /**
- * 样式列表
- */
- private Map styles;
- /**
- * 导入导出数据列表
- */
- private List list;
- /**
- * 注解列表
- */
- private List