Merge branch 'master' into master-手术随访

陈昶聿

4 天以前 3f8535e2eeab1463324438f28d2ef72d8f1049c9

 smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java

@@ -3,6 +3,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.smartor.domain.*;
import com.smartor.domain.ServiceSubtask;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;
@@ -31,9 +33,9 @@
     * @param serviceSubtaskVO 单一任务（随访）
     * @return 单一任务（随访）集合
     */
    public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
    public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskEntity serviceSubtaskVO);

    public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskVO serviceSubtaskVO);
    public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskEntity serviceSubtaskVO);

    /**
     * 根据条件查询任务信息
@@ -46,11 +48,11 @@
    /**
     * 查询患者随访信息
     */
    public List<ServiceSubtask> patItem(ServiceSubtaskVO serviceSubtaskVO);
    public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity);

    public List<ServiceSubtask> patItem2(ServiceSubtaskVO serviceSubtaskVO);
    public List<ServiceSubtask> patItem2(ServiceSubtaskEntity serviceSubtaskEntity);

    public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO);
    public Map<String, Object> patItemCount(ServiceSubtaskEntity serviceSubtaskEntity);

    /**
     * 新增单一任务（随访）
@@ -146,4 +148,15 @@
    public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS);

    public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList) ;

    public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity);

    /**
     * 按病区或科室统计延续护理数量
     * 都不传时同时按病区和科室各统计一遍
     *
     * @param vo 查询条件（leavehospitaldistrictcodes 与 deptcodes 互斥）
     * @return noContinueCount、ContinueCount 及 detail 列表
     */
    Map<String, Object> getContinueNurseCount(ServiceSubtaskCotinueCountVO vo);
    }