上门服务

common/common-entity/src/main/java/com/yihu/jw/entity/door/WlyyDoorOrderItemDO.java

@@ -25,6 +25,16 @@ public class WlyyDoorOrderItemDO extends IdEntity {
    private String code;
    private Date createTime;
    private String orderId;
    public String getOrderId() {
        return orderId;
    }
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }
    public String getDoctor() {
        return doctor;
    }

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/controller/DoctorDoorServiceAuditController.java

@@ -34,6 +34,13 @@ public class DoctorDoorServiceAuditController extends EnvelopRestEndpoint {
    private BasePatientService patientService;
    /**
     * 参数：
     * auditorType: 2
     * status: 0
     * page: 1
     * pageSize: 15
     */
    @RequestMapping(value = "getPOnsiteServiceByDoctor", method = RequestMethod.GET)
    @ApiOperation(value = "获取待审核的居民上门服务资质申请")
    public Envelop getPOnsiteServiceByDoctor(
@@ -60,8 +67,8 @@ public class DoctorDoorServiceAuditController extends EnvelopRestEndpoint {
    @RequestMapping(value = "getDoorSericeApplicationStatus", method = RequestMethod.GET)
    @ApiOperation(value = "获取资质审核状态")
    public Envelop getDoorSericeApplicationStatus(
            @ApiParam(name = "patient", value = "patient")
            @RequestParam(value = "patient", required = true) String patient) {
            @ApiParam(name = "patient", value = "patient") @RequestParam(value = "patient", required = true) String patient
    ) {
        try {
            return success("获取成功", doorServiceApplicationService.getDoorSericeApplicationStatus(patient));
        } catch (Exception ex) {
@@ -94,6 +101,10 @@ public class DoctorDoorServiceAuditController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 参数：
     * id=9e1204850bf4437e8ebf2c182db34f0e
     */
    @RequestMapping(value = "getPOnsiteServiceById", method = RequestMethod.GET)
    @ApiOperation(value = "获取居民上门服务资质申请详情")
    public Envelop getPOnsiteServiceById(
@@ -142,6 +153,16 @@ public class DoctorDoorServiceAuditController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 代审核
     * 参数：
     * {
     * "startTime":"2023-10-19 00:00:00","endTime":"2023-10-19 00:00:00","patient":"915ceabb-5b1d-11e6-8344-fa163e8aee56",
     * "status":2,"id":"","patientName":"王银汉","patientIdcard":"350211195808274534","patientAddr":"G.福建省厦门市海沧区海沧街道囷瑶村石岑社5组5号（高友网）",
     * "patientPhone":"13950088528","applicationDescribe":"测试",
     * "wlyyDoorServiceVoucherDos":[{"patientCode":"915ceabb-5b1d-11e6-8344-fa163e8aee56","type":"6","typeValue":"其他"}]
     * }
     */
    @RequestMapping(value = "create", method = RequestMethod.POST)
    @ApiOperation(value = "医生为居民开通服务资格")
    public Envelop create(

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/DoorOrderService.java

@@ -576,11 +576,9 @@ public class DoorOrderService {
        if (wlyyDoorServiceOrderService.orderWithDoctorAdd(new JSONObject(), jsonObjectParam, doorServiceOrder)) {
            return null;
        }
        doorServiceOrderDao.save(doorServiceOrder);
        this.systemMessageDao.orderMessageDel(doorServiceOrder.getDoctor(), orderId);
        systemMessageDao.orderMessageDel(doorServiceOrder.getDoctor(), orderId);
        if (doorServiceOrder.getType() == null || doorServiceOrder.getType() != 3) {
            //获取咨询
@@ -600,7 +598,6 @@ public class DoorOrderService {
            orderInfoContent.put("re_msg_type", 0);
            wlyyDoorServiceOrderService.qucikSendIM(doorServiceOrder.getId(), doorServiceOrder.getDispatcher(), "智能助手", "2101", orderInfoContent.toJSONString());
        }
        return doorServiceOrder;
    }
@@ -610,7 +607,6 @@ public class DoorOrderService {
     * @param orderId
     */
    public void acceptOrder(String orderId, String jobCode, String jobCodeName, int hospitalLevel) throws Exception {
        WlyyDoorServiceOrderDO doorServiceOrder = acceptOrder1(orderId, jobCode, jobCodeName, hospitalLevel);
        if (doorServiceOrder == null) {
            return;
@@ -711,8 +707,6 @@ public class DoorOrderService {
            doorServiceOrder.setStatus(WlyyDoorServiceOrderDO.Status.waitForSend.getType());  // 设置为1-待（调度员）派单
            doorServiceOrder.setCancelReason(reason);   // 拒绝原因
            doorServiceOrder.setCancelTime(new Date());
//        doorServiceOrder.setCancelType(WlyyDoorServiceOrderDO.CancelType.dispatcher.getType());
            doorServiceOrderDao.save(doorServiceOrder);
        }
    }

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/door/service/WlyyDoorServiceOrderService.java

@@ -377,7 +377,8 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                orderItemDO.setDoctor(order.getDoctor());
                orderItemDO.setCode(feeDetailDO.getCode());
                orderItemDO.setCreateTime(new Date());
                orderItemDO.setPatient(orderItemDO.getPatient());
                orderItemDO.setPatient(order.getPatient());
                orderItemDO.setOrderId(order.getId());
                orderItemDOList.add(orderItemDO);
                // 服务项可能一开始由居民预约，后期由医生新增或医生删除
                Integer status = jsonObjectParam.getInteger("status");