update:信息采集订单展示

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -47,6 +47,7 @@ import com.fs.system.mapper.SysConfigMapper;
 import com.fs.system.service.ISysRoleService;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -73,6 +74,7 @@ import static com.fs.his.utils.PhoneUtil.*;
  */
 @RestController
 @RequestMapping("/his/storeOrder")
+@Slf4j
 public class FsStoreOrderController extends BaseController
 {
     @Autowired
@@ -421,6 +423,14 @@ public class FsStoreOrderController extends BaseController
             tuiMoneyLogs=moneyLogsService.selectCompanyStoreOrderMoneyLogsList(moneyLogsMap);
         }
         if ((CloudHostUtils.hasCloudHostName("金牛明医"))){
+            if (order.getStatus() == 2 ){
+                FsUserInfoCollectionAndStoreOrderVo infoVo = fsPackageOrderService.selectInformationCollectionByStoreOrderId(orderId);
+                if (infoVo!=null) {
+                    if (infoVo.getDoctorType2Confirm() == null || infoVo.getDoctorType2Confirm()!=1) {
+                        order.setStatus(7);
+                    }
+                }
+            }
             return R.ok().put("data",order).put("tuiMoneyLogs",tuiMoneyLogs).put("isUpdateRefund",1).put("isUpdatePayRemain",1);
         } else {
             return R.ok().put("data",order).put("tuiMoneyLogs",tuiMoneyLogs).put("isUpdateRefund",0).put("isUpdatePayRemain",0);
@@ -482,6 +492,17 @@ public class FsStoreOrderController extends BaseController
     {
         AjaxResult error = moneyCheck(fsStoreOrder);
         if (error != null) return error;
+        try {
+            FsUserInfoCollectionAndStoreOrderVo infoVo = fsPackageOrderService.selectInformationCollectionByStoreOrderId(fsStoreOrder.getOrderId());
+            if (infoVo != null) {
+                Integer doctorType2Confirm = infoVo.getDoctorType2Confirm();
+                if (doctorType2Confirm == null || doctorType2Confirm != 1) {
+                    return AjaxResult.error("信息采集订单药师未确认，不能修改状态！");
+                }
+            }
+        } catch (Exception e) {
+            log.error("信息采集查询错误,orderId: " + fsStoreOrder.getOrderId() + ",信息:{}"+ e);
+        }
         return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
     }
 

fs-admin/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 server:
-  # 服务器的HTTP端口，默认为8080 8004
-  port: 7772
+  # 服务器的HTTP端口，默认为8080
+  port: 8004
 # Spring配置
 spring:
   profiles:

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -638,14 +638,15 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         if (param.getIsUserInformation()!=null && param.getIsUserInformation() == 1){
             FsUserInformationCollection fsUserInformationCollection = fsUserInformationCollectionService.selectFsUserInformationCollectionById(param.getUserInformationId());
             if (fsUserInformationCollection != null) {
-                fsUserInformationCollection.setPackageOrderCode(order.getOrderSn());
+                String orderSn = "info" + order.getOrderSn();
+                fsUserInformationCollection.setPackageOrderCode(orderSn);
                 fsUserInformationCollection.setPackageOrderId(order.getOrderId());
                 fsUserInformationCollectionService.updatePackageOrderCode(fsUserInformationCollection);
                 //更新订单表
                 FsPackageOrder temp = new FsPackageOrder();
                 temp.setOrderId(order.getOrderId());
                 //添加前缀 区分信息采集订单
-                temp.setOrderSn("info"+ order.getOrderSn());
+                temp.setOrderSn(orderSn);
                 fsPackageOrderMapper.updateFsPackageOrder(temp);
             }
         }