5 Commits 9103c45e23 ... ca86f3b9d7

Tác giả SHA1 Thông báo Ngày
  dengweize ca86f3b9d7 金牛:销售端可以编辑套餐包订单的首诊图片 1 tháng trước cách đây
  dengweize 1080665a83 Merge remote-tracking branch 'origin/master' 1 tháng trước cách đây
  dengweize ea8fc3c44a Merge remote-tracking branch 'origin/master' 1 tháng trước cách đây
  dengweize 1350bf9dca Merge remote-tracking branch 'origin/master' 1 tháng trước cách đây
  dengweize 6a53dff5e0 金牛:fix jnmy.yml 1 tháng trước cách đây

+ 2 - 2
fs-admin/src/main/java/com/fs/qw/controller/IpadAllocationRecordsController.java

@@ -52,7 +52,7 @@ public class IpadAllocationRecordsController extends BaseController {
 
     @Autowired
     private IpadAllocationRecordsMapper ipadAllocationRecordsMapper;
-    @Value("${ipad.url}")
+    @Value("${ipad.watchUrl:https://manwatch.ylrzcloud.com/prod-api}")
     private String ipadServerUrl;
 
     /**
@@ -128,7 +128,7 @@ public class IpadAllocationRecordsController extends BaseController {
         return AjaxResult.success(detailsList);
     }
 
-    @Value("${ipad.companyId:13}")
+    @Value("${ipad.fsCompanyId:13}")
     private Long companyId;
     //发起申请ipad服务器
     @GetMapping("/apply")

+ 8 - 0
fs-company/src/main/java/com/fs/company/controller/store/FsPackageOrderController.java

@@ -20,6 +20,7 @@ import com.fs.his.service.IFsPackageOrderService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.FsPackageOrderListVO;
 import com.fs.his.vo.FsPackageOrderVO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -260,4 +261,11 @@ public class FsPackageOrderController extends BaseController
         return fsPackageOrderService.getWxaCodePackageOrderUnLimit(orderId);
 
     }
+
+    @ApiOperation("修改或者添加患者首诊图片")
+    @PostMapping("/editPatientImages")
+    public R editPatientImages(@RequestParam("orderId")Long orderId,
+                               @RequestParam("imagesList")String imagesList){
+        return fsPackageOrderService.editPatientImages(orderId,imagesList);
+    }
 }

+ 2 - 0
fs-service/src/main/resources/application-config-druid-jnmy.yml

@@ -95,6 +95,8 @@ ipad:
   aiApi: http://49.232.181.28:3000/api
   voiceApi: http://139.186.176.122:8009
   commonApi: http://139.186.176.122:7771
+  watchUrl: https://manwatch.ylrzcloud.com/prod-api
+  fsCompanyId: 13
 wx_miniapp_temp:
   pay_order_temp_id: -SjnK9K6cNKASa6AD9Q_c0YT7J1lPTEpPIpqbMJF8F0
   inquiry_temp_id: hwFXVh0AWqeasBsZpa0-urb3CrPeYEwBiy3P6AMMGFQ

+ 0 - 3
fs-service/src/main/resources/application-druid-jnmy.yml

@@ -160,8 +160,5 @@ im:
     type: OPENIM
 #是否为新商户,新商户不走mpOpenId
 isNewWxMerchant: true
-ipad:
-    url: https://manwatch.ylrzcloud.com/prod-api
-    companyId: 13