|
@@ -7,10 +7,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
import com.ruoyi.web.work.domain.FollowRecord;
|
|
import com.ruoyi.web.work.domain.FollowRecord;
|
|
import com.ruoyi.web.work.domain.FollowTemplate;
|
|
import com.ruoyi.web.work.domain.FollowTemplate;
|
|
-import com.ruoyi.web.work.domain.Visit;
|
|
|
|
|
|
+import com.ruoyi.web.work.domain.dto.VisitDto;
|
|
|
|
+import com.ruoyi.web.work.domain.vo.VisitVoList;
|
|
import com.ruoyi.web.work.service.IFollowRecordService;
|
|
import com.ruoyi.web.work.service.IFollowRecordService;
|
|
import com.ruoyi.web.work.service.IFollowTemplateService;
|
|
import com.ruoyi.web.work.service.IFollowTemplateService;
|
|
-import com.ruoyi.web.work.service.IVisitService;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -31,9 +31,6 @@ public class FollowRecordController extends BaseController {
|
|
private IFollowRecordService followRecordService;
|
|
private IFollowRecordService followRecordService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private IVisitService visitService;
|
|
|
|
-
|
|
|
|
- @Autowired
|
|
|
|
private IFollowTemplateService followTemplateService;
|
|
private IFollowTemplateService followTemplateService;
|
|
|
|
|
|
@PreAuthorize("@ss.hasPermi('work:record:list')")
|
|
@PreAuthorize("@ss.hasPermi('work:record:list')")
|
|
@@ -52,9 +49,10 @@ public class FollowRecordController extends BaseController {
|
|
|
|
|
|
@PreAuthorize("@ss.hasPermi('work:record:list')")
|
|
@PreAuthorize("@ss.hasPermi('work:record:list')")
|
|
@GetMapping("/visit/list")
|
|
@GetMapping("/visit/list")
|
|
- public TableDataInfo visitList() {
|
|
|
|
|
|
+ public TableDataInfo visitList(VisitDto dto) {
|
|
|
|
+ dto.setDoctorCode(getLoginUser().getUsername());
|
|
startPage();
|
|
startPage();
|
|
- List<Visit> list = visitService.selectList(new Visit().setDoctorCode(getLoginUser().getUsername()));
|
|
|
|
|
|
+ List<VisitVoList> list = followRecordService.selectVisitList(dto);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -69,7 +67,7 @@ public class FollowRecordController extends BaseController {
|
|
@Log(title = "回访记录", businessType = BusinessType.INSERT)
|
|
@Log(title = "回访记录", businessType = BusinessType.INSERT)
|
|
@PostMapping("/add")
|
|
@PostMapping("/add")
|
|
public AjaxResult add(@RequestBody FollowRecord followRecord) {
|
|
public AjaxResult add(@RequestBody FollowRecord followRecord) {
|
|
- return toAjax(followRecordService.save(followRecord));
|
|
|
|
|
|
+ return followRecordService.add(followRecord);
|
|
}
|
|
}
|
|
|
|
|
|
@PreAuthorize("@ss.hasPermi('work:record:edit')")
|
|
@PreAuthorize("@ss.hasPermi('work:record:edit')")
|