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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/lifeCare/PadLifeCareEndpoint.java

@@ -103,7 +103,7 @@ public class PadLifeCareEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "findItemDict")
    @ApiOperation(value = "查找服务项字典")
    public ListEnvelop findItemDict(@ApiParam(value = "orgCode", name = "orgCode")
                                    @RequestParam(value = "orgCode", required = true) String orgCode) {
                                    @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict(orgCode));
        }catch (Exception e){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/lifeCare/PatientLifeCareEndpoint.java

@@ -138,7 +138,7 @@ public class PatientLifeCareEndpoint  extends EnvelopRestEndpoint {
    @GetMapping(value = "findItemDict")
    @ApiOperation(value = "查找服务项字典")
    public ListEnvelop findItemDict(@ApiParam(value = "orgCode", name = "orgCode")
                                   @RequestParam(value = "orgCode", required = true) String orgCode) {
                                   @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            return ListEnvelop.getSuccess("查询成功",lifeCareOrderService.findItemDict(orgCode));
        }catch (Exception e){

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

@@ -349,7 +349,13 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @return
     */
    public List<LifeCareItemDictDO> findItemDict(String orgCode){
        return lifeCareItemDictDao.findByOrgCode(orgCode);
        String sql = " select * from base_life_care_item_dict where 1=1 " ;
        if (StringUtils.isNotBlank(orgCode)){
            sql += " and org_code='"+orgCode+"' ";
        }
        sql+=  " and del=1 order by sort asc  ";
        List<LifeCareItemDictDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
        return list;
    }
    /**