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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/record/OutpatientController.java

@@ -8,10 +8,7 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -52,14 +49,15 @@ public class OutpatientController extends BaseController {
    @ApiOperation("XML转JSOn")
    @RequestMapping(value = "/xmlToJson", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    public String xmlToJson(@ApiParam(name="xml",value="xml")
                                      @RequestParam(value="xml",required = true) String xml) {
    public String xmlToJson(
            @ApiParam(name="xml",value="xml")
            @RequestBody String xml) {
        try {
            Map result = outpatientService.xmlToJson(xml);
            return write(200, "获取JSOn数据成功！", "data", result);
            return write(200, "获取XML转JSOn数据成功！", "data", result);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "获取JSOn数据成功！");
            return invalidUserException(e, -1, "获取XML转JSOn数据成功！");
        }
    }
@@ -103,4 +101,17 @@ public class OutpatientController extends BaseController {
        }
    }
    @ApiOperation("get0141")
    @RequestMapping(value = "/get0141", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    public String get0141() {
        try {
            Map result = outpatientService.getOutpatientDrugs();
            return write(200, "获取JSOn数据成功！", "data", result);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "获取JSOn数据成功！");
        }
    }
}