Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -525,9 +525,14 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        int start = 0 == page ? page++ : (page - 1) * size;
        int end = 0 == size ? 15 : size;
        String fedSql = " ";
        String oOrgCodeSql ="";
        if (StringUtils.isNotBlank(fedCode)){
            String fedOrgCode ="";
            if (StringUtils.isNotBlank(orgCode))fedOrgCode="  AND cid.org_code = '"+orgCode+"'";
            if (StringUtils.isNotBlank(orgCode)){
                fedOrgCode="  AND cid.org_code = '"+orgCode+"'";
                oOrgCodeSql = " AND o.hospital = '"+orgCode+"' ";
            }
            fedSql = " and EXISTS ( " +
                    " select 1 from base_life_care_fee_detail fed LEFT JOIN base_life_care_item_dict cid ON fed.code = cid.code where fed.order_id = o.id and fed.code='"+fedCode+"' " + fedOrgCode +
                    "  )  ";
@@ -535,7 +540,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        String sql = "SELECT *  FROM  base_life_care_order o " +
                " WHERE (o.patient = '{patient}' or o.proxy_patient = '{patient}') "+
                " AND (o.`status` = {status} or -100 = {status})" +fedSql+
                " AND (o.`status` = {status} or -100 = {status})"+ oOrgCodeSql + fedSql+
                "  group by o.id " +
                " ORDER BY o.create_time desc" +
                " LIMIT {start},{end} ";
@@ -548,7 +553,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        String countSql = "SELECT count(DISTINCT o.id) FROM base_life_care_order o " +
                " WHERE  " +
                "  (o.patient = '{patient}' or o.proxy_patient = '{patient}') " +
                " AND (o.`status` = {status} or -100 = {status})"+fedSql;
                " AND (o.`status` = {status} or -100 = {status})"+oOrgCodeSql+fedSql;
        String finqlCountSql = countSql.replace("{patient}", patient)
                .replace("{status}", String.valueOf(status));