|
|
@ -9,6 +9,7 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
|
|
|
import com.yihu.jw.entity.base.im.ConsultDo;
|
|
|
import com.yihu.jw.entity.base.im.ConsultTeamDo;
|
|
|
import com.yihu.jw.entity.base.patient.BasePatientDO;
|
|
|
import com.yihu.jw.entity.base.servicePackage.ServiceItemPlanDO;
|
|
|
import com.yihu.jw.entity.door.*;
|
|
|
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
|
|
|
import com.yihu.jw.file_upload.FileUploadService;
|
|
|
@ -16,12 +17,11 @@ import com.yihu.jw.hospital.HospitalDao;
|
|
|
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
|
|
|
import com.yihu.jw.hospital.module.consult.service.ConsultTeamService;
|
|
|
import com.yihu.jw.hospital.module.door.dao.*;
|
|
|
import com.yihu.jw.hospital.module.rehabilitation.service.RehabilitationManageService;
|
|
|
import com.yihu.jw.hospital.task.PushMsgTask;
|
|
|
import com.yihu.jw.hospital.utils.WeiXinAccessTokenUtils;
|
|
|
import com.yihu.jw.im.dao.ConsultDao;
|
|
|
import com.yihu.jw.im.util.ImUtil;
|
|
|
import com.yihu.jw.order.BusinessOrderService;
|
|
|
import com.yihu.jw.order.dao.BusinessOrderDao;
|
|
|
import com.yihu.jw.patient.dao.BasePatientDao;
|
|
|
import com.yihu.jw.patient.service.BasePatientService;
|
|
|
import com.yihu.jw.restmodel.ResponseContant;
|
|
|
@ -30,6 +30,7 @@ import com.yihu.jw.restmodel.qvo.ParamQvo;
|
|
|
import com.yihu.jw.util.common.IdCardUtil;
|
|
|
import com.yihu.jw.util.common.QrcodeUtil;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import com.yihu.jw.util.entity.ServiceException;
|
|
|
import com.yihu.jw.util.http.HttpClientUtil;
|
|
|
import com.yihu.jw.utils.EntityUtils;
|
|
|
import com.yihu.jw.wechat.dao.WxTemplateConfigDao;
|
|
|
@ -70,21 +71,14 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
|
|
|
|
|
|
private Logger logger = LoggerFactory.getLogger(WlyyDoorServiceOrderService.class);
|
|
|
|
|
|
// @Value("${server.server_url}")
|
|
|
// private String wxServerUrl;
|
|
|
// @Value("${doctorAssistant.api}")
|
|
|
// private String doctorAssistant;
|
|
|
// @Value("${doctorAssistant.target_url}")
|
|
|
// private String targetUrl;
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
private HttpClientUtil httpClientUtil;
|
|
|
|
|
|
@Autowired
|
|
|
private BusinessOrderDao businessOrderDao;
|
|
|
private ServiceItemPlanDao serviceItemPlanDao;
|
|
|
@Autowired
|
|
|
private BusinessOrderService businessOrderService;
|
|
|
private RehabilitationManageService rehabilitationManageService;
|
|
|
|
|
|
@Autowired
|
|
|
private WlyyDoorServiceOrderDao wlyyDoorServiceOrderDao;
|
|
|
@ -726,8 +720,27 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
|
|
|
orderDO.setType(2);
|
|
|
}
|
|
|
orderDO.setServiceStatus("1");//服务类型 1-预约项目 2-即时项目
|
|
|
|
|
|
//关联code不为空情况
|
|
|
ServiceItemPlanDO serviceItemPlanDO = null;
|
|
|
if(StringUtils.isNotBlank(orderDO.getRelationCode())){
|
|
|
serviceItemPlanDO = serviceItemPlanDao.findById(orderDO.getRelationCode()).orElse(null);
|
|
|
if(serviceItemPlanDO!=null){
|
|
|
if("1".equals(serviceItemPlanDO.getStatus())){
|
|
|
throw new ServiceException("请勿重复申请");
|
|
|
}
|
|
|
orderDO.setDoctor(serviceItemPlanDO.getDoctor());
|
|
|
orderDO.setDoctorName(serviceItemPlanDO.getDoctorName());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
//保存服务订单
|
|
|
wlyyDoorServiceOrderDao.save(orderDO);
|
|
|
orderDO = wlyyDoorServiceOrderDao.save(orderDO);
|
|
|
if(serviceItemPlanDO!=null){
|
|
|
serviceItemPlanDO.setRelationCode(orderDO.getId());
|
|
|
rehabilitationManageService.completePlan(serviceItemPlanDO);
|
|
|
}
|
|
|
|
|
|
//新增工单与服务项费用关联关系
|
|
|
if (orderWithPackageItemFeeAdd(result, jsonObjectParam, orderDO)) {
|
