Merge remote-tracking branch 'origin/master'

feige

4 天以前 c8668a4a71987199e610781e7ac8cc02faa4f082

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -39,7 +40,7 @@
 */
@Service
@Slf4j
public class ZfDoctorServiceImpl extends ServiceImpl<ZfDoctorMapper, ZfDoctor> implements ZfDoctorService {
public class ZfDoctorServiceImpl extends ServiceImpl<ZfDoctorMapper, ZfDoctor> implements ZfDoctorService,ModuleSearchable {

    @Resource
    ZInfoUserService zInfoUserService;
@@ -62,6 +63,9 @@
    @Resource
    ZfDoctorShareService zfDoctorShareService;

    @Resource
    ZfDoctorDownloadService zfDoctorDownloadService;


    @Override
    public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) {
@@ -80,11 +84,29 @@
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();

        //查看父母的数据：
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);
        List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
        if(!fms.isEmpty())
        {
            idList.addAll(fms);
        }
//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds()
        LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor, idList);
@@ -94,7 +116,7 @@

        List<ZfDoctor> beanRecords = pageResult.getRecords();//得到查询出来的数据

        List<ZfDoctor> dtoResult = markOwnData(familyId, beanRecords);
        List<ZfDoctor> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
    }
@@ -110,23 +132,36 @@
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        Long familyId = myself.getFamilyId();

        //查看父母的数据：
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(DOCTOR_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);


        LambdaQueryWrapper<ZfDoctor> lambdaQueryWrapper = buildCondition(zfDoctor, idList);
        List<ZfDoctor> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
        return markOwnData(familyId, fatherFaId, motherFaId,beanRecords);
    }

    public List<ZfDoctor> markOwnData(Long familyId, List<ZfDoctor> beanRecords) {
    public List<ZfDoctor> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfDoctor> beanRecords) {
        return beanRecords.stream().peek(
                bean -> {
                    if (bean.getFamilyId() == familyId) {
                    if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
                        bean.setOwnData(1);
                    } else {
                        bean.setOwnData(0);
@@ -158,7 +193,7 @@


        for (ZfDoctor zfDoctor : dataList) {
            if (zfDoctor.getSuitable().length() != 0 || zfDoctor.getType().length() != 0 || zfDoctor.getEffect().length() != 0 ) {
//            if (zfDoctor.getSuitable().length() != 0 || zfDoctor.getType().length() != 0 || zfDoctor.getEffect().length() != 0 ) {
                if(zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null){
                    throw new RuntimeException("症状为空，导入数据失败");
                }
@@ -166,7 +201,7 @@
                    zfDoctorService.addData(zfDoctor);
                }
            }
        }
//        }
        return AjaxResult.success("导入数据成功");

    }
@@ -356,7 +391,9 @@
            }
        }
        List<ZfDoctor> zfDoctors = listByIds(Arrays.asList(ids));

        if (! (zfDoctorDownloadService.deleteData(ids) && zfDoctorShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        if (zfDoctorService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
@@ -429,6 +466,29 @@
                .like(StringUtils.isNotEmpty(zfDoctor.getWmedical()), ZfDoctor::getWmedical, zfDoctor.getWmedical())
                .like(StringUtils.isNotEmpty(zfDoctor.getCmedical()), ZfDoctor::getCmedical, zfDoctor.getCmedical())
                .like(StringUtils.isNotEmpty(zfDoctor.getRemark()), ZfDoctor::getRemark, zfDoctor.getRemark());
//        lqw.like(StringUtils.isNotEmpty(zfDoctor.getCompanion()),ZfDoctor::getCompanion,zfDoctor.getCompanion());

        if (CollectionUtils.isNotEmpty(zfDoctor.getCompanionList())) {
            List<String> companionList = zfDoctor.getCompanionList();

            // 清理和去重
            companionList = companionList.stream()
                .map(String::trim)
                .filter(s -> !s.isEmpty())
                .distinct()
                .collect(Collectors.toList());

            if (!companionList.isEmpty()) {
                // 确保所有参与人都在companion字段中
                for (String companion : companionList) {
                    lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '，', ',')) > 0",
                        companion);
                }
            }
        }

        lqw.between(zfDoctor.getHappenStartTime() != null && zfDoctor.getHappenEndTime() != null, ZfDoctor::getCreateTime, zfDoctor.getHappenStartTime(), zfDoctor.getHappenEndTime());

        if (StringUtils.isNotEmpty(zfDoctor.getPrescription())) {
            lqw.and(wrapper -> {
                wrapper.like(StringUtils.isNotEmpty(zfDoctor.getPrescription()), ZfDoctor::getWmedical, zfDoctor.getPrescription())
@@ -439,31 +499,47 @@
        return lqw;
    }

    public LambdaQueryWrapper<ZfDoctor> buildCondition2(List<Long> ids) {
        LambdaQueryWrapper<ZfDoctor> lqw = new LambdaQueryWrapper<>();

            lqw.eq(ZfDoctor::getId, ids);

        return lqw;
    }
    @Override
    public AjaxResult selectListById(List<Long> ids, Integer pageNum, Integer pageSize) {
        List<ZfDoctor> lqw2 = new ArrayList<>();
    public String getModuleCode() {
        return "2043";
    }

        LambdaQueryWrapper<ZfDoctor> lqw = buildCondition2(ids);
        List<ZfDoctor> bb = list(lqw);
        System.out.println("15052222254"+bb);
    @Override
    public List<?> search(String companion, Date happenStartTime, Date happenEndTime) {

        Page<ZfDoctor> zfDoctorPage = new Page<>(pageNum, pageSize);
        Page<ZfDoctor> pageResult = page(zfDoctorPage, lqw);
        List<ZfDoctor> beanRecords = pageResult.getRecords();//得到查询出来的数据
        System.out.println(beanRecords);
        ZfDoctor zfDoctor = new ZfDoctor();
        String[] split = companion.split(",");
        List<String> list = Arrays.asList(split);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
        zfDoctor.setCompanionList(list);        zfDoctor.setHappenStartTime(happenStartTime);
        zfDoctor.setHappenEndTime(happenEndTime);
        return selectByCondition(zfDoctor);
    }


        return AjaxResult.success(data);
//    public LambdaQueryWrapper<ZfDoctor> buildCondition2(List<Long> ids) {
//        LambdaQueryWrapper<ZfDoctor> lqw = new LambdaQueryWrapper<>();
//            lqw.eq(ZfDoctor::getId, ids);
//
//        return lqw;
//    }
//    @Override
//    public AjaxResult selectListById(List<Long> ids, Integer pageNum, Integer pageSize) {
//        List<ZfDoctor> lqw2 = new ArrayList<>();
//
//        LambdaQueryWrapper<ZfDoctor> lqw = buildCondition2(ids);
//        List<ZfDoctor> bb = list(lqw);
//        System.out.println("15052222254"+bb);
//
//        Page<ZfDoctor> zfDoctorPage = new Page<>(pageNum, pageSize);
//        Page<ZfDoctor> pageResult = page(zfDoctorPage, lqw);
//        List<ZfDoctor> beanRecords = pageResult.getRecords();//得到查询出来的数据
//        System.out.println(beanRecords);
//
//        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
//
//
//        return AjaxResult.success(data);
////    }

//        private List<Long> buildCondition1(){
//        List<ZfDoctorShare> authority1 = zfDoctorShareService.getAuthority();
@@ -481,4 +557,4 @@
//    }


}}
}