代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
/**
 * 
@@ -218,14 +219,15 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        patientDO.setDeviceFlag(deviceFlag);
        res.put("patient",patientDO);
        String sql = "select * from base_service_package_sign_record where patient = '"+patientId+"' and status = 1 limit 1";
        String sql = "select * from base_service_package_sign_record where patient = '"+patientId+"' and status = 1 ";
        List<ServicePackageSignRecordDO> signRecordDOs = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ServicePackageSignRecordDO.class));
        if(signRecordDOs.size()>0){
            ServicePackageSignRecordDO signRecordDO = signRecordDOs.get(0);
            String signId = signRecordDO.getId();
            List<Map<String,Object>> packageList = servicePackageService.fingdBySignId(signId);
            List<Map<String,Object>> doctorList = servicePackageService.fingdDoctorBySignId(signId,1);
            List<Map<String,Object>> helperList = servicePackageService.fingdDoctorBySignId(signId,2);
            List<String> signIds = signRecordDOs.stream().map(ServicePackageSignRecordDO::getId).collect(Collectors.toList());
            List<Map<String,Object>> packageList = servicePackageService.fingdBySignId2(signIds);
            List<Map<String,Object>> doctorList = servicePackageService.fingdDoctorBySignId2(signIds,1);
            List<Map<String,Object>> helperList = servicePackageService.fingdDoctorBySignId2(signIds,2);
            signRecordDO.setDoctorList(doctorList);
            signRecordDO.setHelperList(helperList);
            signRecordDO.setPackageList(packageList);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ServicePackageService.java

@@ -302,6 +302,15 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        return jdbcTemplate.queryForList(sql);
    }
    public List<Map<String,Object>> fingdDoctorBySignId2(List<String> signId,Integer level){
        String signIdStr =  signId.stream().map(String::valueOf).collect(Collectors.joining("','"));
        String sql = "SELECT DISTINCT d.id,d.name from base_service_package_sign_record sr,base_service_package_record r,base_team_member m,base_doctor d " +
                "WHERE sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id and m.doctor_code = d.id " +
                "and m.del = '1' and d.doctor_level = " + level+
                " and sr.id in ('"+signIdStr+"') ";
        return jdbcTemplate.queryForList(sql);
    }
    /**
     * 根据居民和服务项查找医生
     * @param patientId
@@ -326,6 +335,15 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        return jdbcTemplate.queryForList(sql);
    }
    public List<Map<String,Object>> fingdBySignId2(List<String> signId){
        String signIdStr =  signId.stream().map(String::valueOf).collect(Collectors.joining("','"));
        String sql = "SELECT DISTINCT p.id,p.`name`,p.org_code,p.org_name from base_service_package_sign_record sr,base_service_package_record r, " +
                "base_service_package p " +
                "WHERE sr.id = r.sign_id and  p.id = r.service_package_id and p.del = 1 " +
                "  and sr.id in ('"+signIdStr+"') GROUP BY r.service_package_id ORDER BY r.create_time desc ";
        return jdbcTemplate.queryForList(sql);
    }
    /**
     * 签约记录
     * @param name