|
@@ -1751,23 +1751,29 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
|
// 15、30-医院 16-商业公司 18-药店
|
|
|
if ("15".equals(task.getTaskTypeId()) || "30".equals(task.getTaskTypeId())) {
|
|
|
result = wmDaHospitalService.approvalHospital(taskId);
|
|
|
- Map<String, Object> data = (Map<String, Object>) result.getData();
|
|
|
- data.remove("info");
|
|
|
- data.remove("newinfo");
|
|
|
+ if (result.getCode() == 0) {
|
|
|
+ Map<String, Object> data = (Map<String, Object>) result.getData();
|
|
|
+ data.remove("info");
|
|
|
+ data.remove("newinfo");
|
|
|
+ }
|
|
|
} else if ("16".equals(task.getTaskTypeId())) {
|
|
|
result = wmDaDistributionService.approvalDistribution(taskId);
|
|
|
- Map<String, Object> data = (Map<String, Object>) result.getData();
|
|
|
- data.remove("info");
|
|
|
- data.remove("newinfo");
|
|
|
+ if (result.getCode() == 0) {
|
|
|
+ Map<String, Object> data = (Map<String, Object>) result.getData();
|
|
|
+ data.remove("info");
|
|
|
+ data.remove("newinfo");
|
|
|
+ }
|
|
|
} else if ("18".equals(task.getTaskTypeId())) {
|
|
|
result = wmDaPharmacyService.approvalPharmacy(taskId);
|
|
|
- Map<String, Object> data = (Map<String, Object>) result.getData();
|
|
|
- data.put("wmTask", data.get("_wmTask"));
|
|
|
- data.put("compareList", new ArrayList<>());
|
|
|
- data.remove("_wmTask");
|
|
|
- data.remove("info");
|
|
|
- data.remove("newinfo");
|
|
|
- data.remove("compareResult");
|
|
|
+ if (result.getCode() == 0) {
|
|
|
+ Map<String, Object> data = (Map<String, Object>) result.getData();
|
|
|
+ data.put("wmTask", data.get("_wmTask"));
|
|
|
+ data.put("compareList", new ArrayList<>());
|
|
|
+ data.remove("_wmTask");
|
|
|
+ data.remove("info");
|
|
|
+ data.remove("newinfo");
|
|
|
+ data.remove("compareResult");
|
|
|
+ }
|
|
|
} else {
|
|
|
result = R.failed("未查询到任务信息");
|
|
|
}
|
|
@@ -2290,4 +2296,15 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
|
|
|
public IPage<WmTask> listInfoAudit(Page page, WmTask wmTask, LocalDateTime startDate, LocalDateTime endDate) {
|
|
|
return wmTaskMapper.listInfoAudit(page, wmTask, startDate, endDate);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询同一家医院一个月做的任务次数
|
|
|
+ *
|
|
|
+ * @param hospitalId 医院id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public List<WmTask> listCurrentMonthHospitalTask(String hospitalId) {
|
|
|
+ return wmTaskMapper.listCurrentMonthHospitalTask(hospitalId);
|
|
|
+ }
|
|
|
}
|