海沧医保接口

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

@@ -12806,7 +12806,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                String url = "https://hlwyy.xmzsh.com/hlwyy/ims-wx/#/nucleicTest/detail?id=" + baseNatAppointmentDO.getId();
                                String date = DateUtil.dateToStrLong(baseNatAppointmentDO.getAppointmentTime());
                                WlyyHospitalSysDictDO hospitalSysDictDO1 = wlyyHospitalSysDictDao.findById("natConfigTestNew");
                                String addres = "我院五号楼北侧（急诊部后侧）";
                                String addres = "我院发热门诊的核酸采样点（采样时间为8：00～12：00，14：00～17：30）。";
                                String timeDes = "6-8小时";
                                if (hospitalSysDictDO1!=null){
                                    com.alibaba.fastjson.JSONArray array1 = com.alibaba.fastjson.JSONArray.parseArray(hospitalSysDictDO1.getDictValue());
@@ -12821,7 +12821,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                                }
                                String first = "尊敬的用户" + baseNatAppointmentDO.getName() + "，您已完成线上自助核酸检测预约申请";
                                String contentMsg = "申请人：" + baseNatAppointmentDO.getName() + "\r\n 预约时间：" + date + " \r\n发票流水号：" + baseNatAppointmentDO.getRealOrder();
                                String remark = "1、请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+"核酸检测点领取标本试管窗口绑定检测。\r\n" +
                                String remark = "1、请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+
                                        "2、核酸检测标本采集"+timeDes+"后出具报告。请关注厦门大学附属中山医院微信公众号查询；如需打印，请至厦门大学附属中山医院核酸检测点自助机打印。";
                                String responseMsg = "";
                                responseMsg = entranceService.ehospitalNotice(
@@ -13248,7 +13248,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                String url="";
                String date = DateUtil.dateToStrLong(baseNatAppointmentDO.getAppointmentTime());
                WlyyHospitalSysDictDO hospitalSysDictDO1 = wlyyHospitalSysDictDao.findById("natConfigTestNew");
                String addres = "我院五号楼北侧（急诊部后侧）";
                String addres = "我院发热门诊的核酸采样点（采样时间为8：00～12：00，14：00～17：30）。";
                String timeDes = "6-8小时";
                if (hospitalSysDictDO1!=null){
                    com.alibaba.fastjson.JSONArray array1 = com.alibaba.fastjson.JSONArray.parseArray(hospitalSysDictDO1.getDictValue());
@@ -13263,7 +13263,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
                String contentMsg="申请人："+baseNatAppointmentDO.getName()+"\r\n预约时间："+date;
                String remark = "1、请于预约时间"+date+"前，携带医保卡/就诊卡/电子健康卡到院区自助机进行结算。\r\n" +
                        "2、结算完成后请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+"核酸检测点领取标本试管窗口绑定检测。\r\n" +
                        "2、结算完成后请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+
                        "3、核酸检测标本采集"+timeDes+"后出具报告。请关注厦门大学附属中山医院微信公众号查询；如需打印，请至厦门大学附属中山医院核酸检测点自助机打印。";
                if ("xm_zsyy_wx".equalsIgnoreCase(wechatId)) {
                    responseMsg = entranceService.ehospitalNotice(
@@ -13287,7 +13287,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                String date = DateUtil.dateToStrLong(baseNatAppointmentDO.getAppointmentTime());
                jsonObject.put("keyword2","申请人："+baseNatAppointmentDO.getName()+"\n预约时间："+date);
                WlyyHospitalSysDictDO hospitalSysDictDO1 = wlyyHospitalSysDictDao.findById("natConfigTestNew");
                String addres = "我院五号楼北侧（急诊部后侧）";
                String addres = "我院发热门诊的核酸采样点（采样时间为8：00～12：00，14：00～17：30）。";
                String timeDes = "6-8小时";
                if (hospitalSysDictDO1!=null){
                    com.alibaba.fastjson.JSONArray array1 = com.alibaba.fastjson.JSONArray.parseArray(hospitalSysDictDO1.getDictValue());
@@ -13301,7 +13301,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }
                String remark =  "1、请于预约时间"+date+"前，携带医保卡/就诊卡/电子健康卡到院区自助机进行结算。\n" +
                        "2、结算完成后请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+"核酸检测点领取标本试管窗口绑定检测。\n" +
                        "2、结算完成后请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+
                        "3、核酸检测标本采集"+timeDes+"后出具报告。请关注厦门大学附属中山医院微信公众号查询；如需打印，请至厦门大学附属中山医院核酸检测点自助机打印。";
                jsonObject.put("remark",remark);
                jsonObject.put("url","111111");
@@ -13739,7 +13739,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    "发票流水号："+realorder+"");
            BaseNatAppointmentDO baseNatAppointmentDO = baseNatAppointmentDao.findOne(id);
            WlyyHospitalSysDictDO hospitalSysDictDO1 = wlyyHospitalSysDictDao.findById("natConfigTestNew");
            String addres = "我院五号楼北侧（急诊部后侧）";
            String addres = "我院发热门诊的核酸采样点（采样时间为8：00～12：00，14：00～17：30）。";
            String timeDes = "6-8小时";
            if (hospitalSysDictDO1!=null){
                com.alibaba.fastjson.JSONArray array1 = com.alibaba.fastjson.JSONArray.parseArray(hospitalSysDictDO1.getDictValue());
@@ -13752,7 +13752,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    }
                }
            }
            String remark = "1、请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+"核酸检测点领取标本试管窗口绑定检测。\n" +
            String remark = "1、请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+
                    "2、核酸检测标本采集"+timeDes+"后出具报告。请关注厦门大学附属中山医院微信公众号查询；如需打印，请至厦门大学附属中山医院核酸检测点自助机打印。";
            jsonObject.put("remark",remark);
            jsonObject.put("url",redirdctUrl);

svr/svr-internet-hospital/pom.xml

@@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-internet-hospital-test</artifactId>
    <artifactId>svr-internet-hospital</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
@@ -267,7 +267,7 @@
    </dependencies>
    <build>
        <finalName>svr-internet-hospital-test</finalName>
        <finalName>svr-internet-hospital</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -1287,7 +1287,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                            String url = "https://hlwyy.xmzsh.com/hlwyy/ims-wx/#/nucleicTest/detail?id="+natAppointmentDO.getId();
                                            String date = DateUtil.dateToStrLong(natAppointmentDO.getAppointmentTime());
                                            WlyyHospitalSysDictDO hospitalSysDictDO = wlyyHospitalSysDictDao.findById("natConfigTestNew");
                                            String addres = "我院五号楼北侧（急诊部后侧）";
                                            String addres = "我院发热门诊的核酸采样点（采样时间为8：00～12：00，14：00～17：30）。";
                                            String timeDes = "6-8小时";
                                            if (hospitalSysDictDO!=null){
                                                com.alibaba.fastjson.JSONArray array = com.alibaba.fastjson.JSONArray.parseArray(hospitalSysDictDO.getDictValue());
@@ -1302,7 +1302,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                            }
                                            String first = "尊敬的用户"+natAppointmentDO.getName()+"，您已完成线上自助核酸检测预约申请";
                                            String contentMsg = "申请人："+natAppointmentDO.getName()+"\r\n 预约时间："+date+" \r\n发票流水号："+waitPayDetailVO.getRecipeNo();
                                            String remark="1、请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres+"核酸检测点领取标本试管窗口绑定检测。\r\n" +
                                            String remark="1、请您持核酸预约申请信息和发票流水号、医保卡/就诊卡/电子健康卡，准时至"+addres +
                                                    "2、核酸检测标本采集"+timeDes+"后出具报告。请关注厦门大学附属中山医院微信公众号查询；如需打印，请至厦门大学附属中山医院核酸检测点自助机打印。";
                                            String responseMsg="";
                                            if ("xm_zsyy_wx".equalsIgnoreCase(wxId)) {