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

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

@@ -5,7 +5,6 @@ import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
@@ -14,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
/**
 * Created by zhenglingfeng on 2016/10/17.
 */
@@ -49,12 +50,12 @@ public class OutpatientController extends BaseController {
    @ApiOperation("XML转JSOn")
    @RequestMapping(value = "/xmlToJson", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @RequestMapping(value = "/xmlToJson", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    public String xmlToJson(@ApiParam(name="strSSID",value="xml",defaultValue = "B09036263193")
    public String xmlToJson(@ApiParam(name="xml",value="xml")
                                      @RequestParam(value="xml",required = true) String xml) {
        try {
            JSONObject result = outpatientService.xmlToJson(xml);
            Map result = outpatientService.xmlToJson(xml);
            return write(200, "获取JSOn数据成功！", "data", result);
        } catch (Exception e) {
            error(e);
@@ -63,5 +64,43 @@ public class OutpatientController extends BaseController {
    }
    @ApiOperation("get0102")
    @RequestMapping(value = "/get0102", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    public String get0102() {
        try {
            Map result = outpatientService.getOutpatientCost();
            return write(200, "获取JSOn数据成功！", "data", result);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "获取JSOn数据成功！");
        }
    }
    @ApiOperation("get0121")
    @RequestMapping(value = "/get0121", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    public String get0121() {
        try {
            Map result = outpatientService.getOutpatientLabReport();
            return write(200, "获取JSOn数据成功！", "data", result);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "获取JSOn数据成功！");
        }
    }
    @ApiOperation("get0131")
    @RequestMapping(value = "/get0131", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    public String get0131() {
        try {
            Map result = outpatientService.getOutpatientExamReport();
            return write(200, "获取JSOn数据成功！", "data", result);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "获取JSOn数据成功！");
        }
    }
}