|
@@ -13,7 +13,7 @@ import com.imed.costaccount.model.dto.HospitalDto;
|
|
import com.imed.costaccount.model.dto.HospitalSaveDto;
|
|
import com.imed.costaccount.model.dto.HospitalSaveDto;
|
|
import com.imed.costaccount.model.vo.CommonVO;
|
|
import com.imed.costaccount.model.vo.CommonVO;
|
|
import com.imed.costaccount.model.vo.HospitalAllVO;
|
|
import com.imed.costaccount.model.vo.HospitalAllVO;
|
|
-import com.imed.costaccount.model.vo.HosptailVO;
|
|
|
|
|
|
+import com.imed.costaccount.model.vo.HospitalVO;
|
|
import com.imed.costaccount.service.HospitalService;
|
|
import com.imed.costaccount.service.HospitalService;
|
|
import com.imed.costaccount.utils.BeanUtil;
|
|
import com.imed.costaccount.utils.BeanUtil;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -46,9 +46,9 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
|
|
// .eq(!StringUtils.isEmpty(hospId), Hospital::getId, hospId)
|
|
// .eq(!StringUtils.isEmpty(hospId), Hospital::getId, hospId)
|
|
.like(!StringUtils.isEmpty(name), Hospital::getName, name));
|
|
.like(!StringUtils.isEmpty(name), Hospital::getName, name));
|
|
List<Hospital> records = pages.getRecords();
|
|
List<Hospital> records = pages.getRecords();
|
|
- List<HosptailVO> hosptailVOList = BeanUtil.convertList(records, HosptailVO.class);
|
|
|
|
|
|
+ List<HospitalVO> hospitalVOList = BeanUtil.convertList(records, HospitalVO.class);
|
|
PageUtils pageUtils = new PageUtils(pages);
|
|
PageUtils pageUtils = new PageUtils(pages);
|
|
- pageUtils.setList(hosptailVOList);
|
|
|
|
|
|
+ pageUtils.setList(hospitalVOList);
|
|
return pageUtils;
|
|
return pageUtils;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -70,6 +70,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
|
|
// 校验参数
|
|
// 校验参数
|
|
private void checkParam(HospitalSaveDto hospitalSaveDto, String sign) {
|
|
private void checkParam(HospitalSaveDto hospitalSaveDto, String sign) {
|
|
Integer isHospital = hospitalSaveDto.getIsHospital();
|
|
Integer isHospital = hospitalSaveDto.getIsHospital();
|
|
|
|
+ // 新增医院
|
|
if (isHospital == 0) {
|
|
if (isHospital == 0) {
|
|
if (StringUtils.isEmpty(sign)) {
|
|
if (StringUtils.isEmpty(sign)) {
|
|
throw new CostException(500, "新增医院请选择医院标识");
|
|
throw new CostException(500, "新增医院请选择医院标识");
|