Merge branch 'dev' of wujunjie/patient-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/template/DoctorTeamGuidanceController.java

@@ -191,9 +191,9 @@ public class DoctorTeamGuidanceController extends WeixinBaseController {
                result = "个人模板标题重复";
            }
            JSONArray teams = new JSONArray(teamInfo);
            doctorTeamGuidanceService.modifyTeamGuidance(doctor,isLeader, saveAsGuidance, isRepeat,guidanceCode, title, teams, content, images);
            doctorTeamGuidanceService.modifyTeamGuidance(doctor, isLeader, saveAsGuidance, isRepeat, guidanceCode, title, teams, content, images);
            String str = "";
            return write(200, "修改团队模板成功！","result",result);
            return write(200, "修改团队模板成功！", "result", result);
        } catch (Exception e) {
            return invalidUserException(e, -1, e.getMessage());
        }
@@ -247,7 +247,7 @@ public class DoctorTeamGuidanceController extends WeixinBaseController {
            @ApiParam(value = "团队模板内容")
            @RequestParam String content,
            @ApiParam(value = "团队id")
            @RequestParam int teamId,
            @RequestParam String teamId,
            @ApiParam(value = "团队模板code")
            @RequestParam String guidanceCode,
            @ApiParam(value = "团队模板图片")
@@ -255,7 +255,12 @@ public class DoctorTeamGuidanceController extends WeixinBaseController {
        try {
            String accessToken = getAccessToken();
            String doctor = getUID();
            doctorTeamGuidanceService.sendTeamGuidance(accessToken, doctor, patient, content, guidanceCode, images, teamId);
            JSONArray teams = new JSONArray(teamId);
            for (Object team : teams) {
                JSONObject teamJson = new JSONObject(team.toString());
                int teamCode = teamJson.getInt("teamId");
                doctorTeamGuidanceService.sendTeamGuidance(accessToken, doctor, patient, content, guidanceCode, images,teamCode);
            }
            return write(200, "发送成功！");
        } catch (Exception e) {
            return invalidUserException(e, -1, e.getMessage());