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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/security/BaseEmergencyWarnLogDao.java

@@ -13,7 +13,7 @@ import java.util.List;
public interface BaseEmergencyWarnLogDao extends PagingAndSortingRepository<BaseEmergencyWarnLogDO, Long>,
        JpaSpecificationExecutor<BaseEmergencyWarnLogDO> {
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type is null ")
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type is not null ")
    List<BaseEmergencyWarnLogDO> findByOrderIdOrderByCreateTimeDesc(String oderId);
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type = 1")

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

@@ -478,21 +478,23 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
            sql += " and dict.org_code='"+orgCode+"' ";
        }
        sql+=  " and dict.del=1  GROUP BY dict.`code` order by dict.sort asc ";
        List<LifeCareItemDictDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
        List<LifeCareItemDictDO> lifeCareItemDictList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
        list.stream().forEach(liftCareItemObj ->{
            if (StringUtils.isNotBlank(liftCareItemObj.getOrgCode())) {
                String replace = liftCareItemObj.getOrgCode().replace(",", "','");
        for (LifeCareItemDictDO lifeCareItemDictDO : lifeCareItemDictList) {
            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 " +
                        " LEFT JOIN base_org org  on dict.org_code = org.`code` WHERE dict.`code` = '"+liftCareItemObj.getCode()+"' and dict.del = 1 AND org.`code` in ('"+replace+"')";
                        " 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);
                liftCareItemObj.setOrgInfo(orgList);
                lifeCareItemDictDO.setOrgInfo(orgList);
            }
        });
        }
        return list;
        return lifeCareItemDictList;
    }
    /**