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

Conflicts:
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorServiceApplicationService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/MessageUtil.java
	svr/svr-door-serivce/src/main/resources/application.yml

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoctorController.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.door.controller.BaseController;
import com.yihu.jw.door.dao.DoorServiceOrderDao;
import com.yihu.jw.door.service.DoorOrderService;
import com.yihu.jw.door.service.common.PatientService;
import com.yihu.jw.door.service.common.WlyyMessageService;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -44,6 +46,26 @@ public class DoctorController extends BaseController {
    private BaseOrgDao orgDao;
    @Autowired
    private WlyyMessageService messageService;
    @Autowired
    private DoorOrderService doorOrderService;
    @Autowired
    DoorServiceOrderDao doorServiceOrderDao;
    @GetMapping(value = "/appointmentRevisitOnDoor")
    @ApiOperation("appointmentRevisitOnDoor")
    public String patientList(String orderId,String doctorId
    ) {
        try {
            doorOrderService.appointmentRevisitOnDoor(doorServiceOrderDao.findOne(orderId),doctorId);
            return write(200, "查询成功", "data", "");
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }
    @RequestMapping(value = "message/getWaitingMessages",method = RequestMethod.GET)
    @ApiOperation("获取服务工单待接单列表")

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorOrderService.java

@@ -28,6 +28,8 @@ import com.yihu.jw.util.http.HttpClientUtil;
import jxl.Workbook;
import jxl.write.*;
import org.apache.commons.lang.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -435,13 +437,15 @@ public class DoorOrderService {
        String url = hospitalUrl + "/open/noLogin/appointmentRevisitOnDoor";
        JSONObject json = new JSONObject();
        json.put("outpatientJson", outpatientJson);
        String res = httpClientUtil.postBody(url,json);
        JSONObject resJson = JSON.parseObject(res);
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("outpatientJson", outpatientJson.toJSONString()));
        String response = httpClientUtil.post(url,params ,"UTF-8");
        JSONObject resJson = JSON.parseObject(response);
        if( 200 == resJson.getInteger("status")){
            orderDO.setOutpatientId(resJson.getJSONObject("obj").getString("id"));
            doorServiceOrderDao.save(orderDO);
        }
        System.out.println("appointmentRevisitOnDoor res:"+res);
        System.out.println("appointmentRevisitOnDoor res:"+response);
    }
    /**

svr/svr-door-serivce/src/main/resources/application.yml

@@ -331,7 +331,7 @@ server:
base:
  url: http://127.0.0.1:10020/svr-base/
  hospitalUrl: http://127.0.0.1:10022/
  hospitalUrl: http://10.9.1.247:10022/
wechat:
  appId: wxad04e9c4c5255acf