|
@@ -11,9 +11,9 @@ import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.service.impl.HospitalDeptServiceImpl;
|
|
import com.diagbot.service.impl.HospitalDeptServiceImpl;
|
|
import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.BeanUtil;
|
|
-import com.diagbot.util.DateUtil;
|
|
|
|
import com.diagbot.util.EntityUtil;
|
|
import com.diagbot.util.EntityUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
|
|
+import com.diagbot.util.StringUtil;
|
|
import com.diagbot.vo.HospitalCodeVo;
|
|
import com.diagbot.vo.HospitalCodeVo;
|
|
import com.diagbot.vo.HospitalDeptInfoVO;
|
|
import com.diagbot.vo.HospitalDeptInfoVO;
|
|
import com.diagbot.vo.HospitalDeptVO;
|
|
import com.diagbot.vo.HospitalDeptVO;
|
|
@@ -107,8 +107,10 @@ public class HospitalDeptFacade extends HospitalDeptServiceImpl {
|
|
hospitalDeptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
hospitalDeptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.eq("hospital_code", hospitalCodeVo.getHospitalCode())
|
|
.eq("hospital_code", hospitalCodeVo.getHospitalCode())
|
|
.eq("status", StatusEnum.Enable.getKey())
|
|
.eq("status", StatusEnum.Enable.getKey())
|
|
- .like("name",hospitalCodeVo.getThirdpartyName())
|
|
|
|
- .like("concept_dept_name", hospitalCodeVo.getDeptInfoName());
|
|
|
|
|
|
+ .like(StringUtil.isNotBlank(hospitalCodeVo.getThirdpartyName()),
|
|
|
|
+ "name",hospitalCodeVo.getThirdpartyName())
|
|
|
|
+ .like(StringUtil.isNotBlank(hospitalCodeVo.getDeptInfoName()),
|
|
|
|
+ "concept_dept_name", hospitalCodeVo.getDeptInfoName());
|
|
List<HospitalDept> hospitalDeptList = this.list(hospitalDeptQueryWrapper);
|
|
List<HospitalDept> hospitalDeptList = this.list(hospitalDeptQueryWrapper);
|
|
List<HospitalDeptInfoAllDTO> data = BeanUtil.listCopyTo(hospitalDeptList, HospitalDeptInfoAllDTO.class);
|
|
List<HospitalDeptInfoAllDTO> data = BeanUtil.listCopyTo(hospitalDeptList, HospitalDeptInfoAllDTO.class);
|
|
return data;
|
|
return data;
|