浏览代码

代码修改

liubing 4 年之前
父节点
当前提交
c656c50769

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

@ -4,6 +4,7 @@ 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;
@ -46,6 +47,8 @@ public class DoctorDoorCoachOrderController extends BaseController {
    private DoctorDoorCoachOrderService doctorDoorCoachOrderService;
    @Autowired
    private ImService imService;
    @Autowired
    private ConsultTeamService consultTeamService;
    @PostMapping(value = "proxyCreate")
    @ApiOperation(value = "创建上门预约咨询--医生代预约")
@ -607,4 +610,17 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @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("查询失败");
        }
    }
}

+ 7 - 3
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;
    }
}

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

@ -562,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;
    }
    /**