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

business/im-service/src/main/java/com/yihu/jw/im/util/ImUtil.java

@@ -794,6 +794,22 @@ public class ImUtil {
		return obj.getInteger("count");
//		}else{
//			return 0;
//		}
	}
	/**
	 *获取某个会话某个对象的未读消息数。
	 * @param
	 * @return
	 */
	public Integer UserSessionsUnreadMessageCount(String session,String userid){
		String url = im_host + "api/v2/sessions/"+session+"/unread_message_count?user_id="+userid;
		String ret = HttpClientUtil.get(url,"utf-8");
		JSONObject obj = JSON.parseObject(ret);
//		if(obj.getInteger("count") ==200){
		return obj.getInteger("count");
//		}else{
//			return 0;
//		}
	}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/emergency/EmergencyOrderVO.java

@@ -12,6 +12,7 @@ import java.util.Map;
 */
public class EmergencyOrderVO {
    //预警信息
    private String id;
    private String orderId;
    private Integer status;//工单状态
    private String statusName;//工单状态
@@ -38,6 +39,7 @@ public class EmergencyOrderVO {
    //附加信息
    private Map<String,Object> information;//附加信息
    private String phone;
    //围栏状态 fences
    //小结
@@ -47,6 +49,14 @@ public class EmergencyOrderVO {
    private String otherDoctorDistance;//其他医生定位信息
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getOrderId() {
        return orderId;
    }
@@ -222,4 +232,12 @@ public class EmergencyOrderVO {
    public void setOtherDoctorDistance(String otherDoctorDistance) {
        this.otherDoctorDistance = otherDoctorDistance;
    }
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/assistance/EmergencyAssistanceDao.java

@@ -15,7 +15,7 @@ public interface EmergencyAssistanceDao extends PagingAndSortingRepository<Emerg
    List<EmergencyAssistanceDO> queryByPatientAndStatusIn(String patient, Integer[] status, Sort sort);
    EmergencyAssistanceDO findByPatientAndStatus(String patient,Integer status);
    List<EmergencyAssistanceDO> findByPatientAndStatus(String patient,Integer status);
    EmergencyAssistanceDO findByProxyPatientAndStatus(String proxyPatient,Integer status);
}

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

@@ -49,7 +49,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = "doctorGetOrderDetail")
    @ApiOperation(value = "医生查看救助详情")//不可查看已取消
    @ApiOperation(value = "医生查看救助详情")
    public ObjEnvelop doctorGetOrderDetail(@ApiParam(name="orderId",value = "工单id")
                                     @RequestParam(value = "orderId") String orderId,
                                     @ApiParam(name="doctor",value = "doctor")
@@ -260,7 +260,7 @@ public class EmergencyAssistanceEndpoint extends EnvelopRestEndpoint {
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return ObjEnvelop.getError(result.getString(ResponseContant.resultMsg));
            }
            return ObjEnvelop.getSuccess("定位更新成功",result.getJSONObject("resultMsg"));
            return ObjEnvelop.getSuccess("定位更新成功",result.getString("resultMsg"));
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("定位更新失败"+e.getMessage());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doorCoach/DoctorDoorCoachOrderController.java

@@ -4,13 +4,18 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.consult.ConsultTeamService;
import com.yihu.jw.care.service.doorCoach.DoctorDoorCoachOrderService;
import com.yihu.jw.care.service.doorCoach.PatientDoorCoachOrderService;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachConclusionDO;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,6 +45,10 @@ public class DoctorDoorCoachOrderController extends BaseController {
    private PatientDoorCoachOrderService patientDoorCoachOrderService;
    @Autowired
    private DoctorDoorCoachOrderService doctorDoorCoachOrderService;
    @Autowired
    private ImService imService;
    @Autowired
    private ConsultTeamService consultTeamService;
    @PostMapping(value = "proxyCreate")
    @ApiOperation(value = "创建上门预约咨询--医生代预约")
@@ -508,6 +517,8 @@ public class DoctorDoorCoachOrderController extends BaseController {
        }
    }
    /**
     * 获取服务项目
     *
@@ -589,4 +600,27 @@ public class DoctorDoorCoachOrderController extends BaseController {
            return error(-1, "操作失败！");
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.DodtorIM.getConsultInfoAndPatientInfo)
    @ApiOperation(value = "获取咨询问题，图片，居民信息", notes = "获取咨询问题，图片，居民信息")
    public ObjEnvelop getConsultInfoAndPatientInfo(
            @ApiParam(name = "consult", value = "咨询CODE")
            @RequestParam(value = "consult",required = false) String consult,
            @ApiParam(name = "patientCode", value = "居民COEE")
            @RequestParam(value = "patientCode",required = false) String patientCode)throws Exception {
        return ObjEnvelop.getSuccess("请求成功", imService.getConsultInfoAndPatientInfo(consult, patientCode));
    }
    @RequestMapping(value = "queryByConsultCode",method = RequestMethod.GET)
    @ApiOperation("根据咨询code查询关联业务项详情")
    public ObjEnvelop queryByConsultCode(@ApiParam(name = "code", value = "咨询code") @RequestParam(value = "code", required = true) String code,
                                     @ApiParam(name = "type", value = "咨询类型") @RequestParam(value = "type", required = true) Integer type){
        try{
            JSONObject detail = consultTeamService.queryByConsultCode(code,type);
            return ObjEnvelop.getSuccess("查询成功", detail.get("data"));
        }catch (Exception e){
            error(e);
            return ObjEnvelop.getError("查询失败");
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doorCoach/PatientDoorCoachOrderController.java

@@ -194,7 +194,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
                // 根据接单医生code获取最近一次服务orderId
                orderId = patientDoorCoachOrderService.getOrderIdByPatient(patientCode);
                if (StringUtils.isEmpty(orderId)) {
                    return ObjEnvelop.getError( "获取失败, 该医生暂无工单" );
                    return ObjEnvelop.getSuccess( "获取失败, 该医生暂无工单",null);
                }
            }
            // 根据orderId获取工单信息

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

@@ -90,10 +90,12 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "getSecurityOrderDetail")
    @ApiOperation(value = "获取安防工单详情")//
    public ObjEnvelop getSecurityOrderDetail(@ApiParam(name="orderId",value = "orderId",required = true)
                                            @RequestParam(value = "orderId")String orderId){
                                            @RequestParam(value = "orderId")String orderId,
                                             @ApiParam(name="doctor",value = "doctor",required = false)
                                             @RequestParam(value = "doctor",required = false)String doctor){
        try {
            JSONObject result = securityMonitoringOrderService.getSecurityOrderDetail(orderId);
            JSONObject result = securityMonitoringOrderService.getSecurityOrderDetail(orderId,doctor);
            if (result.getIntValue("resultFlag") == 0) {
                return ObjEnvelop.getError(result.getString("resultMsg"));
            }

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

@@ -218,10 +218,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            }
        }
        emergencyAssistanceDao.save(assistanceDO);
        return getOrderDetail(assistanceDO.getId());
        return getOrderDetail(assistanceDO.getId(),null);
    }
    public JSONObject getOrderDetail(String orderID){
    public JSONObject getOrderDetail(String orderID,String doctor){
        JSONObject result = new JSONObject();
        EmergencyOrderVO emergencyOrderVO = new EmergencyOrderVO();
        EmergencyAssistanceDO assistanceDO = emergencyAssistanceDao.findOne(orderID);
@@ -231,6 +231,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            result.put(ResponseContant.resultMsg,failMsg);
            return result;
        }
        emergencyOrderVO.setId(assistanceDO.getId());
        if (assistanceDO.getOrderSource()==2){//手环发起的紧急救助获取手环坐标
            try {
                List<DevicePatientDevice> devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(assistanceDO.getPatient(),"4");
@@ -276,6 +277,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        emergencyOrderVO.setPatient(assistanceDO.getPatient());
        emergencyOrderVO.setPatientName(assistanceDO.getPatientName());
        emergencyOrderVO.setSex(patientDO.getSex());
        emergencyOrderVO.setPhone(assistanceDO.getPatientPhone());
        if(StringUtils.isNotBlank(patientDO.getIdcard())){
            emergencyOrderVO.setAge((IdCardUtil.getAgeForIdcard(patientDO.getIdcard()))+"");
@@ -319,10 +321,14 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            Map<String,Object> tmp = new HashMap<>();
            tmp.put("name","系统预警");
            tmp.put("status",0);
            tmp.put(statusName,"未读");
            SystemMessageDO messageDO = systemMessageDao.findByRelationCodeAndReceiver(assistanceDO.getId(),patientId);
            if (messageDO != null){
                if (StringUtils.isNotBlank(messageDO.getIsRead())){
                    tmp.put("status",Integer.parseInt(messageDO.getIsRead()));
                    if (Integer.parseInt(messageDO.getIsRead())==1){
                        tmp.put(statusName,"已读");
                    }
                }
            }
            arr.add(tmp);
@@ -347,8 +353,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            Map<String,Object> tmp = new HashMap<>();
            tmp.put("name","系统预警");
            tmp.put("status",0);
            tmp.put("statusName","未响应");
            if (emergencyWarnDoctorResponseDao.findByDoctorAndOrderId(doctorDO.getId(),assistanceDO.getId())!=null){
                tmp.put("status",1);
                tmp.put("statusName","已响应");
            }
            arr.add(tmp);
            noticeObj.put("response",arr);
@@ -403,9 +411,20 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        if (null != consult) {
            String sessionId = assistanceDO.getPatient() + "_" + consult.getId() + "_" + consult.getType();
            jsonObject.put("sessionId",sessionId);
            if (1==assistanceDO.getStatus()&&StringUtils.isNotBlank(doctor)){//查询未读数量
                try {
                    Integer count = imUtill.UserSessionsUnreadMessageCount(sessionId,doctor);
                    jsonObject.put("UnRead",count);
                }catch (Exception e){
                    jsonObject.put("sessionId",sessionId);
                    jsonObject.put("UnRead",0);
                }
            }
        }
        else {
            jsonObject.put("sessionId",null);
            jsonObject.put("UnRead",0);
        }
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg,jsonObject);
@@ -433,13 +452,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            result.put(ResponseContant.resultMsg,failMsg);
            return result;
        }
        if (assistanceDO.getStatus()==-1){
            String failMsg = "当前工单已取消 无法查看";
            result.put(ResponseContant.resultFlag, ResponseContant.fail);
            result.put(ResponseContant.resultMsg,failMsg);
            return result;
        }
        return getOrderDetail(orderID);
        return getOrderDetail(orderID,doctor);
    }
    /**
@@ -469,7 +482,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
//            result.put(ResponseContant.resultMsg,failMsg);
//            return result;
//        }
        return getOrderDetail(orderID);
        return getOrderDetail(orderID,null);
    }
    /**
@@ -520,7 +533,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            return result;
        }
        else {
            JSONObject detail  = getOrderDetail(assistanceDO.getId());
            JSONObject detail  = getOrderDetail(assistanceDO.getId(),null);
            tmpObj.put("exist","true");
            tmpObj.put("assistanceDO",detail.getJSONObject("resultMsg"));
            result.put(ResponseContant.resultFlag, ResponseContant.success);
@@ -681,7 +694,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            return result;
        }
        emergencyAssistanceDao.save(assistanceDO);
        return getOrderDetail(orderId);
        return getOrderDetail(orderId,null);
    }
    public JSONObject updateDoctorLocation(String doctor,String orderId,String doctorAddress,String doctorLat,String doctorLon){
@@ -707,7 +720,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                assistanceDO.setDoctorLat(doctorLat);
                assistanceDO.setDoctorLon(doctorLon);
                emergencyAssistanceDao.save(assistanceDO);
                return getOrderDetail(orderId);
                return getOrderDetail(orderId,null);
            }
        }
        else {
@@ -726,13 +739,17 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            result.put(ResponseContant.resultMsg,failMsg);
            return result;
        }
        EmergencyAssistanceDO assistanceDO = emergencyAssistanceDao.findByPatientAndStatus(patient,1);
        if (assistanceDO!=null){
            assistanceDO.setServeAddress(patientAddress);
            assistanceDO.setServeLat(patientLat);
            assistanceDO.setServeLon(patientLon);
            emergencyAssistanceDao.save(assistanceDO);
            return getOrderDetail(assistanceDO.getId());
        List<EmergencyAssistanceDO> assistanceDO = emergencyAssistanceDao.findByPatientAndStatus(patient,1);
        if (assistanceDO.size()>0){
            for (EmergencyAssistanceDO tmp:assistanceDO){
                tmp.setServeAddress(patientAddress);
                tmp.setServeLat(patientLat);
                tmp.setServeLon(patientLon);
                emergencyAssistanceDao.save(tmp);
            }
            result.put(ResponseContant.resultFlag, ResponseContant.success);
            result.put(ResponseContant.resultMsg,"查询成功");
        }
        else {
            result.put(ResponseContant.resultFlag, ResponseContant.success);
@@ -781,7 +798,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        assistanceDO.setEmergencyCancel(emergencyCancel);
        emergencyAssistanceDao.save(assistanceDO);
        result = getOrderDetail(orderId);
        result = getOrderDetail(orderId,null);
        return result;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultTeamService.java

@@ -65,6 +65,8 @@ public class ConsultTeamService {
    private SystemMessageDao systemMessageDao;
    @Autowired
    private PatientDoorCoachOrderService doorCoachOrderService;
    @Autowired
    private PatientDoorCoachOrderService patientDoorCoachOrderService;
    public JSONObject updateIMMsg(String sessionId,String sessionType,String msgId,String content){
@@ -105,9 +107,9 @@ public class ConsultTeamService {
        }
        switch (type) {
            case 20:
//                WlyyDoorServiceOrderDO orderDO = wlyyDoorServiceOrderDao.findOne(consult.getRelationCode());
//                JSONObject patientInfo = wlyyDoorServiceOrderService.queryOrderCardInfo(orderDO);
            case 21:
                BaseDoorCoachOrderDO orderDO = baseDoorCoachOrderDao.findOne(consult.getRelationCode());
                JSONObject patientInfo = patientDoorCoachOrderService.queryOrderCardInfo(orderDO);
                result.put("data", patientInfo);
                break;
            default:
@@ -486,4 +488,6 @@ public class ConsultTeamService {
        }
        return true;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/DoctorDoorCoachOrderService.java

@@ -967,7 +967,6 @@ public class DoctorDoorCoachOrderService {
                    map.put("position",hospital1.getLongitude()+","+hospital1.getLatitude());
                }
            }
            logger.info("服务医生人员sql:"+finalSql);
        } catch (Exception e) {
            result.put(ResponseContant.resultFlag, ResponseContant.fail);
            result.put(ResponseContant.resultMsg, "从数据库查询 服务医生人员 列表信息失败：" + e.getMessage());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java

@@ -353,7 +353,7 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
    }
    public List<Map<String,Object>> selectItemsByHospital(String hospital,String serverItemName){
        String sql ="select dict_code code,dict_value name,ext1 fee from base_business_sys_dict where 1=1 ";
        String sql ="select org_code,dict_code code,dict_value name,ext1 fee from base_business_sys_dict where dict_name='DOOR_APPLY_ITEM' ";
        if (StringUtils.isNotBlank(hospital)){
            sql +=" and org_code='"+hospital+"' ";
        }
@@ -361,6 +361,7 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
            sql += " and dict_value like '%"+serverItemName+"%' ";
        }
        List<Map<String,Object>> result = jdbcTemplate.queryForList(sql);
        return result;
    }
@@ -561,7 +562,7 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
        }
        result.put("serveTown",orderDO.getServeTown());
        result.put("serveAddress",orderDO.getServeAddress());
        result.put("type",11);
        result.put("type",21);
        return result;
    }
    /**

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

@@ -215,7 +215,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        return result;
    }
    public JSONObject getSecurityOrderDetail(String orderID){
    public JSONObject getSecurityOrderDetail(String orderID,String doctor){
        JSONObject result = new JSONObject();
        EmergencyOrderVO emergencyOrderVO = new EmergencyOrderVO();
        SecurityMonitoringOrderDO orderDO = securityMonitoringOrderDao.findOne(orderID);
@@ -226,6 +226,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            logger.error(failMsg);
            return result;
        }
        emergencyOrderVO.setId(orderDO.getId());
        BasePatientDO patientDO = basePatientDao.findById(orderDO.getPatient());
        Integer statustemp = Integer.valueOf(orderDO.getStatus()+"");
        String statusName = "";
@@ -295,10 +296,14 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            Map<String,Object> tmp = new HashMap<>();
            tmp.put("name","系统预警");
            tmp.put("status",0);
            tmp.put(statusName,"未读");
            SystemMessageDO messageDO = systemMessageDao.findByRelationCodeAndReceiver(orderDO.getId(),patientId);
            if (messageDO != null){
                if (StringUtils.isNotBlank(messageDO.getIsRead())){
                    tmp.put("status",Integer.parseInt(messageDO.getIsRead()));
                    if (Integer.parseInt(messageDO.getIsRead())==1){
                        tmp.put(statusName,"已读");
                    }
                }
            }
            arr.add(tmp);
@@ -327,8 +332,10 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                Map<String,Object> tmp = new HashMap<>();
                tmp.put("name","系统预警");
                tmp.put("status",0);
                tmp.put("statusName","未响应");
                if (emergencyWarnDoctorResponseDao.findByDoctorAndOrderId(doc.getId(),orderDO.getId())!=null){
                    tmp.put("status",1);
                    tmp.put("statusName","已响应");
                }
                arr.add(tmp);
                noticeObj.put("response",arr);
@@ -357,9 +364,20 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        if (null != consult) {
            String sessionId = orderDO.getPatient() + "_" + consult.getId() + "_" + consult.getType();
            jsonObject.put("sessionId",sessionId);
            if (1==orderDO.getStatus()&&StringUtils.isNotBlank(doctor)){//查询未读数量
                try {
                    Integer count = imUtil.UserSessionsUnreadMessageCount(sessionId,doctor);
                    jsonObject.put("UnRead",count);
                }catch (Exception e){
                    jsonObject.put("sessionId",sessionId);
                    jsonObject.put("UnRead",0);
                }
            }
        }
        else {
            jsonObject.put("sessionId",null);
            jsonObject.put("UnRead",0);
        }
        result.put("resultFlag", 1);
@@ -387,7 +405,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        orderDO.setEmergencyCancel(emergencyCancel);
        securityMonitoringOrderDao.save(orderDO);
        result = getSecurityOrderDetail(orderId);
        result = getSecurityOrderDetail(orderId,null);
        return result;
    }
@@ -638,7 +656,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        //  待接单消息设为已操作， 434 医生接单-- 王五接受了服务工单12345678
//        messageUtil.createMessage("医生接单","634",doorServiceOrder.getPatient(),doorServiceOrder.getPatientName(),
//                doorServiceOrder.getId(), doorServiceOrder.getDoctor(),doorServiceOrder.getDoctorName() ,null, doorServiceOrder.getDoctorName() + "接受了服务工单"+ doorServiceOrder.getNumber());
        return getSecurityOrderDetail(orderId);
        return getSecurityOrderDetail(orderId,null);
    }
@@ -721,7 +739,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
//        }
//        pushMsgTask.putWxMsg(tokenUtils.getAccessToken(), 30, patient.getOpenid(), patient.getName(), json);
        result = getSecurityOrderDetail(orderId);
        result = getSecurityOrderDetail(orderId,null);
        return result;
    }
@@ -763,7 +781,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            return getSecurityOrderDetail(orderId);
        }*/
        return getSecurityOrderDetail(orderId);
        return getSecurityOrderDetail(orderId,null);
    }
    /**
@@ -825,7 +843,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        one.setStatus(SecurityMonitoringOrderDO.Status.complete.getType());//已完成
        one.setConclusionStatus(2);
        securityMonitoringOrderDao.save(one);
        return getSecurityOrderDetail(orderId);
        return getSecurityOrderDetail(orderId,null);
    }
    /**
@@ -846,7 +864,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            throw new Exception(failMsg);
        }
        securityMonitoringOrderDao.updateConclusionStatus(orderId);
        return getSecurityOrderDetail(orderId);
        return getSecurityOrderDetail(orderId,null);
    }
    /**
@@ -901,7 +919,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
//        // 发送微信通知  待付款
//        BasePatientDO patient = basePatientDao.findById(one.getPatient());
        return getSecurityOrderDetail(orderId);
        return getSecurityOrderDetail(orderId,null);
    }
    /**