服务包签约

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/wechat/WechatInfoEndPoint.java

@@ -173,4 +173,6 @@ public class WechatInfoEndPoint extends EnvelopRestEndpoint {
        }
        return null;
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/servicepackage/PackageService.java

@@ -70,7 +70,7 @@ public class PackageService {
    @Autowired
    private PatientLabelDao patientLabelDao;
    public MixEnvelop findPackageService(String city,String labelCode,String labelType,String patient,Integer page,Integer size){
    public MixEnvelop findPackageService(String city,String saasId ,String labelCode,String labelType,String patient,Integer page,Integer size){
        String totalSql ="SELECT " +
                " count(1) as total " +
@@ -83,9 +83,12 @@ public class PackageService {
                " p.city_code = '"+city+"' " +
                " AND p.del =1 ";
        if(StringUtils.isNotBlank(labelCode)&&StringUtils.isNotBlank(labelType)){
            totalSql += " ADN l.label_code='"+labelCode+"'" +
            totalSql += " AND l.label_code='"+labelCode+"'" +
                        " AND l.label_type='"+labelType+"' ";
        }
        if(StringUtils.isNotBlank(saasId)){
            totalSql += " AND p.saas_id = '"+saasId+"' ";
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        Long count = 0L;
@@ -118,9 +121,12 @@ public class PackageService {
                " p.city_code = '"+city+"' " +
                " AND p.del =1 ";
        if(StringUtils.isNotBlank(labelCode)&&StringUtils.isNotBlank(labelType)){
            sql +=  " ADN l.label_code='"+labelCode+"'" +
            sql +=  " AND l.label_code='"+labelCode+"'" +
                    " AND l.label_type='"+labelType+"' ";
        }
        if(StringUtils.isNotBlank(saasId)){
            sql += " AND p.saas_id = '"+saasId+"' ";
        }
        sql +=  "ORDER BY p.sort ASC LIMIT " + (page - 1) * size + "," + size + "";
        List<ServicePackageVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(ServicePackageVO.class));