修改代码医院ID获取为从token中获取

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

@@ -91,7 +91,7 @@ public class ColumnResultManagementFacade {
     public IPage<GetColumnResultPageDTO> getColumnResultPage(GetColumnResultPageVO getColumnResultPageVO) {
         Page<GetColumnResultPageDTO> getColumnResultPageDTOPage = new Page<>();
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        getColumnResultPageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        getColumnResultPageVO.setHospitalId(currentHospitalId);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String startDate = null;
         String endDate = null;
@@ -130,7 +130,7 @@ public class ColumnResultManagementFacade {
      */
     public GetColumnResultNumberDTO getColumnResultNumber(GetColumnResultNumberVO getColumnResultNumberVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        getColumnResultNumberVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        getColumnResultNumberVO.setHospitalId(currentHospitalId);
         return columnResultFacade.getBaseMapper().getColumnResultNumber(getColumnResultNumberVO);
     }
 
@@ -235,7 +235,7 @@ public class ColumnResultManagementFacade {
      */
     public Boolean dataCheck(DataCheckVO dataCheckVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        dataCheckVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        dataCheckVO.setHospitalId(currentHospitalId);
         String behospitalCode = dataCheckVO.getBehospitalCode();
         //传入BehospitalCode 只针对单个病历进行校验
         if (StringUtil.isNotEmpty(behospitalCode)) {
@@ -936,6 +936,7 @@ public class ColumnResultManagementFacade {
                     .set("is_solved", SolvedStatusEnum.NOT_SOLVED.getKey())
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
+                    .set("gmt_modified",new Date())
             );
         }
         //已解决修改
@@ -950,6 +951,7 @@ public class ColumnResultManagementFacade {
                     .set("is_solved", SolvedStatusEnum.IS_SOLVED.getKey())
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
+                    .set("gmt_modified",new Date())
             );
         }
     }
@@ -975,6 +977,7 @@ public class ColumnResultManagementFacade {
                     .set("is_solved", SolvedStatusEnum.NOT_SOLVED.getKey())
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
+                    .set("gmt_modified",new Date())
             );
         }
         //已解决修改
@@ -989,6 +992,7 @@ public class ColumnResultManagementFacade {
                     .set("is_solved", SolvedStatusEnum.IS_SOLVED.getKey())
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
+                    .set("gmt_modified",new Date())
             );
         }
     }
@@ -1015,6 +1019,7 @@ public class ColumnResultManagementFacade {
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
                     .set("mappings", standardvalueMapping)
+                    .set("gmt_modified",new Date())
             );
         }
         //已解决修改
@@ -1030,6 +1035,7 @@ public class ColumnResultManagementFacade {
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
                     .set("mappings", standardvalueMapping)
+                    .set("gmt_modified",new Date())
             );
         }
     }
@@ -1055,6 +1061,7 @@ public class ColumnResultManagementFacade {
                     .set("is_solved", SolvedStatusEnum.NOT_SOLVED.getKey())
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
+                    .set("gmt_modified",new Date())
             );
         }
         //已解决修改
@@ -1069,6 +1076,7 @@ public class ColumnResultManagementFacade {
                     .set("is_solved", SolvedStatusEnum.IS_SOLVED.getKey())
                     .set("solve_time", new Date())
                     .set("hospital_data_code", getTableColumnInfoDTO.getNumberId())
+                    .set("gmt_modified",new Date())
             );
         }
     }

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

@@ -76,7 +76,7 @@ public class ColumnVerifyManagementFacade {
      */
     public IPage<GetColumnVerifyPageDTO> getColumnVerifyPage(GetColumnVerifyPageVO getColumnVerifyPageVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        getColumnVerifyPageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        getColumnVerifyPageVO.setHospitalId(currentHospitalId);
         return columnVerifyFacade.getBaseMapper().getColumnVerifyPage(getColumnVerifyPageVO);
     }
 
@@ -196,7 +196,7 @@ public class ColumnVerifyManagementFacade {
      */
     public Boolean addColumnVerify(AddColumnVerifyVO addColumnVerifyVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        addColumnVerifyVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        addColumnVerifyVO.setHospitalId(currentHospitalId);
         List<ColumnInfoVO> columnList = addColumnVerifyVO.getColumnList();
         //查出表列信息ID
         for (ColumnInfoVO columnInfoVO : columnList) {
@@ -394,7 +394,7 @@ public class ColumnVerifyManagementFacade {
      */
     public Boolean updateColumnVerify(UpdateColumnVerifyVO updateColumnVerifyVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        updateColumnVerifyVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        updateColumnVerifyVO.setHospitalId(currentHospitalId);
         List<ColumnInfoVO> columnList = updateColumnVerifyVO.getColumnList();
         AddColumnVerifyVO addColumnVerifyVO = new AddColumnVerifyVO();
         List<ColumnInfoVO> columnInfoAdd = new ArrayList<>();

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

@@ -39,7 +39,7 @@ public class OfficialCapacityManagementFacade {
      */
     public IPage<GetOfficialCapacityPageDTO> getOfficialCapacityPage(GetOfficialCapacityPageVO getOfficialCapacityPageVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        getOfficialCapacityPageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        getOfficialCapacityPageVO.setHospitalId(currentHospitalId);
         Page<GetOfficialCapacityPageDTO> getOfficialCapacityPageDTOPage = new Page<>();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -37,7 +37,7 @@ public class RecordTemplateManagementFacade {
      */
     public IPage<GetRecordTemplatePageDTO> getRecordTemplatePage(GetRecordTemplatePageVO getRecordTemplatePageVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        getRecordTemplatePageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
+        getRecordTemplatePageVO.setHospitalId(currentHospitalId);
         Page<GetRecordTemplatePageDTO> getRecordTemplatePageDTOPage = new Page<>();
 
         QueryWrapper<RecordTemplate> recordTemplateQueryWrapper = new QueryWrapper<>();