Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -14,7 +14,7 @@ public interface BaseEmergencyWarnLogDao extends PagingAndSortingRepository<Base
        JpaSpecificationExecutor<BaseEmergencyWarnLogDO> {
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type is null ")
    List<BaseEmergencyWarnLogDO> findByOrderIdOrderByCreateTimeDesc(String oderId);
    List<BaseEmergencyWarnLogDO> findByOrderIdOrderByCreateTimeDesc(String oderId);//工单操作日志，有type的为工单流程关键步骤
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type = 1")
    List<BaseEmergencyWarnLogDO> findByOrderIdByType(String orderId);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/DoctorDeviceController.java

@@ -442,4 +442,29 @@ public class DoctorDeviceController extends BaseController {
			return errorResult(e);
		}
	}
	@ApiOperation("获取设备详情数据 --设备可多人绑定查询数据时与patient无关-医生端")
	@RequestMapping(value = "getPatientDeviceDataNew",method = RequestMethod.GET)
	public String getPatientDeviceDataNew(@ApiParam(name="patient")
										  @RequestParam(value = "patient")String patient,
										  @ApiParam(name="deviceSn")
										  @RequestParam(value = "deviceSn")String deviceSn,
										  @ApiParam(name="page")
										  @RequestParam(value = "page")Integer page,
										  @ApiParam(name="pageSize")
										  @RequestParam(value = "pageSize")Integer pageSize,
										  @ApiParam(name = "type", value = "0全部 1日常监护 2预警记录(工单列表)") @RequestParam(value = "type", required = false) String type){
		try {
			//医生端登录鉴权
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("doctorId",permissionService.getUID());
			if (permissionService.noPermission(1, jsonObject)) {
				return error(-1,"该操作没有权限");
			}
			return write(200,"获取成功","data",patientDeviceService.getPatientDeviceData(patient,type,deviceSn,page,pageSize));
		}catch (Exception e){
			return errorResult(e);
		}
	}
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PatientDeviceController.java

@@ -625,4 +625,29 @@ public class PatientDeviceController extends BaseController {
            return errorResult(e);
        }
    }
    @ApiOperation("获取设备详情数据 --设备可多人绑定查询数据时与patient无关-居民端")
    @RequestMapping(value = "getPatientDeviceDataNew",method = RequestMethod.GET)
    public String getPatientDeviceDataNew(@ApiParam(name="patient")
                                       @RequestParam(value = "patient")String patient,
                                       @ApiParam(name="deviceSn")
                                       @RequestParam(value = "deviceSn")String deviceSn,
                                       @ApiParam(name="page")
                                       @RequestParam(value = "page")Integer page,
                                       @ApiParam(name="pageSize")
                                       @RequestParam(value = "pageSize")Integer pageSize,
                                       @ApiParam(name = "type", value = "0全部 1日常监护 2预警记录(工单列表)") @RequestParam(value = "type", required = false) String type){
        try {
            //居民端登录鉴权
            com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
            jsonObject.put("patient",permissionService.getUID());
            if (permissionService.noPermission(1, jsonObject)) {
                return write(-1,"该操作没有权限");
            }
            return write(200,"获取成功","data",patientDeviceService.getPatientDeviceData(patient,type,deviceSn,page,pageSize));
        }catch (Exception e){
            return errorResult(e);
        }
    }
}

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

@@ -471,28 +471,30 @@ 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)){
            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+"')";
                        " 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);
                liftCareItemObj.setOrgInfo(orgList);
                lifeCareItemDictDO.setOrgInfo(orgList);
            }
        });
        }
        return list;
        return lifeCareItemDictList;
    }
    /**
@@ -1136,7 +1138,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
                " ) A ON dict. CODE = A. CODE " +
                " WHERE " +
                " dict.del = 1 " +
                " AND dict.org_code = '"+orgCode+"'";
                " AND dict.org_code = '"+orgCode+"' order by dict.sort";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }