Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into test

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -108,7 +108,7 @@ public class ColumnResultManagementFacade {
         columnResultQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getType()), "type", getColumnResultPageVO.getType());
         columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getIsSolved()), "is_solved", getColumnResultPageVO.getIsSolved());
-        columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getModeName()),"mode_name", getColumnResultPageVO.getModeName());
+        columnResultQueryWrapper.eq(StringUtil.isNotBlank(getColumnResultPageVO.getModeName()), "mode_name", getColumnResultPageVO.getModeName());
         columnResultQueryWrapper.ge(StringUtil.isNotBlank(startDate), "behospital_date", getColumnResultPageVO.getBehospitalStartDate());
         columnResultQueryWrapper.le(StringUtil.isNotBlank(endDate), "behospital_date", getColumnResultPageVO.getBehospitalEndDate());
         columnResultQueryWrapper.like(StringUtil.isNotBlank(getColumnResultPageVO.getBehospitalCode()), "behospital_code", getColumnResultPageVO.getBehospitalCode());
@@ -235,12 +235,12 @@ public class ColumnResultManagementFacade {
     }
 
     /**
-     *获取枚举所有Name 也就是质控模块名称
+     * 获取枚举所有Name 也就是质控模块名称
      *
      * @param
      * @return:
      */
