|
@@ -38,6 +38,7 @@ import com.fs.wjw.dto.UploadFurtherConsultNewDto;
|
|
|
import com.fs.wjw.dto.UploadRecipeNewDto;
|
|
import com.fs.wjw.dto.UploadRecipeNewDto;
|
|
|
import com.qcloud.cos.transfer.Copy;
|
|
import com.qcloud.cos.transfer.Copy;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.http.HttpEntity;
|
|
import org.apache.http.HttpEntity;
|
|
|
import org.apache.http.client.methods.CloseableHttpResponse;
|
|
import org.apache.http.client.methods.CloseableHttpResponse;
|
|
|
import org.apache.http.util.EntityUtils;
|
|
import org.apache.http.util.EntityUtils;
|
|
@@ -635,7 +636,6 @@ public class FsStoreSubOrderServiceImpl implements IFsStoreSubOrderService
|
|
|
private FsSubOrderResultVO tuiFsStoreSubOrderByStoreOrderAndJN(Long orderId){
|
|
private FsSubOrderResultVO tuiFsStoreSubOrderByStoreOrderAndJN(Long orderId){
|
|
|
FsStoreSubOrder fsStoreSubOrder = fsStoreSubOrderMapper.selectFsStoreSubOrderBySubOrderId(orderId);
|
|
FsStoreSubOrder fsStoreSubOrder = fsStoreSubOrderMapper.selectFsStoreSubOrderBySubOrderId(orderId);
|
|
|
FsSubOrderResultVO fsSubOrderResultVO = new FsSubOrderResultVO();
|
|
FsSubOrderResultVO fsSubOrderResultVO = new FsSubOrderResultVO();
|
|
|
-
|
|
|
|
|
Integer isPush = fsStoreSubOrder.getIsPush();
|
|
Integer isPush = fsStoreSubOrder.getIsPush();
|
|
|
if (isPush==1){
|
|
if (isPush==1){
|
|
|
fsSubOrderResultVO.setCode(0);
|
|
fsSubOrderResultVO.setCode(0);
|
|
@@ -650,6 +650,19 @@ public class FsStoreSubOrderServiceImpl implements IFsStoreSubOrderService
|
|
|
return fsSubOrderResultVO;
|
|
return fsSubOrderResultVO;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (StringUtils.isEmpty(fsStoreSubOrder.getIcdCode())) {
|
|
|
|
|
+ fsSubOrderResultVO.setCode(0);
|
|
|
|
|
+ fsSubOrderResultVO.setMsg("订单无icd编码");
|
|
|
|
|
+ return fsSubOrderResultVO;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ FsPrescribe fsPrescribe = fsPrescribeMapper.getBYOrderId(fsStoreSubOrder.getOrderId());
|
|
|
|
|
+ if (StringUtils.isEmpty(fsPrescribe.getPrescribeImgUrl())){
|
|
|
|
|
+ fsSubOrderResultVO.setCode(0);
|
|
|
|
|
+ fsSubOrderResultVO.setMsg("订单无电子处方签");
|
|
|
|
|
+ return fsSubOrderResultVO;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
try {
|
|
try {
|
|
|
//1.网络咨询服务数据上传-外部
|
|
//1.网络咨询服务数据上传-外部
|
|
|
FsDoctor fsDoctor = fsDoctorMapper.selectFsDoctorByDoctorId(fsStoreSubOrder.getDoctorId());
|
|
FsDoctor fsDoctor = fsDoctorMapper.selectFsDoctorByDoctorId(fsStoreSubOrder.getDoctorId());
|