代码修改

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/consult/controller/ConsultController.java

@@ -12,6 +12,7 @@ import com.yihu.jw.hospital.module.consult.service.ConsultTeamService;
import com.yihu.jw.hospital.utils.WeiXinAccessTokenUtils;
import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.dao.ConsultTeamDao;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.im.util.ImageCompress;
import com.yihu.jw.message.service.MessageService;
@@ -58,7 +59,8 @@ public class ConsultController extends EnvelopRestEndpoint {
    @Autowired
    private ConsultTeamService consultTeamService;
    @Autowired
    private ImService imService;
    @Autowired
    private BaseDoctorInfoService doctorService;
@@ -96,39 +98,6 @@ public class ConsultController extends EnvelopRestEndpoint {
    @Value("${im.data_base_name}")
    private String im;
//    //    @Value("${doctorAssistant.api}")
//    private String doctorAssistant;
//
//    //    @Value("${doctorAssistant.target_url}")
//    private String targetUrl;
//    @Value("${spring.profiles}")
//    private String springProfile;
//    @Autowired
//    private RedisTemplate redisTemplate;
//    @Autowired
//    private PushMsgTask pushMsgTask;
//    @Autowired
//    private PrescriptionDao prescriptionDao;
//    @Autowired
//    private DoctorCommentService doctorCommentService;
//    @Autowired
//    private DoctorStatisticsService doctorStatisticsService;
//    @Autowired
//    private DoctorWorkTimeService doctorWorkTimeService;
//    @Autowired
//    private SignFamilyDao signFamilyDao;
//    @Autowired
//    private PrescriptionDiagnosisService prescriptionDiagnosisService;
//    @Autowired
//    private ExaminationDao examinationDao;
//    @Autowired
//    private WlyyDynamicMessagesDao dynamicMessagesDao;
    /**
     * 获取未完成咨询
     *
@@ -153,22 +122,21 @@ public class ConsultController extends EnvelopRestEndpoint {
     * @param doctor 医生
     * @return
     */
//    @RequestMapping(value = "/is_consult_unfinished", method = {RequestMethod.GET, RequestMethod.POST})
//    @ApiOperation("查询居民与某个医生是否存在未结束的咨询")
//    public String isExistsUnfinishedConsult(@RequestParam(required = true) String doctor) {
//        try {
//            List<ConsultTeamDo> consults = consultTeamService.getUnfinishedConsult(getRepUID(), doctor);
//
//            if (consults != null && consults.size() > 0) {
//                return write(200, "查询成功", "data", consults.get(0).getConsult());
//            } else {
//                return write(200, "查询成功", "data", "");
//            }
//        } catch (Exception e) {
//            error(e);
//            return error(-1, "查询失败");
//        }
//    }
    @RequestMapping(value = "/is_consult_unfinished", method = {RequestMethod.GET, RequestMethod.POST})
    @ApiOperation("查询居民与某个医生是否存在未结束的咨询")
    public String isExistsUnfinishedConsult(@RequestParam(required = true) String doctor,@RequestParam(required = true) Integer type) {
        try {
            String consults = imService.getUnfinishedConsult(getRepUID(), doctor,type);
            if (StringUtils.isNotBlank(consults)) {
                return write(200, "查询成功", "data", consults);
            } else {
                return write(200, "查询成功", "data", "");
            }
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
        }
    }
    /**