代码修改

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/consult/service/ConsultTeamService.java

@@ -197,11 +197,9 @@ public class ConsultTeamService extends ConsultService {
        if (null == patientDO) {
            throw new Exception("当前居民不存在");
        }
        //咨询记录
        String title = patientDO.getName() + "-发起了服务咨询";
        ConsultDo consult = addConsult(patient, title, doorServiceOrderDO.getServeDesc(), patientDO.getPhone(), 11);
        //咨询详细信息
        ConsultTeamDo consultTeam = new ConsultTeamDo();
        consultTeam.setType(11);  //上门服务咨询
@@ -228,7 +226,6 @@ public class ConsultTeamService extends ConsultService {
        JSONObject participants = new JSONObject();
        participants.put(patient, 0);
//        String content = signFamily.getHospitalName() + "为您服务";
        String content = doorServiceOrderDO.getDoctorName() + "为您服务";
        JSONObject messages = imUtill.getCreateTopicMessage(patient, patientDO.getName(), consult.getTitle(), content, consult.getImages(), "");
@@ -237,9 +234,7 @@ public class ConsultTeamService extends ConsultService {
//        if (imResponseJson == null || imResponseJson.getString("status").equals("-1")) {
//            String failMsg = "发起服务咨询时：IM" + imResponseJson.getString("message");
//            result.put(ResponseContant.resultFlag, ResponseContant.success);
//            result.put(ResponseContant.resultMsg, failMsg);
//            return result;
//            throw new Exception(failMsg);
//        }
        if (imResponseJson != null && imResponseJson.get("start_msg_id") != null) {
            consultTeam.setStartMsgId(imResponseJson.get("start_msg_id").toString());

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

@@ -394,13 +394,17 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                }
                feeDetailDOList.add(feeDetailDO);
            }
            wlyyDoorFeeDetailDao.saveAll(feeDetailDOList);
            doorOrderItemDao.saveAll(orderItemDOList);
            try {
                wlyyDoorFeeDetailDao.saveAll(feeDetailDOList);
                doorOrderItemDao.saveAll(orderItemDOList);
            } catch (Exception e) {
                e.printStackTrace();
            }
//          //更新总费用-这边没用到
//           order.setTotalFee(totalFee);
//           wlyyDoorServiceOrderDao.save(order);
            return true;
        }
        return false;
    }
@@ -703,9 +707,6 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        //创建咨询
        JSONObject successOrNot = consultTeamService.addDoorServiceConsult(orderDO.getId());
//        if (Integer.parseInt(successOrNot.get(ResponseContant.resultFlag).toString()) == ResponseContant.fail) {
//            return JSONObject.parseObject(successOrNot.toString());
//        }
        ConsultTeamDo consultTeam = (ConsultTeamDo) successOrNot.get(ResponseContant.resultMsg);
        //新增工单与服务项费用关联关系
@@ -2759,7 +2760,6 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        if (orderWithPackageItemFeeAdd(result, jsonObjectParam, orderDO)) {
            return result;
        }
        if (!orderDO.getDoctor().equals(serviceOrderDO.getDoctor())) {
            //服务医生修改，直接转派
            BaseDoctorDO doctor = doctorDao.findById(doctorCode).orElse(null);