Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/admin/AdminDoorCoachOrderController.java

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.admin;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.admin.AdminDoorCoachOrderService;
import com.yihu.jw.care.service.consult.ConsultTeamService;
@@ -63,6 +64,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "proxyCreate")
    @ApiOperation(value = "创建上门预约咨询--医生代预约")
    @ObserverRequired
    public String create(@ApiParam(name = "jsonData", value = "Json数据", required = true) @RequestParam String jsonData) {
        try{
            JSONObject result = patientDoorCoachOrderService.proxyCreate(jsonData,getUID());
@@ -115,6 +117,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "sendOrderToDoctor")
    @ApiOperation(value = "调度员给医生派单")
    @ObserverRequired
    public String sendOrderToDoctor(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "remark", value = "调度员备注") @RequestParam(value = "remark", required = false) String remark,
@@ -136,6 +139,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "transferOrder")
    @ApiOperation(value = "医生转派单")
    @ObserverRequired
    public String transferOrder(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "remark", value = "当前医生备注") @RequestParam(value = "remark", required = false) String remark,
@@ -157,6 +161,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("acceptOrder")
    @ApiOperation(value = "接单")
    @ObserverRequired
    public String acceptOrder(
            @ApiParam(value = "工单id", name = "orderId", required = true) @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(value = "医生职称code", name = "jobCode", required = false) @RequestParam(value = "jobCode", required = false) String jobCode,
@@ -172,6 +177,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("refuse")
    @ApiOperation(value = "拒单")
    @ObserverRequired
    public String refuseOrder(
            @ApiParam(value = "工单id", name = "orderId", required = true)
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -187,6 +193,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "cancelOrder")
    @ApiOperation(value = "取消工单")
    @ObserverRequired
    public String cancelOrder(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "type", value = "取消类型：1-调度员主动取消，2-居民取消, 3-医生取消") @RequestParam(value = "type", required = true) int type,
@@ -207,6 +214,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("signIn")
    @ApiOperation(value = "上门预约签到")
    @ObserverRequired
    public String signIn(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -234,6 +242,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("updateDoorConclusion")
    @ApiOperation("编辑保存服务工单小结")
    @ObserverRequired
    public String updateDoorConclusion(
            @ApiParam(value = "工单id", name = "orderId",required = true)
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -277,6 +286,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("saveOrderFinishByDoctor")
    @ApiOperation(value = "确认完成工单")
    @ObserverRequired
    public String saveOrderFinishByDoctor(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -293,6 +303,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("updateArrivingTime")
    @ApiOperation(value = "修改预计到达时间")
    @ObserverRequired
    public String updateArrivingTime(
            @ApiParam(value = "工单id", name = "orderId")
            @RequestParam(value = "orderId", required = true) String orderId,
@@ -493,6 +504,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "payOrder")
    @ApiOperation(value = "医生确认付款")
    @ObserverRequired
    public ObjEnvelop payOrder(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "payWay", value = "支付方式：1-微信支付，2-线下支付") @RequestParam(value = "payWay", required = false,defaultValue = "2") int payWay) {
@@ -527,6 +539,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("/initDoorStatus")
    @ApiOperation(value = "初始化医生分派订单开关状态")
    @ObserverRequired
    public String initDoorStatus() {
        try {
            doctorDoorCoachOrderService.initDoorStatus(null);
@@ -553,6 +566,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping("/dispatchOrderSwitch")
    @ApiOperation(value = "分派订单开关修改")
    @ObserverRequired
    public String dispatchOrderSwitch(
            @ApiParam(name = "doctor", value = "医生code")
            @RequestParam(value = "doctor", required = true) String doctor,
@@ -568,6 +582,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "dispatcherIntoTopic")
    @ApiOperation(value = "调度员进入会话")
    @ObserverRequired
    public ObjEnvelop dispatcherIntoTopic(
            @ApiParam(name = "orderId", value = "工单id", required = true) @RequestParam String orderId,
            @ApiParam(name = "hospitalName", value = "机构名称", required = true) @RequestParam String hospitalName,
@@ -628,6 +643,7 @@ public class AdminDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "updateOrderCardInfo")
    @ApiOperation(value = "更新预约简要信息")
    @ObserverRequired
    public String updateOrderCardInfo(
            @ApiParam(name = "jsonData", value = "json数据") @RequestParam(value = "jsonData", required = true) String jsonData) {
        try{

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/DoctorHealthController.java

@@ -57,6 +57,7 @@ public class DoctorHealthController extends BaseController {
	 */
	@RequestMapping(value = "chart",method = RequestMethod.POST)
	@ApiOperation("根据患者标志获取健康指标(图表)")
	@ObserverRequired
	public String getHealthIndexChartByPatient(@ApiParam(name="patient",value="患者代码",defaultValue = "eb0b478fbe9245428ecf63cd7517206f")
												   @RequestParam(value="patient",required = true) String patient,
											   @ApiParam(name="type",value="指标类型",defaultValue = "1")
@@ -87,6 +88,7 @@ public class DoctorHealthController extends BaseController {
	 */
	@RequestMapping(value = "list",method = RequestMethod.POST)
	@ApiOperation("根据患者标志获取健康指标")
	@ObserverRequired
	public String getHealthIndexByPatient(@ApiParam(name="patient",value="患者代码",defaultValue = "P20160901001")
											  @RequestParam(value="patient",required = true) String patient,
										  @ApiParam(name="type",value="指标类型",defaultValue = "1")
@@ -126,6 +128,7 @@ public class DoctorHealthController extends BaseController {
	 */
	@RequestMapping(value = "list1",method = RequestMethod.POST)
	@ApiOperation("根据患者标志获取健康指标")
	@ObserverRequired
	public String getHealthIndexByPatient1(@ApiParam(name="patient",value="患者代码",defaultValue = "P20160901001")
										  @RequestParam(value="patient",required = true) String patient,
										  @ApiParam(name="type",value="指标类型",defaultValue = "1")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PadDeviceController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.dao.device.DeviceDetailDao;
import com.yihu.jw.care.dao.device.PatientDeviceDao;
import com.yihu.jw.care.endpoint.BaseController;
@@ -117,6 +118,7 @@ public class PadDeviceController extends BaseController {
    @ApiOperation("设备保存接口(平板端绑定设备  设备为报警器时需要填写投放地址)")
    @RequestMapping(value = "SavePatientDevice", method = RequestMethod.POST)
    @ObserverRequired
    public String saveDevice(@ApiParam(name = "json", value = "设备数据json", defaultValue = "{     \"deviceId\":\"3\",     \"deviceName\":\"血压计-优瑞恩\",     \"deviceSn\":\"7052169111\",     \"categoryCode\":\"7\",     \"userType\":\"-1\", \"sosAddress\":\"福建省厦门市思明区望海路55号之1\" }")
                             @RequestParam(value = "json", required = true) String json,
                             @ApiParam(name = "patient", value = "居民code") @RequestParam(value = "patient", required = false) String patientCode,
@@ -176,6 +178,7 @@ public class PadDeviceController extends BaseController {
    @ApiOperation("设备解绑接口(平板端解绑设备 )")
    @RequestMapping(value = "delDeviceByDeviceSn", method = RequestMethod.POST)
    @ObserverRequired
    public String delDeviceByDeviceSn(
                             @ApiParam(name = "deviceSn", value = "设备sn码") @RequestParam(value = "deviceSn", required = false) String deviceSn
    ) {
@@ -204,6 +207,7 @@ public class PadDeviceController extends BaseController {
    @RequestMapping(value ="addPatientSosContacts",method = RequestMethod.POST)
    @ApiOperation(value = "设备绑定添加联系人")
    @ObserverRequired
    public String addPatientSosContacts(@ApiParam(name = "patient", value = "patient", defaultValue = "patient")
                                           @RequestParam(value = "patient", required = true) String patient,
                                        @ApiParam(name = "jsonStr", value = "patient", defaultValue = "patient")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PatientDeviceController.java

@@ -2,6 +2,7 @@ package com.yihu.jw.care.endpoint.device;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.dao.device.PatientDeviceDao;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.DeviceDetailService;
@@ -100,6 +101,7 @@ public class PatientDeviceController extends BaseController {
     */
    @ApiOperation("设备保存接口")
    @RequestMapping(value = "SavePatientDevice", method = RequestMethod.POST)
    @ObserverRequired
    public String saveDevice(@ApiParam(name = "json", value = "设备数据json", defaultValue = "{\"deviceId\": \"3\",\"deviceName\": \"血压计-优瑞恩\",\"deviceSn\": \"7052169111\",\"categoryCode\": \"1\",\"userType\": \"-1\"}")
                             @RequestParam(value = "json", required = true) String json,
                             @ApiParam(name = "sleepPlanJson", value = "睡眠计划json") @RequestParam(value = "sleepPlanJson", required = false) String sleepPlanJson,
@@ -264,6 +266,7 @@ public class PatientDeviceController extends BaseController {
    @ApiOperation("获取居民的设备任务信息")
    @RequestMapping(value = "getPatientDeviceTaskInfo",method = RequestMethod.POST)
    @ObserverRequired
    public String getPatientDeviceTaskInfo(@ApiParam(name = "patientCode",value = "患者code")@RequestParam(value = "patientCode",required = true)String patientCode){
        try {
            return write(200,"执行成功","data",patientDeviceService.getPatientDeviceTaskInfo(patientCode));
@@ -285,6 +288,7 @@ public class PatientDeviceController extends BaseController {
    @ApiOperation("修改删除 爱牵挂亲情号码--未使用")
    @RequestMapping(value = "updAqgDeviceSosInfo",method = RequestMethod.POST)
    @ObserverRequired
    public String updAqgDeviceSosInfo(@ApiParam(name = "deviceSn",value = "设备id")
                                   @RequestParam(value = "deviceSn",required = true)String deviceSn,
                                   @ApiParam(name = "seqid",value = "亲情号码id")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/PatientHealthController.java

@@ -1,5 +1,6 @@
package com.yihu.jw.care.endpoint.device;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.PatientHealthIndexService;
import com.yihu.jw.entity.care.device.DevicePatientHealthIndex;
@@ -39,6 +40,7 @@ public class PatientHealthController extends BaseController {
    @RequestMapping(value = "/modify", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("更改接口（包括手动记录的修改和所有的删除）")
    @ObserverRequired
    public String modify(@RequestParam long id,
                         @RequestParam(required = false) String recordDate,
                         @RequestParam(required = false) String value1,
@@ -297,6 +299,7 @@ public class PatientHealthController extends BaseController {
    @RequestMapping(value = "addPatientHealthIndex", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("新增患者指标")
    @ObserverRequired
    public String addPatientHealthIndex(@ApiParam(name = "data", value = "指标数据", defaultValue = "{\"gi\":\"5.5\",\"gi_type\":\"1\"}")
                                        @RequestParam(value = "data", required = true) String data,
                                        @ApiParam(name = "type", value = "指标类型", defaultValue = "1")
@@ -330,6 +333,7 @@ public class PatientHealthController extends BaseController {
    @RequestMapping(value = "verifyPatientHealthIndex", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("校验患者指标")
    @ObserverRequired
    public String verifyPatientHealthIndex(@ApiParam(name = "id", value = "指标id", defaultValue = "")
                                           @RequestParam(value = "id", required = true) Long id) {
        try {
@@ -347,6 +351,7 @@ public class PatientHealthController extends BaseController {
    @RequestMapping(value = "chart", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("根据患者标志获取健康指标(图表)")
    @ObserverRequired
    public String getHealthIndexChartByPatient(@ApiParam(name = "type", value = "指标类型（1血糖，2血压，3体重，4腰围）", defaultValue = "1")
                                               @RequestParam(value = "type", required = true) int type,
                                               @ApiParam(name = "gi_type", value = "就餐类型0全部", defaultValue = "1")
@@ -371,6 +376,7 @@ public class PatientHealthController extends BaseController {
    @RequestMapping(value = "chart_new", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("根据患者标志获取健康指标(图表)-展会")
    @ObserverRequired
    public String getHealthIndexChartByPatient_new(@ApiParam(name = "type", value = "指标类型（1血糖，2血压，3体重，4腰围）", defaultValue = "1")
                                               @RequestParam(value = "type", required = true) int type,
                                               @ApiParam(name = "gi_type", value = "就餐类型0全部", defaultValue = "1")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doorCoach/PatientDoorCoachOrderController.java

@@ -1,6 +1,7 @@
package com.yihu.jw.care.endpoint.doorCoach;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.service.doorCoach.DoctorDoorCoachOrderService;
import com.yihu.jw.care.service.doorCoach.PatientDoorCoachOrderService;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
@@ -35,6 +36,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "qucikSendIM")
    @ApiOperation(value = "通过IM向客户端推送消息")
    @ObserverRequired
    public Envelop qucikSendIM(
            @ApiParam(name = "orderId", value = "工单id", required = true) @RequestParam String orderId,
            @ApiParam(name = "sendId", value = "发送者code", required = false) @RequestParam String sendId,
@@ -56,6 +58,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "create")
    @ApiOperation(value = "创建上门预约工单")
    @ObserverRequired
    public Envelop create(@ApiParam(name = "jsonData", value = "Json数据", required = true) @RequestParam String jsonData) {
        JSONObject result = new JSONObject();
        try{
@@ -71,6 +74,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "delete")
    @ApiOperation(value = "删除")
    @ObserverRequired
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true) @RequestParam(value = "ids") String ids) {
        try {
@@ -84,6 +88,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "update")
    @ApiOperation(value = "更新")
    @ObserverRequired
    public Envelop update(@ApiParam(name = "jsonData", value = "Json数据", required = true) @RequestParam String jsonData) {
        try {
            JSONObject result = patientDoorCoachOrderService.update(jsonData);
@@ -99,6 +104,7 @@ public class PatientDoorCoachOrderController extends EnvelopRestEndpoint {
    @PostMapping(value = "cancelOrder")
    @ApiOperation(value = "取消工单")
    @ObserverRequired
    public Envelop cancelOrder(
            @ApiParam(name = "orderId", value = "工单id") @RequestParam(value = "orderId", required = true) String orderId,
            @ApiParam(name = "reason", value = "取消理由") @RequestParam(value = "reason", required = true) String reason) {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/device/PDeviceController.java

@@ -1,6 +1,7 @@
package com.yihu.jw.care.endpoint.third.device;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.dao.device.PatientDeviceDao;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.DeviceDetailService;
@@ -46,6 +47,7 @@ public class PDeviceController extends BaseController {
    @ApiOperation("获取居民的设备任务信息")
    @RequestMapping(value = "getPatientDeviceTaskInfo",method = RequestMethod.POST)
    @ObserverRequired
    public String getPatientDeviceTaskInfo(@ApiParam(name = "patientCode",value = "患者code")@RequestParam(value = "patientCode",required = true)String patientCode){
        try {
            return write(200,"执行成功","data",patientDeviceService.getPatientDeviceTaskInfo(patientCode));
@@ -67,6 +69,7 @@ public class PDeviceController extends BaseController {
    @ApiOperation("修改删除 爱牵挂亲情号码")
    @RequestMapping(value = "updAqgDeviceSosInfo",method = RequestMethod.POST)
    @ObserverRequired
    public String updAqgDeviceSosInfo(@ApiParam(name = "deviceSn",value = "设备id")
                                   @RequestParam(value = "deviceSn",required = true)String deviceSn,
                                   @ApiParam(name = "seqid",value = "亲情号码id")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/wechat/WechatCoreController.java

@@ -1,6 +1,7 @@
package com.yihu.jw.care.endpoint.wechat;
import com.yihu.jw.care.aop.ObserverRequired;
import com.yihu.jw.care.service.wechat.WeiXinCoreService;
import com.yihu.jw.entity.base.wx.WxAccessTokenDO;
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
@@ -84,6 +85,7 @@ public class WechatCoreController extends EnvelopRestEndpoint {
     */
    @RequestMapping(method = RequestMethod.POST)
    @ResponseBody
    @ObserverRequired
    public void receiveMessages(HttpServletRequest request, HttpServletResponse response) {
        try {
            String signature = request.getParameter("signature").toString();