report-service项目数据库访问独立 第五批

common/pom.xml

@@ -35,11 +35,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-spring-boot-starter</artifactId>
-            <version> 4.2.0</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>

common/src/main/java/com/lantone/common/enums/AbnormalStatusEnum.java

@@ -1,50 +0,0 @@
-package com.lantone.common.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 下午2:31:42
- */
-public enum AbnormalStatusEnum implements KeyedNamed {
-    NOT_HANDLED(0, "未处理"),
-    HAS_HANDLED(1, "已处理");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    AbnormalStatusEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static AbnormalStatusEnum getEnum(int key) {
-        for (AbnormalStatusEnum item : AbnormalStatusEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        AbnormalStatusEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/lantone/common/enums/AbnormalTypeEnum.java

@@ -1,51 +0,0 @@
-package com.lantone.common.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 下午2:31:42
- */
-public enum AbnormalTypeEnum implements KeyedNamed {
-    DATA_MODEL(1, "数据模块"),
-    QC_TYPE(2, "质控类型"),
-    XML(3, "XML结构");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    AbnormalTypeEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static AbnormalTypeEnum getEnum(int key) {
-        for (AbnormalTypeEnum item : AbnormalTypeEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        AbnormalTypeEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/lantone/common/enums/BusinessType.java

@@ -1,59 +0,0 @@
-package com.lantone.common.enums;
-
-/**
- * 业务操作类型
- * 
- * @author ruoyi
- */
-public enum BusinessType
-{
-    /**
-     * 其它
-     */
-    OTHER,
-
-    /**
-     * 新增
-     */
-    INSERT,
-
-    /**
-     * 修改
-     */
-    UPDATE,
-
-    /**
-     * 删除
-     */
-    DELETE,
-
-    /**
-     * 授权
-     */
-    GRANT,
-
-    /**
-     * 导出
-     */
-    EXPORT,
-
-    /**
-     * 导入
-     */
-    IMPORT,
-
-    /**
-     * 强退
-     */
-    FORCE,
-
-    /**
-     * 生成代码
-     */
-    GENCODE,
-    
-    /**
-     * 清空
-     */
-    CLEAN,
-}

common/src/main/java/com/lantone/common/enums/CheckJobTypeEnum.java

@@ -1,51 +0,0 @@
-package com.lantone.common.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: 核查任务类型
- * @date 2018年11月21日 下午2:31:42
- */
-public enum CheckJobTypeEnum implements KeyedNamed {
-    DEPT_SUPERVISOR(0, "科室任务"),
-    QUAT_SUPERVISOR(1, "质控科任务"),
-    HOSP_SUPERVISOR(2, "院级任务");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    CheckJobTypeEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static CheckJobTypeEnum getEnum(int key) {
-        for (CheckJobTypeEnum item : CheckJobTypeEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        CheckJobTypeEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/lantone/common/enums/CheckStatusEnum.java

@@ -1,50 +0,0 @@
-package com.lantone.common.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 下午2:31:42
- */
-public enum CheckStatusEnum implements KeyedNamed {
-    Disable(0, "未核查"),
-    Enable(1, "已核查");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    CheckStatusEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static CheckStatusEnum getEnum(int key) {
-        for (CheckStatusEnum item : CheckStatusEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        CheckStatusEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/lantone/common/enums/CheckTypeEnum.java

@@ -1,51 +0,0 @@
-package com.lantone.common.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: 核查类型
- * @date 2018年11月21日 下午2:31:42
- */
-public enum CheckTypeEnum implements KeyedNamed {
-    COURSE(0, "病历"),
-    HOMEPAGE(1, "病案首页"),
-    ALL(2, "全部");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    CheckTypeEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static CheckTypeEnum getEnum(int key) {
-        for (CheckTypeEnum item : CheckTypeEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        CheckTypeEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/lantone/common/enums/CheckerRoleEnum.java

@@ -1,55 +0,0 @@
-package com.lantone.common.enums;
-
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description: TODO
- * @date 2018年11月21日 下午2:31:42
- */
-public enum CheckerRoleEnum implements KeyedNamed {
-    DEPT_SUPERVISOR(4, "临床科室监管人员"),
-    DEPT_GENERAL(7, "临床科室质控人员"),
-    QUAT_SUPERVISOR(5, "质控科监管人员"),
-    QUAT_GENERAL(8, "质控科质控人员"),
-    HOSP_SUPERVISOR(6, "院级监管人员"),
-    HOSP_GENERAL(9, "院级质控人员");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    CheckerRoleEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static CheckerRoleEnum getEnum(int key) {
-        for (CheckerRoleEnum item : CheckerRoleEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        CheckerRoleEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/lantone/common/enums/ConstantEnum.java

@@ -1,52 +0,0 @@
-package com.lantone.common.enums;
-
-import com.lantone.common.constant.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @Description: 常量枚举类
- * @Author: ztg
- * @Date: 2018/9/28 10:45
- */
-public enum ConstantEnum implements KeyedNamed {
-
-    INNER_USER(1, "用户-朗通"),
-    OUTER_USER(0, "用户-客户");
-
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    ConstantEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static ConstantEnum getEnum(int key) {
-        for (ConstantEnum item : ConstantEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        ConstantEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/lantone/common/service/impl/ExcelExportStylerUserImpl.java

@@ -1,66 +0,0 @@
-package com.lantone.common.service.impl;
-
-import cn.afterturn.easypoi.excel.export.styler.AbstractExcelExportStyler;
-import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-
-/**
- * @Description:
- * @Author: cy
- * @time: 2021/9/16 14:42
- */
-public class ExcelExportStylerUserImpl extends AbstractExcelExportStyler implements IExcelExportStyler {
-    public ExcelExportStylerUserImpl(Workbook workbook) {
-        super.createStyles(workbook);
-    }
-
-    public CellStyle getTitleStyle(short color) {
-        CellStyle titleStyle = this.workbook.createCellStyle();
-        titleStyle.setAlignment(HorizontalAlignment.CENTER);
-        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-        titleStyle.setWrapText(true);
-        return titleStyle;
-    }
-
-    public CellStyle stringSeptailStyle(Workbook workbook, boolean isWarp) {
-        CellStyle style = workbook.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setDataFormat(STRING_FORMAT);
-        if (isWarp) {
-            style.setWrapText(true);
-        } else {
-            style.setAlignment(HorizontalAlignment.LEFT);
-        }
-
-        return style;
-    }
-
-    public CellStyle getHeaderStyle(short color) {
-        CellStyle titleStyle = this.workbook.createCellStyle();
-        Font font = this.workbook.createFont();
-        font.setFontHeightInPoints((short) 12);
-        titleStyle.setFont(font);
-        titleStyle.setAlignment(HorizontalAlignment.CENTER);
-        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-        return titleStyle;
-    }
-
-    public CellStyle stringNoneStyle(Workbook workbook, boolean isWarp) {
-        CellStyle style = workbook.createCellStyle();
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setDataFormat(STRING_FORMAT);
-        if (isWarp) {
-            style.setWrapText(true);
-        } else {
-            style.setAlignment(HorizontalAlignment.LEFT);
-        }
-
-        return style;
-    }
-}

common/src/main/java/com/lantone/common/util/BeanUtil.java

@@ -1,39 +0,0 @@
-package com.lantone.common.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import org.springframework.beans.BeanUtils;
-public class BeanUtil {
-    public BeanUtil() {
-    }
-
-    public static void copyProperties(Object source, Object target) {
-        BeanUtils.copyProperties(source, target);
-    }
-
-    public static <E> List<E> listCopyTo(List<?> source, Class<E> destinationClass) {
-        try {
-            if (source.size() == 0) {
-                return Collections.emptyList();
-            } else {
-                List<E> res = new ArrayList(source.size());
-                Iterator var3 = source.iterator();
-
-                while(var3.hasNext()) {
-                    Object o = var3.next();
-                    E e = destinationClass.newInstance();
-                    BeanUtils.copyProperties(o, e);
-                    res.add(e);
-                }
-
-                return res;
-            }
-        } catch (IllegalAccessException var6) {
-            throw new RuntimeException(var6);
-        } catch (InstantiationException var7) {
-            throw new RuntimeException(var7);
-        }
-    }
-}

common/src/main/java/com/lantone/common/util/BigDecimalUtil.java

@@ -1,120 +0,0 @@
-package com.lantone.common.util;
-
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-
-/**
- * @Description: 大数工具类
- * @author: gaodm
- * @time: 2020/4/14 10:21
- */
-public class BigDecimalUtil {
-
-    public static int scale = 2;
-    public static int roundingMode = BigDecimal.ROUND_HALF_UP;
-
-    public static boolean isEquals(BigDecimal a, BigDecimal b, int scaleInt) {
-        return a.setScale(scaleInt, roundingMode).equals(
-                b.setScale(scaleInt, roundingMode)
-        );
-    }
-
-    public static boolean isEquals(BigDecimal a, BigDecimal b) {
-        if (a == null && b == null) {
-            return true;
-        }
-        if ((a == null && b != null) || (a != null && b == null)) {
-            return false;
-        }
-        return a.setScale(scale, roundingMode).equals(
-                b.setScale(scale, roundingMode)
-        );
-    }
-
-    //a小于b
-    public static Boolean lt(BigDecimal a, BigDecimal b) {
-        Boolean res = false;
-        if (a.compareTo(b) == -1) {
-            res = true;
-        }
-        return res;
-
-    }
-
-    //a等于b
-    public static Boolean eq(BigDecimal a, BigDecimal b) {
-        Boolean res = false;
-        if (a.compareTo(b) == 0) {
-            res = true;
-        }
-        return res;
-
-    }
-
-    //a大于b
-    public static Boolean gt(BigDecimal a, BigDecimal b) {
-        Boolean res = false;
-        if (a.compareTo(b) == 1) {
-            res = true;
-        }
-        return res;
-
-    }
-
-    //a大于等于b
-    public static Boolean ge(BigDecimal a, BigDecimal b) {
-        Boolean res = false;
-        if (a.compareTo(b) > -1) {
-            res = true;
-        }
-        return res;
-
-    }
-
-    //a小于等于b
-    public static Boolean le(BigDecimal a, BigDecimal b) {
-        Boolean res = false;
-        if (a.compareTo(b) < 1) {
-            res = true;
-        }
-        return res;
-
-    }
-
-    public static void main(String[] args) {
-        DecimalFormat df = new DecimalFormat("#.00");
-        DecimalFormat df2 = new DecimalFormat("#0.00");
-        BigDecimal a = new BigDecimal(0.55);
-        BigDecimal b = new BigDecimal(11.55);
-        System.out.println(df.format(a));
-        System.out.println(df2.format(a));
-        System.out.println(df.format(b));
-        System.out.println(df2.format(b));
-
-        System.out.println("====a小于b====");
-        System.out.println(lt(new BigDecimal(1.1), new BigDecimal(1)) == false);
-        System.out.println(lt(new BigDecimal(1), new BigDecimal(1)) == false);
-        System.out.println(lt(new BigDecimal(0.9), new BigDecimal(1)) == true);
-
-        System.out.println("====a等于b====");
-        System.out.println(eq(new BigDecimal(1.1), new BigDecimal(1)) == false);
-        System.out.println(eq(new BigDecimal(1), new BigDecimal(1)) == true);
-        System.out.println(eq(new BigDecimal(0.9), new BigDecimal(1)) == false);
-
-        System.out.println("====a大于b====");
-        System.out.println(gt(new BigDecimal(1.1), new BigDecimal(1)) == true);
-        System.out.println(gt(new BigDecimal(1), new BigDecimal(1)) == false);
-        System.out.println(gt(new BigDecimal(0.9), new BigDecimal(1)) == false);
-
-        System.out.println("====a大于等于b====");
-        System.out.println(ge(new BigDecimal(1.1), new BigDecimal(1)) == true);
-        System.out.println(ge(new BigDecimal(1), new BigDecimal(1)) == true);
-        System.out.println(ge(new BigDecimal(0.9), new BigDecimal(1)) == false);
-
-        System.out.println("====a小于等于b====");
-        System.out.println(le(new BigDecimal(1.1), new BigDecimal(1)) == false);
-        System.out.println(le(new BigDecimal(1), new BigDecimal(1)) == true);
-        System.out.println(le(new BigDecimal(0.9), new BigDecimal(1)) == true);
-
-    }
-}

common/src/main/java/com/lantone/common/util/ClassUtil.java

@@ -1,59 +0,0 @@
-package com.lantone.common.util;
-
-import com.lantone.common.util.DynamicBean;
-
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/13 16:56
- */
-public class ClassUtil {
-    /**
-     * @param object    旧的对象带值
-     * @param addMap    动态需要添加的属性和属性类型
-     * @param addValMap 动态需要添加的属性和属性值
-     * @return 新的对象
-     * @throws Exception
-     */
-    public Object dynamicClass(Object object, HashMap addMap, HashMap addValMap) throws Exception {
-        HashMap returnMap = new HashMap();
-        HashMap typeMap = new HashMap();
-
-
-        Class<?> type = object.getClass();
-        BeanInfo beanInfo = Introspector.getBeanInfo(type);
-        PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
-        for (int i = 0; i < propertyDescriptors.length; i++) {
-            PropertyDescriptor descriptor = propertyDescriptors[i];
-            String propertyName = descriptor.getName();
-            if (!propertyName.equals("class")) {
-                Method readMethod = descriptor.getReadMethod();
-                Object result = readMethod.invoke(object);
-                //可以判断为 NULL不赋值
-                returnMap.put(propertyName, result);
-                typeMap.put(propertyName, descriptor.getPropertyType());
-            }
-        }
-
-        returnMap.putAll(addValMap);
-        typeMap.putAll(addMap);
-        //map转换成实体对象
-        DynamicBean bean = new DynamicBean(typeMap);
-        //赋值
-        Set keys = typeMap.keySet();
-        for (Iterator it = keys.iterator(); it.hasNext(); ) {
-            String key = (String) it.next();
-            bean.setValue(key, returnMap.get(key));
-        }
-        Object obj = bean.getObject();
-        return obj;
-    }
-}

common/src/main/java/com/lantone/common/util/DynamicBean.java

@@ -1,70 +0,0 @@
-package com.lantone.common.util;
-
-import org.springframework.cglib.beans.BeanGenerator;
-import org.springframework.cglib.beans.BeanMap;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/13 16:55
- */
-public class DynamicBean {
-    private Object object = null; //动态生成的类
-    private BeanMap beanMap = null; //存放属性名称以及属性的类型
-
-    public DynamicBean() {
-        super();
-    }
-
-    public DynamicBean(Map propertyMap) {
-        this.object = generateBean(propertyMap);
-        this.beanMap = BeanMap.create(this.object);
-    }
-
-    /**
-     * @param propertyMap
-     * @return
-     */
-    private Object generateBean(Map propertyMap) {
-        BeanGenerator generator = new BeanGenerator();
-        Set keySet = propertyMap.keySet();
-        for (Iterator i = keySet.iterator(); i.hasNext(); ) {
-            String key = (String) i.next();
-            generator.addProperty(key, (Class) propertyMap.get(key));
-        }
-        return generator.create();
-    }
-
-    /**
-     * 给bean属性赋值
-     *
-     * @param property 属性名
-     * @param value    值
-     */
-    public void setValue(Object property, Object value) {
-        beanMap.put(property, value);
-    }
-
-    /**
-     * 通过属性名得到属性值
-     *
-     * @param property 属性名
-     * @return 值
-     */
-    public Object getValue(String property) {
-        return beanMap.get(property);
-    }
-
-    /**
-     * 得到该实体bean对象
-     *
-     * @return
-     */
-    public Object getObject() {
-        return this.object;
-    }
-}

common/src/main/java/com/lantone/common/util/MapUtil.java

@@ -1,119 +0,0 @@
-package com.lantone.common.util;
-
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Description: map工具类
- * @author: gaodm
- * @time: 2018/9/4 9:24
- */
-public class MapUtil {
-    private static final String SP = ";";
-    private static final String SSP = ":";
-
-    /**
-     * 把Map转换成String。注意以英文分号字符'；'开始和结束
-     *
-     * @param attrs
-     * @return
-     */
-    public static String toString(Map<String, String> attrs) {
-        StringBuilder sb = new StringBuilder();
-        if (null != attrs && !attrs.isEmpty()) {
-            sb.append(SP);
-            for (String key : attrs.keySet()) {
-                String val = attrs.get(key);
-                if (val != null && !"".equals(val)) {
-                    sb.append(key).append(SSP).append(val).append(SP);
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 把key:value;key:value格式的String转换成Map
-     *
-     * @param str
-     * @return
-     */
-    public static Map<String, String> fromString(String str) {
-        Map<String, String> attrs = new HashMap<String, String>();
-        if (str != null && !"".equals(str)) {
-            String[] arr = str.split(SP);
-            if (null != arr) {
-                for (String kv : arr) {
-                    if (kv != null && !"".equals(kv)) {
-                        String[] ar = kv.split(SSP);
-                        if (null != ar && ar.length == 2) {
-                            String key = ar[0];
-                            String val = ar[1];
-                            if (val != null && !"".equals(val)) {
-                                attrs.put(key, val);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return attrs;
-    }
-
-    public static Object mapToObject(Map<String, Object> map, Class<?> beanClass) throws Exception {
-        if (map == null) {
-            return null;
-        }
-
-        Object obj = beanClass.newInstance();
-
-        BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
-        PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
-        for (PropertyDescriptor property : propertyDescriptors) {
-            Method setter = property.getWriteMethod();
-            if (setter != null) {
-                setter.invoke(obj, map.get(property.getName()));
-            }
-        }
-
-        return obj;
-    }
-
-    public static Map<String, Object> objectToMap(Object obj) throws Exception {
-        if (obj == null) {
-            return null;
-        }
-
-        Map<String, Object> map = new HashMap<String, Object>();
-
-        BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
-        PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
-        for (PropertyDescriptor property : propertyDescriptors) {
-            String key = property.getName();
-            if (key.compareToIgnoreCase("class") == 0) {
-                continue;
-            }
-            Method getter = property.getReadMethod();
-            Object value = getter != null ? getter.invoke(obj) : null;
-            map.put(key, value);
-        }
-        return map;
-    }
-
-    /**
-     * 浙江医院用，两MAP合并成一个MAP对象
-     * @return
-     */
-    public static Map<String, Object> objcetKeyConvert(Map<String, String> columnMap, Map<String, Object> entityMap) throws Exception{
-        Map<String, Object> wholeMap = new HashMap<>();
-        for (String objKey : columnMap.keySet()) {
-            wholeMap.put(objKey,entityMap.get(columnMap.get(objKey)));
-        }
-        return wholeMap;
-    }
-
-}