代码修改

svr/svr-cloud-care/pom.xml

@@ -65,16 +65,6 @@
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>com.ylz.loginsdk</groupId>-->
            <!--<artifactId>ehcsdk</artifactId>-->
            <!--<version>1.0</version>-->
        <!--</dependency>-->
<!--        <dependency>
            <groupId>com.ylz.dmrh</groupId>
            <artifactId>ehcsdk-java-sdk-base</artifactId>
            <version>1.0.3</version>
        </dependency>-->
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/assistance/EmergencyAssistanceEndpoint.java

@@ -102,7 +102,9 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
                                    @ApiParam(name="patient",value = "患者")
                                    @RequestParam(value = "patient",required = false) String patient,
                                    @ApiParam(name="doctor",value = "医生")
                                    @RequestParam(value = "doctor",required = false) String doctor
                                    @RequestParam(value = "doctor",required = false) String doctor,
                                    @ApiParam(name="teamId",value = "团队id，查询全部传 1")
                                    @RequestParam(value = "teamId",required = false) String teamId
    ){
        try {
            if (StringUtils.isBlank(patient)&&StringUtils.isBlank(doctor)){
@@ -118,7 +120,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
                    return ObjEnvelop.getError("该操作没有权限");
                }
            }
            JSONObject result = assistanceService.getTabStatusCounts(patient,doctor);
            JSONObject result = assistanceService.getTabStatusCounts(patient,doctor,teamId);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return ObjEnvelop.getError(result.getString(ResponseContant.resultMsg));
            }
@@ -151,6 +153,8 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
                                    @RequestParam(value = "patientName",required = false) String patientName,
                                    @ApiParam(name="doctor",value = "查看医生")
                                    @RequestParam(value = "doctor",required = false) String doctor,
                                    @ApiParam(name="teamId",value = "团队id，查询全部传 1")
                                        @RequestParam(value = "teamId",required = false) String teamId,
                                    @ApiParam(name="status",value = "状态")
                                    @RequestParam(value = "status",required = true) String status,
                                    @ApiParam(name="page",value = "page")
@@ -170,7 +174,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
                    return ListEnvelop.getError("该操作没有权限");
                }
            }
            return ListEnvelop.getSuccess( "查询成功",assistanceService.getOrderList(patientId,patientName,doctor,status,page,pageSize,"desc"));
            return ListEnvelop.getSuccess( "查询成功",assistanceService.getOrderList(patientId,patientName,doctor,teamId,status,page,pageSize,"desc"));
        }catch (Exception e){
            return failedListEnvelopException2(e);
        }

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

