|
@@ -7,6 +7,7 @@ import com.diagbot.dto.SysSetInfoDTO;
|
|
import com.diagbot.entity.HospitalInfo;
|
|
import com.diagbot.entity.HospitalInfo;
|
|
import com.diagbot.entity.SysSet;
|
|
import com.diagbot.entity.SysSet;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
|
+import com.diagbot.enums.SysTypeEnum;
|
|
import com.diagbot.service.impl.SysSetServiceImpl;
|
|
import com.diagbot.service.impl.SysSetServiceImpl;
|
|
import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.IntegerUtil;
|
|
import com.diagbot.util.IntegerUtil;
|
|
@@ -52,8 +53,8 @@ public class SysSetFacade extends SysSetServiceImpl {
|
|
QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
|
|
QueryWrapper<SysSet> sysSetInfo = new QueryWrapper<>();
|
|
sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
sysSetInfo.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
sysSetInfo.eq("hospital_code", sysHospitalCodeVO.getHospitalCode());
|
|
sysSetInfo.eq("hospital_code", sysHospitalCodeVO.getHospitalCode());
|
|
- sysSetInfo.eq("code", sysHospitalCodeVO.getJuniorHospitalCode());
|
|
|
|
- sysSetInfo.eq("sys_type", sysHospitalCodeVO.getSysType());
|
|
|
|
|
|
+ sysSetInfo.eq("code", "junior_hospital");
|
|
|
|
+ sysSetInfo.eq("sys_type", SysTypeEnum.PREC_SERVICE.getKey());
|
|
SysSet sysSetInfoData = getOne(sysSetInfo, false);
|
|
SysSet sysSetInfoData = getOne(sysSetInfo, false);
|
|
SysHospitalInfoVO sysHospitalInfoVO = new SysHospitalInfoVO();
|
|
SysHospitalInfoVO sysHospitalInfoVO = new SysHospitalInfoVO();
|
|
List<String> listCode = Lists.newArrayList(sysSetInfoData.getValue().split(","));
|
|
List<String> listCode = Lists.newArrayList(sysSetInfoData.getValue().split(","));
|
|
@@ -61,8 +62,8 @@ public class SysSetFacade extends SysSetServiceImpl {
|
|
listCode.add(sysHospitalCodeVO.getHospitalCode());
|
|
listCode.add(sysHospitalCodeVO.getHospitalCode());
|
|
//查询下级医院的默认科室
|
|
//查询下级医院的默认科室
|
|
sysHospitalInfoVO.setHospitalCode(listCode);
|
|
sysHospitalInfoVO.setHospitalCode(listCode);
|
|
- sysHospitalInfoVO.setCode(sysHospitalCodeVO.getDefaultDeptCode());
|
|
|
|
- sysHospitalInfoVO.setSysType(sysHospitalCodeVO.getSysType());
|
|
|
|
|
|
+ sysHospitalInfoVO.setCode("default_dept");
|
|
|
|
+ sysHospitalInfoVO.setSysType(SysTypeEnum.PREC_SERVICE.getKey());
|
|
List<SysHospitalDeptInfoDTO> juniorHospitalData = getjuniorHospitalData(sysHospitalInfoVO);
|
|
List<SysHospitalDeptInfoDTO> juniorHospitalData = getjuniorHospitalData(sysHospitalInfoVO);
|
|
SysHospitalDTO sysHospitalDTO = new SysHospitalDTO();
|
|
SysHospitalDTO sysHospitalDTO = new SysHospitalDTO();
|
|
List<SysHospitalDeptInfoDTO> hospitalDatas = new ArrayList<SysHospitalDeptInfoDTO>();
|
|
List<SysHospitalDeptInfoDTO> hospitalDatas = new ArrayList<SysHospitalDeptInfoDTO>();
|