-    public List<String> getModeName(){
+    public List<String> getModeName() {
         List<String> modeNameList = new ArrayList<>();
         for (ModeEnum value : ModeEnum.values()) {
             modeNameList.add(value.getName());
@@ -258,9 +258,9 @@ public class ColumnResultManagementFacade {
         List<String> behospitalCodeList = new ArrayList<>();
         Long hospitalId = null;
         Long principleId = null;
-        if(dataCheckVO.getHospitalId()==null){
-            hospitalId=SysUserUtils.getCurrentHospitalId();
-            principleId=SysUserUtils.getCurrentPrincipleId();
+        if (dataCheckVO.getHospitalId() == null) {
+            hospitalId = SysUserUtils.getCurrentHospitalId();
+            principleId = SysUserUtils.getCurrentPrincipleId();
         }
         //获取所有包含rec_id的表名
         List<String> recColumnTable = getRecColumnTable();
@@ -271,14 +271,14 @@ public class ColumnResultManagementFacade {
             List<BehospitalInfo> behospitalInfos = behospitalInfoFacade.getBaseMapper().selectList(new QueryWrapper<BehospitalInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("behospital_code", dataCheckVO.getBehospitalCode())
-                    .eq(hospitalId!=null,"hospital_id", hospitalId)
+                    .eq(hospitalId != null, "hospital_id", hospitalId)
             );
             if (ListUtil.isEmpty(behospitalInfos)) {
                 Asserts.fail("该患者信息未查询到！");
             }
             behospitalCodeList.add(behospitalCode);
             //对于集合病历所有校验规则校验其表信息字段
-            checkTableColumnVal(behospitalCodeList,hospitalId,principleId,recColumnTable);
+            checkTableColumnVal(behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //对于只传时间不传病历的情况
         //创建一个病历集合
@@ -292,7 +292,7 @@ public class ColumnResultManagementFacade {
                 behospitalCodeList.add(behospitalInfo.getBehospitalCode());
             }
             //对于集合病历所有校验规则校验其表信息字段
-            checkTableColumnVal(behospitalCodeList,hospitalId,principleId,recColumnTable);
+            checkTableColumnVal(behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         return true;
     }
@@ -304,23 +304,23 @@ public class ColumnResultManagementFacade {
      * @param behospitalCodeList
      * @return: 具体数据
      */
-    public void checkTableColumnVal(List<String> behospitalCodeList,Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkTableColumnVal(List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         //先获取非空的所有字段校验规则
         List<NonnullInfo> nonnullInfos = getNonnullInfo();
         if (ListUtil.isNotEmpty(nonnullInfos)) {
             //调用校验非空规则方法
-            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //获取正则所有字段校验规则
         List<GetRegular> regularMappings = getRegularMapping();
         if (ListUtil.isNotEmpty(regularMappings)) {
             //调用校验正则规则
-            checkRegular(regularMappings, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkRegular(regularMappings, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //获取字段校验的标准值规则
         List<GetStandardvalueInfoDTO> standardvalueInfo = getStandardvalueInfo();
         if (ListUtil.isNotEmpty(standardvalueInfo)) {
-            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
     }
 
@@ -385,7 +385,7 @@ public class ColumnResultManagementFacade {
         if (ListUtil.isNotEmpty(nonnullInfoList) || ListUtil.isNotEmpty(standardvalueList) || ListUtil.isNotEmpty(regularList)) {
             //获取30天内所有病历
             List<BehospitalInfo> behospitalInfos = getBehospitalInfos(DateUtil.addDate(DateUtil.now(), -30), DateUtil.now(), hospitalId);
-            if(ListUtil.isNotEmpty(behospitalInfos)) {
+            if (ListUtil.isNotEmpty(behospitalInfos)) {
                 for (BehospitalInfo behospitalInfo : behospitalInfos) {
                     behospitalCodeList.add(behospitalInfo.getBehospitalCode());
                 }
@@ -396,33 +396,34 @@ public class ColumnResultManagementFacade {
         //非空校验规则今天有修改
         if (ListUtil.isNotEmpty(nonnullInfoList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验非空规则方法
-            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //正则校验规则今天有修改
         if (ListUtil.isNotEmpty(regularList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验正则规则
-            checkRegular(regularMappings, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkRegular(regularMappings, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
         //标准值校验规则今天有修改
         if (ListUtil.isNotEmpty(standardvalueList) && ListUtil.isNotEmpty(behospitalCodeList)) {
             //调用校验正则规则
-            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId,principleId,recColumnTable);
+            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId, principleId, recColumnTable);
         }
     }
+
     /**
+     * 获取所有包含rec_id的表名
      *
-     *获取所有包含rec_id的表名
      * @param
      * @return:
      */
-    public List<String> getRecColumnTable(){
+    public List<String> getRecColumnTable() {
         //获取所有包含rec_id的表名
         List<ColumnInfo> columnInfoList = columnInfoFacade.getBaseMapper().selectList(new QueryWrapper<ColumnInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("column_ename", "rec_id")
         );
         List<String> recColumnTable = new ArrayList<>();
-        if(ListUtil.isNotEmpty(columnInfoList)) {
+        if (ListUtil.isNotEmpty(columnInfoList)) {
             for (ColumnInfo columnInfo : columnInfoList) {
                 recColumnTable.add(columnInfo.getTableEname());
             }
@@ -488,7 +489,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkNonnull(List<NonnullInfo> nonnullInfos, List<String> behospitalCodeList, Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkNonnull(List<NonnullInfo> nonnullInfos, List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         for (NonnullInfo nonnullInfo : nonnullInfos) {
             Long columnId = nonnullInfo.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -502,13 +503,13 @@ public class ColumnResultManagementFacade {
             getTableColumnInfoVO.setHospitalId(hospitalId);
             String columnNumber = getColumnNumber(columnInfo.getTableCname());
             getTableColumnInfoVO.setNumberColumnCname(columnNumber);
-            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO,recColumnTable);
+            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO, recColumnTable);
             //枚举获取模块信息
             String modeId = ModeEnum.valueOf(columnInfo.getTableEname()).getKey();
             String modeName = ModeEnum.valueOf(columnInfo.getTableEname()).getName();
             //删除结果表所有的信息
-            removeNonnullResultSolved(behospitalCodeList, hospitalId,columnId);
-            removeColumnResultSolved(behospitalCodeList,hospitalId, columnId, ColumnResultTypeEnum.NONNULL_TYPE.getKey());
+            removeNonnullResultSolved(behospitalCodeList, hospitalId, columnId);
+            removeColumnResultSolved(behospitalCodeList, hospitalId, columnId, ColumnResultTypeEnum.NONNULL_TYPE.getKey());
             for (GetTableColumnInfoDTO getTableColumnInfoDTO : tableColumnVal) {
                 getTableColumnInfoDTO.setModeId(Long.valueOf(modeId));
                 getTableColumnInfoDTO.setModeName(modeName);
@@ -528,10 +529,10 @@ public class ColumnResultManagementFacade {
                     nonnullResult.setBehospitalCode(getTableColumnInfoDTO.getBehospitalCode());
                     nonnullResult.setModeId(getTableColumnInfoDTO.getModeId());
                     nonnullResult.setModeName(getTableColumnInfoDTO.getModeName());
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
                         nonnullResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
                     }
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
                         nonnullResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
                     }
                     nonnullResult.setColumnId(nonnullInfo.getColumnId());
@@ -542,7 +543,7 @@ public class ColumnResultManagementFacade {
                     nonnullResult.setTableEname(columnInfo.getTableEname());
                     nonnullResult.setColumnCname(columnInfo.getColumnCname());
                     nonnullResult.setColumnEname(columnInfo.getColumnEname());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         nonnullResult.setCreator(principleId.toString());
                     }
                     nonnullResult.setTableId(getTableColumnInfoDTO.getTableId());
@@ -554,7 +555,7 @@ public class ColumnResultManagementFacade {
                     nonnullResultFacade.getBaseMapper().insert(nonnullResult);
                     Long id = nonnullResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.NONNULL_TYPE.getKey(),principleId);
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.NONNULL_TYPE.getKey(), principleId);
                 }
             }
         }
@@ -568,7 +569,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkRegular(List<GetRegular> regularMappings, List<String> behospitalCodeList, Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkRegular(List<GetRegular> regularMappings, List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         for (GetRegular getRegular : regularMappings) {
             Long columnId = getRegular.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -581,13 +582,13 @@ public class ColumnResultManagementFacade {
             getTableColumnInfoVO.setHospitalId(hospitalId);
             String columnNumber = getColumnNumber(columnInfo.getTableCname());
             getTableColumnInfoVO.setNumberColumnCname(columnNumber);
-            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO,recColumnTable);
+            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO, recColumnTable);
             String modeId = ModeEnum.valueOf(columnInfo.getTableEname()).getKey();
             String modeName = ModeEnum.valueOf(columnInfo.getTableEname()).getName();
             String regular = getRegular.getVal();
             //删除病历集合对应字段结果表所有的信息
-            removeRegularResultSolved(behospitalCodeList,hospitalId, columnId);
-            removeColumnResultSolved(behospitalCodeList,hospitalId, columnId, ColumnResultTypeEnum.REGULAR_TYPE.getKey());
+            removeRegularResultSolved(behospitalCodeList, hospitalId, columnId);
+            removeColumnResultSolved(behospitalCodeList, hospitalId, columnId, ColumnResultTypeEnum.REGULAR_TYPE.getKey());
             for (GetTableColumnInfoDTO getTableColumnInfoDTO : tableColumnVal) {
                 getTableColumnInfoDTO.setModeId(Long.valueOf(modeId));
                 getTableColumnInfoDTO.setModeName(modeName);
@@ -610,16 +611,16 @@ public class ColumnResultManagementFacade {
                     regularResult.setTableEname(columnInfo.getTableEname());
                     regularResult.setColumnCname(columnInfo.getColumnCname());
                     regularResult.setColumnEname(columnInfo.getColumnEname());
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
                         regularResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
                     }
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
                         regularResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
                     }
                     regularResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
                     regularResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
                     regularResult.setRegularId(getRegular.getId());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         regularResult.setCreator(principleId.toString());
                     }
                     regularResult.setRegularName(getRegular.getName());
@@ -635,7 +636,7 @@ public class ColumnResultManagementFacade {
                     regularResultFacade.getBaseMapper().insert(regularResult);
                     Long id = regularResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.REGULAR_TYPE.getKey(),principleId);
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.REGULAR_TYPE.getKey(), principleId);
                 }
             }
         }
@@ -649,7 +650,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkStandardvalue(List<GetStandardvalueInfoDTO> standardvalueInfos, List<String> behospitalCodeList, Long hospitalId,Long principleId,List<String> recColumnTable) {
+    public void checkStandardvalue(List<GetStandardvalueInfoDTO> standardvalueInfos, List<String> behospitalCodeList, Long hospitalId, Long principleId, List<String> recColumnTable) {
         for (GetStandardvalueInfoDTO standardvalueInfo : standardvalueInfos) {
             Long columnId = standardvalueInfo.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -662,13 +663,13 @@ public class ColumnResultManagementFacade {
             getTableColumnInfoVO.setHospitalId(hospitalId);
             String columnNumber = getColumnNumber(columnInfo.getTableCname());
             getTableColumnInfoVO.setNumberColumnCname(columnNumber);
-            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO,recColumnTable);
+            List<GetTableColumnInfoDTO> tableColumnVal = getTableColumnVal(getTableColumnInfoVO, recColumnTable);
             String standardvalue = standardvalueInfo.getStandardvalue();
             String modeId = ModeEnum.valueOf(columnInfo.getTableEname()).getKey();
             String modeName = ModeEnum.valueOf(columnInfo.getTableEname()).getName();
             //删除结果表所有的信息
-            removeStandardvalueResultSolved(behospitalCodeList,hospitalId, columnId);
-            removeColumnResultSolved(behospitalCodeList,hospitalId, columnId, ColumnResultTypeEnum.STANDARD_TYPE.getKey());
+            removeStandardvalueResultSolved(behospitalCodeList, hospitalId, columnId);
+            removeColumnResultSolved(behospitalCodeList, hospitalId, columnId, ColumnResultTypeEnum.STANDARD_TYPE.getKey());
             for (GetTableColumnInfoDTO getTableColumnInfoDTO : tableColumnVal) {
                 getTableColumnInfoDTO.setModeId(Long.valueOf(modeId));
                 getTableColumnInfoDTO.setModeName(modeName);
@@ -691,10 +692,10 @@ public class ColumnResultManagementFacade {
                     standardvalueResult.setColumnId(columnId);
                     standardvalueResult.setMappings(standardvalueMapping);
                     standardvalueResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
                         standardvalueResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
                     }
-                    if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+                    if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
                         standardvalueResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
                     }
                     standardvalueResult.setTableCname(columnInfo.getTableCname());
@@ -703,7 +704,7 @@ public class ColumnResultManagementFacade {
                     standardvalueResult.setColumnCname(columnInfo.getColumnCname());
                     standardvalueResult.setColumnEname(columnInfo.getColumnEname());
                     standardvalueResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
-                    if(principleId!=null) {
+                    if (principleId != null) {
                         standardvalueResult.setCreator(principleId.toString());
                     }
                     standardvalueResult.setTableId(getTableColumnInfoDTO.getTableId());
@@ -715,7 +716,7 @@ public class ColumnResultManagementFacade {
                     standardvalueResultFacade.getBaseMapper().insert(standardvalueResult);
                     Long id = standardvalueResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.STANDARD_TYPE.getKey(),principleId);
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.STANDARD_TYPE.getKey(), principleId);
                 }
             }
         }
@@ -727,9 +728,9 @@ public class ColumnResultManagementFacade {
      * @param getTableColumnInfoVO
      * @return: 具体数据
      */
-    public List<GetTableColumnInfoDTO> getTableColumnVal(GetTableColumnInfoVO getTableColumnInfoVO,List<String> recColumnTable) {
+    public List<GetTableColumnInfoDTO> getTableColumnVal(GetTableColumnInfoVO getTableColumnInfoVO, List<String> recColumnTable) {
         //判断此规则是否包含rec_id
-        if(ListUtil.isNotEmpty(recColumnTable) && recColumnTable.contains(getTableColumnInfoVO.getColumnEname())){
+        if (ListUtil.isNotEmpty(recColumnTable) && recColumnTable.contains(getTableColumnInfoVO.getTableEname())) {
             List<GetTableColumnInfoDTO> tableColumnVal = columnResultFacade.getBaseMapper().getRecSpecialTableColumnVal(getTableColumnInfoVO);
             return tableColumnVal;
         }
@@ -781,7 +782,7 @@ public class ColumnResultManagementFacade {
      * @param columnId
      * @return:
      */
-    public void removeNonnullResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId) {
+    public void removeNonnullResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
         nonnullResultFacade.remove(new UpdateWrapper<NonnullResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
@@ -791,14 +792,14 @@ public class ColumnResultManagementFacade {
     }
 
     /**
-     *删除正则校验结果表信息
+     * 删除正则校验结果表信息
      *
      * @param behospitalCodeList
      * @param hospitalId
      * @param columnId
      * @return:
      */
-    public void removeRegularResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId) {
+    public void removeRegularResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
         regularResultFacade.remove(new UpdateWrapper<RegularResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
@@ -815,7 +816,7 @@ public class ColumnResultManagementFacade {
      * @param columnId
      * @return:
      */
-    public void removeStandardvalueResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId) {
+    public void removeStandardvalueResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId) {
         standardvalueResultFacade.remove(new UpdateWrapper<StandardvalueResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
@@ -832,7 +833,7 @@ public class ColumnResultManagementFacade {
      * @param columnId
      * @return:
      */
-    public void removeColumnResultSolved(List<String> behospitalCodeList,Long hospitalId, Long columnId, String type) {
+    public void removeColumnResultSolved(List<String> behospitalCodeList, Long hospitalId, Long columnId, String type) {
         //未解决修改
         columnResultFacade.remove(new UpdateWrapper<ColumnResult>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -853,21 +854,21 @@ public class ColumnResultManagementFacade {
      * @param type
      * @return:
      */
-    public void addColumnResult(GetTableColumnInfoDTO getTableColumnInfoDTO, ColumnInfo columnInfo, Long columnId, Long id, String type,Long principleId) {
+    public void addColumnResult(GetTableColumnInfoDTO getTableColumnInfoDTO, ColumnInfo columnInfo, Long columnId, Long id, String type, Long principleId) {
         ColumnResult columnResult = new ColumnResult();
         columnResult.setHospitalId(getTableColumnInfoDTO.getHospitalId());
         columnResult.setBehospitalCode(getTableColumnInfoDTO.getBehospitalCode());
         columnResult.setModeId(getTableColumnInfoDTO.getModeId());
         columnResult.setModeName(getTableColumnInfoDTO.getModeName());
-        if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
+        if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecId())) {
             columnResult.setHosptialDatatmpCode(getTableColumnInfoDTO.getRecId());
         }
-        if(StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
+        if (StringUtil.isNotEmpty(getTableColumnInfoDTO.getRecTitle())) {
             columnResult.setHosptialDatatmpName(getTableColumnInfoDTO.getRecTitle());
         }
         columnResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
         columnResult.setColumnId(columnId);
-        if(principleId!=null) {
+        if (principleId != null) {
             columnResult.setCreator(principleId.toString());
         }
         columnResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());