coding:处方列表新增状态展示

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

@@ -66,4 +66,7 @@ public class PrescriptionListRes implements Serializable {
 
     @ApiModelProperty("处方编号")
     private String serialNo;
+
+    @ApiModelProperty("根据订单状态 展示处方状态(1待生效 2已生效 3已失效)")
+    private Integer prescriptionStatusByOrderStatus;
 }

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

@@ -50,6 +50,7 @@ import java.time.Period;
 import java.time.ZoneId;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -241,6 +242,18 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
                             .prescriptionStatus(order.getPrescriptionStatus())
                             .doctorName(order.getDoctorName())
                             .serialNo(order.getSerialNo())
+                            .prescriptionStatusByOrderStatus(Optional.ofNullable(orderService.selectFsStoreOrderById(order.getStoreOrderId()))
+                                    .map(FsStoreOrderScrm::getStatus)
+                                    .map(s -> {
+                                        if (s.equals(0)) {
+                                            return 1;
+                                        } else if (s.equals(-3)) {
+                                            return 3;
+                                        } else {
+                                            return 2;
+                                        }
+                                    })
+                                    .orElse(0))
                             .build();
                 })
                 .filter(Objects::nonNull)