Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-service/src/main/java/com/fs/hospital580/vo/res/PrescriptionListRes.java

@@ -69,4 +69,7 @@ public class PrescriptionListRes implements Serializable {
 
     @ApiModelProperty("根据订单状态 展示处方状态(1待生效 2已生效 3已失效)")
     private Integer prescriptionStatusByOrderStatus;
+
+    @ApiModelProperty("问诊知情确认页面URL")
+    private String jumpUrl;
 }

fs-user-app/src/main/java/com/fs/app/facade/impl/Hospital580FacadeServiceImpl.java

@@ -256,6 +256,7 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
                             .prescriptionStatus(order.getPrescriptionStatus())
                             .doctorName(order.getDoctorName())
                             .serialNo(order.getSerialNo())
+                            .jumpUrl(order.getJumpUrl())
                             .prescriptionStatusByOrderStatus(Optional.ofNullable(orderService.selectFsStoreOrderById(order.getStoreOrderId()))
                                     .map(FsStoreOrderScrm::getStatus)
                                     .map(s -> {