| | |
|---|
| | | if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) { |
|---|
| | | one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList())); |
|---|
| | | } |
|---|
| | | one.setDeptId(orderRemark.getDeptId()); |
|---|
| | | // one.setDeptId(orderRemark.getDeptId()); |
|---|
| | | one.setDoctorName(orderRemark.getDoctorName()); |
|---|
| | | one.setType(1); |
|---|
| | | remarkService.updateById(one); |
|---|
| | |
|---|
| | | wqq.eq(TjOrderDetail::getOrderId, one.getOrderId()); |
|---|
| | | wqq.isNotNull(TjOrderDetail::getFlowingWaterId); |
|---|
| | | wqq.in(TjOrderDetail::getProId, proIdList); |
|---|
| | | wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId()); |
|---|
| | | List<TjOrderDetail> detailList = detailService.list(wqq); |
|---|
| | | if (detailList != null && detailList.size() > 0) { |
|---|
| | | List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList()); |
|---|
| | |
|---|
| | | wq.eq("tj_number", tjNumber); |
|---|
| | | wq.in("pro_id", collect); |
|---|
| | | wq.ne("type", 2); |
|---|
| | | wq.ne("dept_id",241); |
|---|
| | | wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId()); |
|---|
| | | List<TjOrderRemark> list = remarkService.list(wq); |
|---|
| | | if (list.size() == 0) { |
|---|
| | | return AjaxResult.success("该科室下无项目！"); |
|---|
