|
@@ -19,6 +19,7 @@ import org.jeecg.modules.medical.common.bo.mid.AuditMidDetailListResponse;
|
|
|
import org.jeecg.modules.medical.common.bo.mid.request.AuditMidDetailListRequest;
|
|
|
import org.jeecg.modules.medical.common.bo.mid.response.*;
|
|
|
import org.jeecg.modules.medical.entity.AdvanceWarningAuditDetail;
|
|
|
+import org.jeecg.modules.medical.entity.AfterwardsAudit;
|
|
|
import org.jeecg.modules.medical.entity.PrescriptionOrder;
|
|
|
import org.jeecg.modules.medical.service.*;
|
|
|
import org.jeecg.modules.medical.entity.AfterwardsAuditDetail;
|
|
@@ -334,12 +335,22 @@ public class ViolationAnalysisServiceImpl implements IViolationAnalysisService {
|
|
|
|
|
|
@Override
|
|
|
public List<PrescriptionOrder> loadPrescriptionOrderInfo(Integer detialId) {
|
|
|
+ String prescriptionNumber = "";
|
|
|
AfterwardsAuditDetail byId = afterwardsAuditDetailService.getById(detialId);
|
|
|
- if (null == byId) {
|
|
|
+ if (byId == null) {
|
|
|
+ //TODo 临时用
|
|
|
+ AfterwardsAudit byId1 = afterwardsAuditService.getById(detialId);
|
|
|
+ if (byId1 != null) {
|
|
|
+ prescriptionNumber = byId1.getPrescriptionNumber();
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ prescriptionNumber = byId.getPrescriptionNumber();
|
|
|
+ }
|
|
|
+ if (!StringUtils.hasText(prescriptionNumber)) {
|
|
|
throw new JeecgBootException("找不到主单记录");
|
|
|
}
|
|
|
LambdaQueryWrapper<PrescriptionOrder> queryWrapper = Wrappers.<PrescriptionOrder>lambdaQuery()
|
|
|
- .eq(PrescriptionOrder::getOrderNumber, byId.getPrescriptionNumber());
|
|
|
+ .eq(PrescriptionOrder::getOrderNumber, prescriptionNumber);
|
|
|
return prescriptionOrderService.list(queryWrapper);
|
|
|
|
|
|
}
|