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

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

@@ -471,7 +471,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @return
     */
    public List<LifeCareItemDictDO> findItemDict(String orgCode){
        String sql = "select dict.id,dict.`code`,dict.`name`,dict.remark," +
        String sql = "select dict.id,dict.`code`,dict.`name`," +
                " GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode,dict.life_care_img,dict.pad_icon_img  " +
                " from base_life_care_item_dict dict LEFT JOIN base_org org  on dict.org_code = org.`code` where 1=1 " ;
        if (StringUtils.isNotBlank(orgCode)){
@@ -485,7 +485,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
            if (StringUtils.isNotBlank(lifeCareItemDictDO.getOrgCode())) {
                String replace = lifeCareItemDictDO.getOrgCode().replace(",", "','");
                String orgSqlList = " SELECT dict.org_code AS orgCode,dict.org_name AS orgName,dict.charge_standard AS chargeStandard," +
                        " dict.serve_standard AS serveStandard,org.address,org.photo FROM base_life_care_item_dict dict " +
                        " dict.serve_standard AS serveStandard,org.address,org.photo,dict.remark,dict.price FROM base_life_care_item_dict dict " +
                        " LEFT JOIN base_org org  on dict.org_code = org.`code` WHERE dict.`code` = '"+lifeCareItemDictDO.getCode()+"' and dict.del = 1 AND org.`code` in ('"+replace+"')";
                List<Map<String, Object>> orgList = jdbcTemplate.queryForList(orgSqlList);
                lifeCareItemDictDO.setOrgInfo(orgList);