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

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

@@ -214,9 +214,10 @@ public class RehabilitationManageService extends BaseService {
     * @return
     * @throws Exception
     */
    public JSONArray serviceItemList(String planDetailIds) throws Exception{
    public JSONArray serviceItemList(String planDetailIds,String doctorCode) throws Exception{
        Map<String, Object> param = new HashedMap();
        param.put("planDetailIds", planDetailIds);
        param.put("doctorCode", doctorCode);
        HttpResponse response = HttpUtils.doGet(specialistUrl + serviceItemList, param);
        JSONObject result = new JSONObject(response.getContent());
        JSONArray jsonArray = null;
@@ -244,9 +245,10 @@ public class RehabilitationManageService extends BaseService {
     * @return
     * @throws Exception
     */
    public JSONObject serviceItem(String planDetailId) throws Exception{
    public JSONObject serviceItem(String planDetailId,String doctorCode) throws Exception{
        Map<String, Object> param = new HashedMap();
        param.put("planDetailId", planDetailId);
        param.put("doctorCode", doctorCode);
        HttpResponse response = HttpUtils.doGet(specialistUrl + serviceItem, param);
        JSONObject result = new JSONObject(response.getContent());
        if(result.getInt("status")==200){

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

@@ -142,10 +142,15 @@ public class DoctorRehabilitationManageController extends BaseController {
    @ApiOperation("康复管理-多个康复计划服务项目内容列表")
    @ObserverRequired
    public String serviceItemList(@ApiParam(name = "planDetailIds", value = "康复计划多个服务项目id（多个‘，’分隔）", required = true)
                                                   @RequestParam(value = "planDetailIds", required = true)String planDetailIds){
                                                   @RequestParam(value = "planDetailIds", required = true)String planDetailIds,
                                  @ApiParam(name = "doctorCode", value = "医生code", required = false)
                                  @RequestParam(value = "doctorCode", required = false)String doctorCode){
        try {
            JSONArray result = rehabilitationManageService.serviceItemList(planDetailIds);
            if(!StringUtils.isNotEmpty(doctorCode)){
                doctorCode = getRepUID();
            }
            JSONArray result = rehabilitationManageService.serviceItemList(planDetailIds,doctorCode);
            return write(200, "获取成功", "data", result);
        } catch (Exception e) {
            error(e);
@@ -157,10 +162,15 @@ public class DoctorRehabilitationManageController extends BaseController {
    @ApiOperation("康复管理-康复计划服务项目确认详情页")
    @ObserverRequired
    public String serviceItem(@ApiParam(name = "planDetailId", value = "康复计划服务项目id", required = true)
                                  @RequestParam(value = "planDetailId", required = true)String planDetailId){
                              @RequestParam(value = "planDetailId", required = true)String planDetailId,
                              @ApiParam(name = "doctorCode", value = "医生code", required = false)
                              @RequestParam(value = "doctorCode", required = false)String doctorCode){
        try {
            JSONObject result = rehabilitationManageService.serviceItem(planDetailId);
            if(!StringUtils.isNotEmpty(doctorCode)){
                doctorCode = getRepUID();
            }
            JSONObject result = rehabilitationManageService.serviceItem(planDetailId,doctorCode);
            return write(200, "获取成功", "data", result);
        } catch (Exception e) {
            error(e);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/specialist/rehabilitation/PatientRehabilitationManageController.java

@@ -188,7 +188,7 @@ public class PatientRehabilitationManageController extends BaseController {
                                  @RequestParam(value = "planDetailIds", required = true)String planDetailIds){
        try {
            JSONArray result = rehabilitationManageService.serviceItemList(planDetailIds);
            JSONArray result = rehabilitationManageService.serviceItemList(planDetailIds,null);
            return write(200, "获取成功", "data", result);
        } catch (Exception e) {
            error(e);
@@ -203,7 +203,7 @@ public class PatientRehabilitationManageController extends BaseController {
                              @RequestParam(value = "planDetailId", required = true)String planDetailId){
        try {
            JSONObject result = rehabilitationManageService.serviceItem(planDetailId);
            JSONObject result = rehabilitationManageService.serviceItem(planDetailId,null);
            return write(200, "获取成功", "data", result);
        } catch (Exception e) {
            error(e);