@@ -151,6 +151,8 @@ public class DoctorDeviceController extends BaseController {
	@ApiOperation(value = "获取居民设备绑定列表")
	public String getDeviceList(@ApiParam(name = "doctor", value = "医生code")
								@RequestParam(value = "doctor", required = false) String doctor,
								@ApiParam(name="teamId",value = "团队id，查询全部传 1")
								@RequestParam(value = "teamId",required = false) String teamId,
								@ApiParam(name = "patientName", value = "居民名字或者idCard")
								@RequestParam(value = "patientName", required = false) String patientName,
								@ApiParam(name = "categoryCode", value = "设备类型标识 1血糖仪，2.血压计,3药盒,4智能手表，7 = 居家报警器,12 监控器 13 睡眠带 14气感报警器 15烟感报警器 16拐杖 17随身wifi")
@@ -167,7 +169,7 @@ public class DoctorDeviceController extends BaseController {
			if(permissionService.noPermission(2,param)){
				return write(-1,"该操作没有权限");
			}
			return write(200,"成功","data",deviceManageService.getDeviceList(doctor, patientName, categoryCode, page, pagesize));
			return write(200,"成功","data",deviceManageService.getDeviceList(doctor,teamId, patientName, categoryCode, page, pagesize));
		} catch (Exception e) {
			error(e);
			return  errorResult(e);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/security/SecurityMonitoringOrderEndpoint.java

@@ -56,6 +56,8 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "获取安防工单列表")
    public PageEnvelop getSecurityOrderList(@ApiParam(name="doctor",value = "医生ID,当前查看列表医生",required = false)
                                            @RequestParam(value = "doctor",required = false)String doctor,
                                            @ApiParam(name="teamId",value = "团队id，查询全部传 1")
                                            @RequestParam(value = "teamId",required = false) String teamId,
                                            @ApiParam(name="serverDoctor",value = "处置医生di 即为患者提供服务的医生")
                                            @RequestParam(value = "serverDoctor",required = false)String serverDoctor,
                                            @ApiParam(name="patientName",value = "患者姓名或身份证")
@@ -77,7 +79,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
        try {
            page = page>1?page-1:0;
            return securityMonitoringOrderService.getSecurityOrderList(doctor,serverDoctor,patientName, patient, status, svrDesc,topicItem,page, pageSize,dailyMonitor);
            return securityMonitoringOrderService.getSecurityOrderList(doctor,teamId,serverDoctor,patientName, patient, status, svrDesc,topicItem,page, pageSize,dailyMonitor);
        }catch (Exception e){
            return failedPageEnvelopException2(e);
        }
@@ -89,6 +91,8 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
                                     @RequestParam(value = "patient",required = false) String patient,
                                     @ApiParam(name="doctor",value = "医生")
                                     @RequestParam(value = "doctor",required = false) String doctor,
                                     @ApiParam(name="teamId",value = "团队id，查询全部传 1")
                                     @RequestParam(value = "teamId",required = false) String teamId,
                                     @ApiParam(name="status",value = "工单状态-2误报警-1已取消0已完成1申请中")
                                     @RequestParam(value = "status",required = false)String status,
                                     @ApiParam(name="svrDesc",value = "服务类型 关联security_server_dict字典")
@@ -104,7 +108,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
            if (org.apache.commons.lang3.StringUtils.isNotBlank(patient)&& org.apache.commons.lang3.StringUtils.isNotBlank(doctor)){
                return ObjEnvelop.getError("请求参数错误");
            }
            return ObjEnvelop.getSuccess("查询成功",securityMonitoringOrderService.getSecurityTab(patient,doctor,status,svrDesc,topicItem,dailyMonitor));
            return ObjEnvelop.getSuccess("查询成功",securityMonitoringOrderService.getSecurityTab(patient,doctor,teamId,status,svrDesc,topicItem,dailyMonitor));
        }catch (Exception e){
            return failedObjEnvelopException2(e);
        }
@@ -372,9 +376,11 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "findMonitorPatientsByDoctor")
    @ResponseBody
    public ObjEnvelop findMonitorPatientsByDoctor(@ApiParam(name = "doctor",  required = true)@RequestParam(value = "doctor")String doctor,
                                                  @ApiParam(name="teamId",value = "团队id，查询全部传 1")
                                                  @RequestParam(value = "teamId",required = false) String teamId,
                                                  @ApiParam(name = "topicItem", value = "专题code,关联security_topic_dict字典,actionTrack行动轨迹", required = true)
                                                  @RequestParam(value = "topicItem",required = true,defaultValue = "preventLost") String topicItem,
                                                      @ApiParam(name = "day", value = "day", required = false)
                                                  @ApiParam(name = "day", value = "day", required = false)
                                                  @RequestParam(value = "day",required = false) String day,
                                                  @ApiParam(name = "page")
                                                  @RequestParam(value = "page",required = false) Integer page,
@@ -383,7 +389,7 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
                                                  @ApiParam(name = "detail", value = "是否返回专题详情0否 1是")
                                                  @RequestParam(value = "detail",required = false,defaultValue = "0") Integer detail) {
        try {
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.findMonitorPatientsByDoctor(doctor,topicItem,day,page,pageSize,detail));
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.findMonitorPatientsByDoctor(doctor,teamId,topicItem,day,page,pageSize,detail));
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -698,7 +698,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
     * @param patient
     * @return
     */
    public JSONObject getTabStatusCounts(String patient,String doctor){
    public JSONObject getTabStatusCounts(String patient,String doctor,String teamId){
        JSONObject result = new JSONObject();
        JSONObject tmpObj = new JSONObject();
        tmpObj.put("status_-2",0);//误报警
@@ -713,11 +713,28 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            BaseDoctorDO doctorDO = doctorDao.findById(doctor);
            if (null!=doctorDO){
                if (2==doctorDO.getLevel()){//社工
                    sql.append(" AND EXISTS (" +
                            "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i ," +
                            "base_team_member m " +
                            "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id and  m.team_code = r.team_code " +
                            " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and m.doctor_code = '"+doctor+"' and m.del = '1') group by ord.status");
                    if(StringUtils.isBlank(teamId)){
                        sql.append(" AND EXISTS (" +
                                "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i ," +
                                "base_team_member m " +
                                "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id and  m.team_code = r.team_code " +
                                " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and m.doctor_code = '"+doctor+"' and m.del = '1') group by ord.status");
                    }else {
                        if("1".equals(teamId)){
                            //查询全部团队
                            sql.append(" AND EXISTS (" +
                                    "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i ," +
                                    "base_team_member m " +
                                    "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id and  m.team_code = r.team_code " +
                                    " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and m.doctor_code = '"+doctor+"' and m.del = '1') group by ord.status");
                        }else {
                            //查询指定团队
                            sql.append(" AND EXISTS (" +
                                    "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i " +
                                    "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id " +
                                    " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and r.team_code = '"+teamId+"' ) group by ord.status");
                        }
                    }
                }
                if (4==doctorDO.getLevel()){//助老员
                    sql.append(" and EXISTS (" +
@@ -767,17 +784,34 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
     * @param doctor
     * @return
     */
    public List<EmergencyAssistanceDO> getOrderList(String patient,String patientName,String doctor,String status,Integer page,Integer pageSize,String sort){
    public List<EmergencyAssistanceDO> getOrderList(String patient,String patientName,String doctor,String teamId,String status,Integer page,Integer pageSize,String sort){
        StringBuilder sql = new StringBuilder(" select ord.* from base_emergency_assistance_order ord inner join base_patient pa on pa.id = ord.patient and pa.del=1  where 1=1 ");
        if (StringUtils.isNotBlank(doctor)){
            BaseDoctorDO doctorDO = doctorDao.findById(doctor);
            if (null!=doctorDO){
                if (2==doctorDO.getLevel()){//社工
                    sql.append(" AND EXISTS (" +
                            "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i ," +
                            "base_team_member m " +
                            "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id and  m.team_code = r.team_code " +
                            " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and m.doctor_code = '"+doctor+"' and m.del = '1') ");
                    if(StringUtils.isBlank(teamId)){
                        sql.append(" AND EXISTS (" +
                                "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i ," +
                                "base_team_member m " +
                                "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id and  m.team_code = r.team_code " +
                                " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and m.doctor_code = '"+doctor+"' and m.del = '1') group by ord.status");
                    }else {
                        if("1".equals(teamId)){
                            //查询全部团队
                            sql.append(" AND EXISTS (" +
                                    "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i ," +
                                    "base_team_member m " +
                                    "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id and  m.team_code = r.team_code " +
                                    " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and m.doctor_code = '"+doctor+"' and m.del = '1') group by ord.status");
                        }else {
                            //查询指定团队
                            sql.append(" AND EXISTS (" +
                                    "SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i " +
                                    "where ord.patient = CONVERT(sr.patient USING utf8) and  sr.id = r.sign_id and sr.status=1 and r.service_package_id = i.service_package_id " +
                                    " and i.del = 1 and sr.`status`=1  and i.code='emergencyAssistance' and r.team_code = '"+teamId+"' ) group by ord.status");
                        }
                    }
                }
                if (4==doctorDO.getLevel()){//助老员
                    sql.append(" and EXISTS (" +

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceManageService.java

@@ -38,7 +38,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
    /*获取设备清单 数据范围为我关联的居民绑定的设备清单*/
    public List<Map<String, Object>> getDeviceList(String doctor, String patientName, String categoryCode, int page, int pageSize) {
    public List<Map<String, Object>> getDeviceList(String doctor,String teamId, String patientName, String categoryCode, int page, int pageSize) {
        String sql = "select Distinct p.id,p.`name`,dd.photo,pd.device_id deviceId,pd.category_code categoryCode,pd.device_name deviceName, " +
                " pd.device_sn deviceSn,pd.czrq,pd.doctor,pd.doctor_name doctorName,pd.agent,pd.agent_name agentName " +
                " from wlyy_patient_device pd,wlyy_devices wd,base_patient p,dm_device dd where p.id = pd.`user`  and pd.del = 0 " +
@@ -55,9 +55,23 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
            if (doctorByid.getLevel() == 4) {
                sql += " and EXISTS (SELECT ph.patient from base_patient_helper ph WHERE pd.user = ph.patient AND ph.doctor = '"+doctor+"' and ph.del = '1')";
            } else {
                sql += " and EXISTS (SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r,base_team_member m " +
                        " WHERE sr.patient = p.id and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id " +
                        " and m.doctor_code = '" + doctor + "' and m.del = '1') ";
                if(StringUtils.isBlank(teamId)){
                    sql += " and EXISTS (SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r,base_team_member m " +
                            " WHERE sr.patient = p.id and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id " +
                            " and m.doctor_code = '" + doctor + "' and m.del = '1') ";
                }else {
                    if("1".equals(teamId)){
                        //查询全部团队
                        sql += " and EXISTS (SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r,base_team_member m " +
                                " WHERE sr.patient = p.id and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id " +
                                " and m.doctor_code = '" + doctor + "' and m.del = '1') ";
                    }else {
                        //查询指定团队
                        sql += " and EXISTS (SELECT sr.patient from base_service_package_sign_record sr,base_service_package_record r " +
                                " WHERE sr.patient = p.id and sr.status=1 and sr.id=r.sign_id " +
                                " and r.team_code = '" + teamId + "' ) ";
                    }
                }
            }
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -701,7 +701,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        return result;
    }
    public PageEnvelop getSecurityOrderList(String doctor, String serverDoctor, String patientName, String patient, String status,
    public PageEnvelop getSecurityOrderList(String doctor,String teamId, String serverDoctor, String patientName, String patient, String status,
                                            String svrDesc, String topicItem, Integer page, Integer pageSize, Integer dailyMonitor) {
        JSONArray result = new JSONArray();
        //服务权限
@@ -751,10 +751,26 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
                if (null!=doctorDO){
                    if (2==doctorDO.getLevel()) {//社工
                        fliter += " and EXISTS( SELECT 1 " +
                                " from  base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                                " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                                " and m.doctor_code = '" + doctor + "' and m.del = '1' ) ";
                        if(StringUtils.isBlank(teamId)){
                            fliter += " and EXISTS( SELECT 1 " +
                                    " from  base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                                    " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                                    " and m.doctor_code = '" + doctor + "' and m.del = '1' ) ";
                        }else {
                            if("1".equals(teamId)){
                                //查询全部团队
                                fliter += " and EXISTS( SELECT 1 " +
                                        " from  base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                                        " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                                        " and m.doctor_code = '" + doctor + "' and m.del = '1' ) ";
                            }else {
                                //查询指定团队
                                fliter += " and EXISTS( SELECT 1 " +
                                        " from  base_service_package_sign_record sr,base_service_package_record r  " +
                                        " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and sr.id=r.sign_id  " +
                                        " and r.team_code = '" + teamId + "'  ) ";
                            }
                        }
                    }
                    if (4==doctorDO.getLevel()){//助老员
                        fliter+= " and EXISTS (" +
@@ -873,7 +889,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        return PageEnvelop.getSuccessListWithPage("success", result, page, pageSize, count);
    }
    public JSONObject getSecurityTab(String patient, String doctor, String status, String svrDesc, String topicItem, Integer dailyMonitor) {
    public JSONObject getSecurityTab(String patient, String doctor,String teamId, String status, String svrDesc, String topicItem, Integer dailyMonitor) {
        JSONObject result = new JSONObject();
        result.put("status_-2", 0);//误报警
@@ -929,10 +945,26 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
                if (null!=doctorDO) {
                    if (2==doctorDO.getLevel()){//社工
                        fliter += " and EXISTS( SELECT 1" +
                                " from base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                                " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                                " and m.doctor_code = '" + doctor + "' and m.del = '1' ) ";
                        if(StringUtils.isBlank(teamId)){
                            fliter += " and EXISTS( SELECT 1" +
                                    " from base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                                    " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                                    " and m.doctor_code = '" + doctor + "' and m.del = '1' ) ";
                        }else {
                            if("1".equals(teamId)){
                                //查询全部团队
                                fliter += " and EXISTS( SELECT 1" +
                                        " from base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                                        " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                                        " and m.doctor_code = '" + doctor + "' and m.del = '1' ) ";
                            }else {
                                //查询指定团队
                                fliter += " and EXISTS( SELECT 1" +
                                        " from base_service_package_sign_record sr,base_service_package_record r " +
                                        " WHERE ord.patient = CONVERT(sr.patient USING utf8) and sr.status=1 and sr.id=r.sign_id  " +
                                        " and r.team_code = '" + teamId + "' ) ";
                            }
                        }
                    }
                    if (4==doctorDO.getLevel()){//助老员
                        fliter+= " and EXISTS (" +
@@ -2850,15 +2882,26 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        }
    }
    public JSONObject findMonitorPatientsByDoctor(String doctor, String topicItem, String day, Integer page, Integer pageSize, Integer detail) {
    public JSONObject findMonitorPatientsByDoctor(String doctor,String teamId, String topicItem, String day, Integer page, Integer pageSize, Integer detail) {
        JSONObject result = new JSONObject();
        String sql = " SELECT DISTINCT p.id,p.name,p.residential_area residentialArea,p.photo,p.idcard,p.mobile, " +
                " p.openid,p.sex,p.pad_imei padImei " +
                " from base_patient p , base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                " p.openid,p.sex,p.pad_imei padImei ";
        String fliter = " from base_patient p , base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                " WHERE p.id = sr.patient and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                " and m.doctor_code = '" + doctor + "' and m.del = '1' ";
        String fliter = "";
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
        if (doctorDO!=null&&2==doctorDO.getLevel()){//社工
            if("1".equals(teamId)){
                fliter = " from base_patient p , base_service_package_sign_record sr,base_service_package_record r,base_team_member m  " +
                        " WHERE p.id = sr.patient and sr.status=1 and m.team_code = r.team_code and sr.id=r.sign_id  " +
                        " and m.doctor_code = '" + doctor + "' and m.del = '1' ";
            }else if(StringUtils.isNotBlank(teamId)){
                fliter = " from base_patient p , base_service_package_sign_record sr,base_service_package_record r " +
                        " WHERE p.id = sr.patient and sr.status=1 and sr.id=r.sign_id  " +
                        " and r.team_code = '" + teamId + "'  ";
            }
        }
        String categoryCode = "";
        String topicItemTmp = topicItem;
        switch (topicItem) {
@@ -2892,7 +2935,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                break;
        }
        fliter = " and EXISTS (select 1 from wlyy_patient_device pd INNER JOIN dm_device dd on pd.device_id = dd.id  " +
        fliter += " and EXISTS (select 1 from wlyy_patient_device pd INNER JOIN dm_device dd on pd.device_id = dd.id  " +
                " where  pd.user = sr.patient and pd.del=0 and pd.category_code in (" + categoryCode + ") and FIND_IN_SET('" + topicItemTmp + "',dd.service_topic)) ";
        if ("preventLost".equals(topicItem)) {//有绑定围栏的居民