|
|
@@ -140,7 +140,9 @@ public class PrescribeController extends AppBaseController {
|
|
|
vo.setAuditReason(order.getReason());
|
|
|
vo.setDiagnose(order.getTags());
|
|
|
vo.setAuditStatus(order.getAuditStatus());
|
|
|
- vo.setAuditTime(Date.from(order.getAuditTime().atZone(ZoneId.of("Asia/Shanghai")).toInstant()));
|
|
|
+ if (order.getAuditTime() != null){
|
|
|
+ vo.setAuditTime(Date.from(order.getAuditTime().atZone(ZoneId.of("Asia/Shanghai")).toInstant()));
|
|
|
+ }
|
|
|
vo.setCreateTime(Date.from(order.getCreateTime().atZone(ZoneId.of("Asia/Shanghai")).toInstant()));
|
|
|
|
|
|
List<Hospital580PrescriptionMedicineScrmEntity> list1 = medicineScrmService.list(new LambdaQueryWrapper<Hospital580PrescriptionMedicineScrmEntity>()
|