111

svr/svr-base/src/main/java/com/yihu/jw/base/service/lifeCare/LifeCareService.java

@@ -29,7 +29,7 @@ public class LifeCareService {
     * 获取服务项目列表
     */
    public PageEnvelop<List<Map<String,Object>>> getServeDictList(String orgName, String itemName, Integer page, Integer size){
        String sql = "SELECT dict.id,dict.`name`,dict.sort,dict.`code`,dict.life_care_img,dict.pad_icon_img,GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode" +
        String sql = "SELECT dict.id,dict.`name`,dict.sort,dict.`code`,dict.life_care_img as lifeCareImg,dict.pad_icon_img as padIconImg,GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode" +
                ",GROUP_CONCAT( DISTINCT dict.org_name SEPARATOR ',' ) AS orgName FROM " +
                "base_life_care_item_dict dict INNER JOIN base_org org ON dict.org_code = org.CODE WHERE dict.del = 1  AND org.del = 1" ;

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.serve_standard,org.address,org.photo as orgPhoto,GROUP_CONCAT( DISTINCT dict.org_name SEPARATOR ',' ) AS orgName,\n" +
        String sql = "select dict.id,dict.`code`,dict.`name`,GROUP_CONCAT( DISTINCT dict.serve_standard SEPARATOR ',' ) AS serve_standard,GROUP_CONCAT( DISTINCT org.address SEPARATOR ',' ) AS address,GROUP_CONCAT( DISTINCT org.photo SEPARATOR ',' )  AS orgPhoto,GROUP_CONCAT( DISTINCT dict.org_name SEPARATOR ',' ) AS orgName,\n" +
                " GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode,GROUP_CONCAT( DISTINCT dict.charge_standard SEPARATOR ',' ) AS charge_standard ,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\n" +
                " " ;
        if (StringUtils.isNotBlank(orgCode)){