|
@@ -45,7 +45,8 @@ public class PlanDetailFacade extends PlanDetailServiceImpl {
|
|
sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.eq("hospital_id", hospitalSetVO.getHospitalId())
|
|
.eq("hospital_id", hospitalSetVO.getHospitalId())
|
|
.eq(StringUtil.isNotBlank(hospitalSetVO.getCode()), "code", hospitalSetVO.getCode())
|
|
.eq(StringUtil.isNotBlank(hospitalSetVO.getCode()), "code", hospitalSetVO.getCode())
|
|
- .in("plan_id", hospitalSetVO.getPlanId());
|
|
|
|
|
|
+ .in("plan_id", hospitalSetVO.getPlanId())
|
|
|
|
+ .orderByAsc("plan_id", "order_no");
|
|
List<PlanDetail> sysSetData = list(sysSetInfo);
|
|
List<PlanDetail> sysSetData = list(sysSetInfo);
|
|
List<PlanDetailDTO> data = BeanUtil.listCopyTo(sysSetData, PlanDetailDTO.class);
|
|
List<PlanDetailDTO> data = BeanUtil.listCopyTo(sysSetData, PlanDetailDTO.class);
|
|
return data;
|
|
return data;
|