Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

@@ -23,6 +23,7 @@ import com.yihu.wlyy.repository.specialist.SpecialDiseaseDao;
import com.yihu.wlyy.repository.specialist.TeamDiseaseRelationDao;
import com.yihu.wlyy.repository.wechat.WechatTemplateConfigDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.label.SignPatientLabelService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.DateUtil;
@@ -84,6 +85,8 @@ public class SpecialistService extends BaseService {
    private WechatTemplateConfigDao templateConfigDao;
    @Autowired
    private AdminTeamService memberService;
    @Autowired
    SignPatientLabelService labelService;
    public String setPatientLabelInfo(List<SignPatientLabelInfo> list) {
        if (list != null && list.size() > 0) {
@@ -629,6 +632,9 @@ public class SpecialistService extends BaseService {
            Long teamCode = json.getLong("teamCode");
            List<Doctor> members = memberService.getMembers(teamCode);
            json.put("doctors",members);
    
            List<SignPatientLabel> labels = labelService.getLabelsByTypeAndTeam("8", "");
            json.put("labels",labels);
            
            return json;
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/SpecialistController.java

@@ -221,7 +221,10 @@ public class SpecialistController extends WeixinBaseController {
    public String agreeSpecialistTeam(@ApiParam(name = "state", value = "状态0为拒绝，1为同意") @RequestParam(required = true) String state,
                                      @ApiParam(name = "relationCode", value = "关联code") @RequestParam(required = true) String relationCode,
                                      @ApiParam(name = "remark", value = "审核失败原因") @RequestParam(required = false) String remark,
                                      @ApiParam(name = "mesId", value = "消息Id") @RequestParam(required = false) Long mesId) throws Exception {
                                      @ApiParam(name = "mesId", value = "消息Id") @RequestParam(required = false) Long mesId,
                                      @ApiParam(name = "labelcode", value = "健康情况") @RequestParam(required = false) String labelcode,
                                      @ApiParam(name = "doctorcode", value = "协管医生") @RequestParam(required = false) String doctorcode
                                      ) throws Exception {
        try {
            return write(200, "获取成功", "data", specialistService.agreeSpecialistTeam(getAccessToken(),state, relationCode, remark, mesId));
        } catch (Exception e) {
@@ -231,7 +234,7 @@ public class SpecialistController extends WeixinBaseController {
    }
    @RequestMapping(value = "/findPatientSigninfo", method = RequestMethod.GET)
    @ApiOperation(value = "医生审核")
    @ApiOperation(value = "根据专科医生签约CODE获取相关信息")
    @ObserverRequired
    public String findPatientSigninfo(@ApiParam(name = "code", value = "专科医生签约code")
                                      @RequestParam(required = true) String code,