|
@@ -102,7 +102,9 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
private MappingConfigService mappingConfigService;
|
|
private MappingConfigService mappingConfigService;
|
|
@Autowired
|
|
@Autowired
|
|
private DictionaryFacade dictionaryFacade;
|
|
private DictionaryFacade dictionaryFacade;
|
|
-
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private SysUserUtils sysUserUtils;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 分页查询
|
|
* 分页查询
|
|
*
|
|
*
|
|
@@ -112,7 +114,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
@Override
|
|
@Override
|
|
public IPage<MappingConfigWrapper> getPage(MappingConfigPageVO mappingConfigPageVO) {
|
|
public IPage<MappingConfigWrapper> getPage(MappingConfigPageVO mappingConfigPageVO) {
|
|
if (mappingConfigPageVO.getHospitalId() == null) {
|
|
if (mappingConfigPageVO.getHospitalId() == null) {
|
|
- mappingConfigPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
|
|
|
|
|
|
+ mappingConfigPageVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
|
|
}
|
|
}
|
|
|
|
|
|
FilterVO filterVO = new FilterVO();
|
|
FilterVO filterVO = new FilterVO();
|
|
@@ -436,7 +438,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
*/
|
|
*/
|
|
public void exportExcel(HttpServletResponse response, MappingConfigPageVO mappingConfigPageVO) {
|
|
public void exportExcel(HttpServletResponse response, MappingConfigPageVO mappingConfigPageVO) {
|
|
if (mappingConfigPageVO.getHospitalId() == null) {
|
|
if (mappingConfigPageVO.getHospitalId() == null) {
|
|
- mappingConfigPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
|
|
|
|
|
|
+ mappingConfigPageVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
|
|
}
|
|
}
|
|
mappingConfigPageVO.setHisName("");
|
|
mappingConfigPageVO.setHisName("");
|
|
mappingConfigPageVO.setHisDetailName("");
|
|
mappingConfigPageVO.setHisDetailName("");
|
|
@@ -456,7 +458,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
*/
|
|
*/
|
|
public List<MappingConfigWrapper> exportExcel_remote(MappingConfigPageVO mappingConfigPageVO) {
|
|
public List<MappingConfigWrapper> exportExcel_remote(MappingConfigPageVO mappingConfigPageVO) {
|
|
if (mappingConfigPageVO.getHospitalId() == null) {
|
|
if (mappingConfigPageVO.getHospitalId() == null) {
|
|
- mappingConfigPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
|
|
|
|
|
|
+ mappingConfigPageVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
|
|
}
|
|
}
|
|
mappingConfigPageVO.setHisName("");
|
|
mappingConfigPageVO.setHisName("");
|
|
mappingConfigPageVO.setHisDetailName("");
|
|
mappingConfigPageVO.setHisDetailName("");
|
|
@@ -1298,7 +1300,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
*/
|
|
*/
|
|
public void importExcel(HttpServletResponse response, MultipartFile file, Long hospitalId, Integer type, String userId) {
|
|
public void importExcel(HttpServletResponse response, MultipartFile file, Long hospitalId, Integer type, String userId) {
|
|
if (hospitalId == null) {
|
|
if (hospitalId == null) {
|
|
- hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
|
|
|
|
|
|
+ hospitalId = Long.valueOf(sysUserUtils.getCurrentHospitalID());
|
|
}
|
|
}
|
|
if (StringUtil.isBlank(userId)) {
|
|
if (StringUtil.isBlank(userId)) {
|
|
userId = SysUserUtils.getCurrentPrincipleID();
|
|
userId = SysUserUtils.getCurrentPrincipleID();
|
|
@@ -1325,7 +1327,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
*/
|
|
*/
|
|
public List<MappingConfigWrapper> importExcel_remote(HttpServletResponse response, MultipartFile file, Long hospitalId, Integer type, String userId) {
|
|
public List<MappingConfigWrapper> importExcel_remote(HttpServletResponse response, MultipartFile file, Long hospitalId, Integer type, String userId) {
|
|
if (hospitalId == null) {
|
|
if (hospitalId == null) {
|
|
- hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
|
|
|
|
|
|
+ hospitalId = Long.valueOf(sysUserUtils.getCurrentHospitalID());
|
|
}
|
|
}
|
|
if (StringUtil.isBlank(userId)) {
|
|
if (StringUtil.isBlank(userId)) {
|
|
userId = SysUserUtils.getCurrentPrincipleID();
|
|
userId = SysUserUtils.getCurrentPrincipleID();
|
|
@@ -1350,7 +1352,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
*/
|
|
*/
|
|
public Boolean importExcelDataVerify(MultipartFile file, Long hospitalId, Integer type, String userId) {
|
|
public Boolean importExcelDataVerify(MultipartFile file, Long hospitalId, Integer type, String userId) {
|
|
if (hospitalId == null) {
|
|
if (hospitalId == null) {
|
|
- hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
|
|
|
|
|
|
+ hospitalId = Long.valueOf(sysUserUtils.getCurrentHospitalID());
|
|
}
|
|
}
|
|
if (StringUtil.isBlank(userId)) {
|
|
if (StringUtil.isBlank(userId)) {
|
|
userId = SysUserUtils.getCurrentPrincipleID();
|
|
userId = SysUserUtils.getCurrentPrincipleID();
|
|
@@ -1947,7 +1949,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
public List<MappingConfigWrapper> getRelatedMapping(MappingConfigVO mappingConfigVO) {
|
|
public List<MappingConfigWrapper> getRelatedMapping(MappingConfigVO mappingConfigVO) {
|
|
List<MappingConfigWrapper> retList = Lists.newLinkedList();
|
|
List<MappingConfigWrapper> retList = Lists.newLinkedList();
|
|
if (mappingConfigVO.getHospitalId() == null) {
|
|
if (mappingConfigVO.getHospitalId() == null) {
|
|
- mappingConfigVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
|
|
|
|
|
|
+ mappingConfigVO.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
|
|
}
|
|
}
|
|
QueryWrapper<MappingConfig> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<MappingConfig> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
@@ -1986,7 +1988,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入请输入术语类型:1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径");
|
|
throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入请输入术语类型:1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径");
|
|
}
|
|
}
|
|
if (mappingConfig.getHospitalId() == null) {
|
|
if (mappingConfig.getHospitalId() == null) {
|
|
- mappingConfig.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
|
|
|
|
|
|
+ mappingConfig.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
|
|
}
|
|
}
|
|
QueryWrapper<MappingConfig> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<MappingConfig> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
@@ -2045,7 +2047,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "标准术语不允许为空,请输入标准术语id");
|
|
throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "标准术语不允许为空,请输入标准术语id");
|
|
}
|
|
}
|
|
if (mappingConfig.getHospitalId() == null) {
|
|
if (mappingConfig.getHospitalId() == null) {
|
|
- mappingConfig.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
|
|
|
|
|
|
+ mappingConfig.setHospitalId(Long.valueOf(sysUserUtils.getCurrentHospitalID()));
|
|
}
|
|
}
|
|
String userId = "";
|
|
String userId = "";
|
|
if (StringUtil.isBlank(mappingConfig.getModifier())) {
|
|
if (StringUtil.isBlank(mappingConfig.getModifier())) {
|