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

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/wechat/WechatMenuController.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/EntranceService.java

@@ -1053,6 +1053,44 @@ public class EntranceService {
                if (StringUtils.isNotBlank(vo.getFixationfluid())) {
                    sbs.append(" fixationfluid=\"" + vo.getFixationfluid() + "\"");
                }
                /**
                 * 补充患者信息
                 * social_no 身份证、tell_phone 手机号、address1联系地址、address2、address3、address4、address5 area区、target职称类别
                 */
                if (StringUtils.isNotBlank(vo.getSocialNo())) {
                    sbs.append(" social_no=\"" + vo.getSocialNo() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getTellPhone())) {
                    sbs.append(" tell_phone=\"" + vo.getTellPhone() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getAddress1())) {
                    sbs.append(" address1=\"" + vo.getAddress1() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getAddress2())) {
                    sbs.append(" address2=\"" + vo.getAddress2() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getAddress3())) {
                    sbs.append(" address3=\"" + vo.getAddress3() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getAddress4())) {
                    sbs.append(" address4=\"" + vo.getAddress4() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getAddress5())) {
                    sbs.append(" address5=\"" + vo.getAddress5() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getArea())) {
                    sbs.append(" area=\"" + vo.getArea() + "\"");
                }
                if (StringUtils.isNotBlank(vo.getTarget())) {
                    sbs.append(" target=\"" + vo.getTarget() + "\"");
                }
                logger.info("判断自取或者快递标识"+vo.getSelfDelivered());
                if (StringUtils.isNotBlank(vo.getSelfDelivered())){
                    sbs.append(" self_delivered=\"" + vo.getSelfDelivered() + "\"");
@@ -1813,6 +1851,28 @@ public class EntranceService {
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
    public JSONArray MS02019(boolean demoFlag) throws Exception {
        String fid = "MS02019";
        String resp = "";
        if (demoFlag) {
            resp = getJosnFileResullt(fid);
        } else {
            StringBuffer sbs = new StringBuffer();
            //AccessControl ：用户、密码、服务id
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>" + mqUser + "</UserName><Password>" + mqPwd + "</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>" + sourceSysCode + "</SourceSysCode><TargetSysCode>" + targetSysCode + "</TargetSysCode></MessageHeader>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>20000</endNum><Msg/>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
    /**
     * 同步医生到本地库，获取到医生的时候需要调用BS55010 查询医生的诊查费
     *

business/base-service/src/mqConfig/esbmq-config.xml

@@ -88,6 +88,8 @@
				<MS02016_1>EwellQ.S60.MS02016.GET</MS02016_1>
				<MS02017_0>EwellQ.S60.MS02017.PUT</MS02017_0>
				<MS02017_1>EwellQ.S60.MS02017.GET</MS02017_1>
				<MS02019_1>EwellQ.S60.MS02019.GET</MS02019_1>
				<MS02019_0>EwellQ.S60.MS02019.PUT</MS02019_0>
				<!--检查检验end-->
				<!-- 预约挂号start-->

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyHisPrescriptionVO.java

@@ -128,6 +128,23 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
    private String selfDelivered;//快递是否1是0否
    //患者信息
/*
    补充字段 social_no、tell_phone、address1、address2、address3、address4、address5 area、target
*/
    private String socialNo;
    private String tellPhone;
    private String address1;
    private String address2;
    private String address3;
    private String address4;
    private String address5;
    private String area;
    private String target;
@@ -442,4 +459,76 @@ public class WlyyHisPrescriptionVO extends UuidIdentityVOWithOperator {
    public void setSelfDelivered(String selfDelivered) {
        this.selfDelivered = selfDelivered;
    }
    public String getSocialNo() {
        return socialNo;
    }
    public void setSocialNo(String socialNo) {
        this.socialNo = socialNo;
    }
    public String getTellPhone() {
        return tellPhone;
    }
    public void setTellPhone(String tellPhone) {
        this.tellPhone = tellPhone;
    }
    public String getAddress1() {
        return address1;
    }
    public void setAddress1(String address1) {
        this.address1 = address1;
    }
    public String getAddress2() {
        return address2;
    }
    public void setAddress2(String address2) {
        this.address2 = address2;
    }
    public String getAddress3() {
        return address3;
    }
    public void setAddress3(String address3) {
        this.address3 = address3;
    }
    public String getAddress4() {
        return address4;
    }
    public void setAddress4(String address4) {
        this.address4 = address4;
    }
    public String getAddress5() {
        return address5;
    }
    public void setAddress5(String address5) {
        this.address5 = address5;
    }
    public String getArea() {
        return area;
    }
    public void setArea(String area) {
        this.area = area;
    }
    public String getTarget() {
        return target;
    }
    public void setTarget(String target) {
        this.target = target;
    }
}

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/MqSdkController.java

@@ -377,6 +377,14 @@ public class MqSdkController extends EnvelopRestEndpoint {
        return success(entranceService.MS02014(demoFlag));
    }
    @GetMapping(value = "/MS02019")
    @ApiOperation(value = "五级地址字典")
    public ListEnvelop MS02019() throws Exception{
        JSONArray  obj = entranceService.MS02019(demoFlag);
        return success(obj);
    }
    @PostMapping(value = "/ehospitalNotice")
    @ApiOperation(value = "互联网医院通知")
    public ObjEnvelop ehospitalNotice(

svr/svr-internet-hospital-entrance/src/mqConfig/esbmq-config.xml

@@ -94,6 +94,8 @@
				<MS02016_1>EwellQ.S60.MS02016.GET</MS02016_1>
				<MS02017_0>EwellQ.S60.MS02017.PUT</MS02017_0>
				<MS02017_1>EwellQ.S60.MS02017.GET</MS02017_1>
				<MS02019_1>EwellQ.S60.MS02019.GET</MS02019_1>
				<MS02019_0>EwellQ.S60.MS02019.PUT</MS02019_0>
				<!--检查检验end-->
				<!-- 预约挂号start-->