Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/SignFamily.java

@@ -346,6 +346,7 @@ public class SignFamily extends IdEntity {
        this.signType = signType;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "apply_date")
    public Date getApplyDate() {
        return applyDate;

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/common/account/BookingController.java

@@ -411,15 +411,13 @@ public class BookingController extends WeixinBaseController {
    @RequestMapping(value = "CancelOrder", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("取消挂号单")
    public String CancelOrder(@ApiParam(name = "orderId", value = "订单id")
                              @RequestParam(value = "orderId", required = true) Long orderId,
                              @ApiParam(name = "code", value = "订单code")
    public String CancelOrder(@ApiParam(name = "code", value = "订单code")
                              @RequestParam(value = "code", required = false) String code,
                              @ApiParam(name = "ssc", value = "社保卡号")
                              @RequestParam(value = "ssc", required = false) String ssc) {
        try {
            //获取订单信息
            PatientReservation obj = patientReservationService.findById(orderId);
            PatientReservation obj = patientReservationService.findByCode(code);
            boolean re = false;
            if(obj==null){
                re = jwSmjkService.CancelOrder(code,ssc);
@@ -431,7 +429,7 @@ public class BookingController extends WeixinBaseController {
            if (re) {
                //更新状态
                if(obj!=null){
                    patientReservationService.userCancelOrder(orderId,getUID());//"6c0cfe5065e011e69f7c005056850d66"
                    patientReservationService.userCancelOrder(code,getUID());//"6c0cfe5065e011e69f7c005056850d66"
                }
                return write(200, "取消挂号单成功！");

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/common/account/LoginController.java

@@ -49,12 +49,15 @@ public class LoginController extends BaseController {
    @ResponseBody
    public void userValidation(Model model, HttpServletRequest req, HttpServletResponse resp, String userName, String password) throws Exception {
        User curUser = userService.userValidation(userName, password);
        System.out.println("validation");
        ObjectMapper objectMapper = new ObjectMapper();
        if(curUser == null){
            System.out.println("curUser is null");
            req.setAttribute(FormAuthenticationFilter.DEFAULT_ERROR_KEY_ATTRIBUTE_NAME, "登入失败");
            req.getSession().setAttribute("isLogin", "false");
            resp.sendRedirect(req.getContextPath()+"/login");
        }else{
            System.out.println("curUser is success");
            model.addAttribute("current_user", curUser);
            //获取用户角色信息
            List<ManageFeature> features = getUserFeatures(curUser.getCode());
@@ -92,6 +95,9 @@ public class LoginController extends BaseController {
            if (curUser.getType() == 0) {
                curUser.setTypeName("其他");
            }
            System.out.println("curUser is success :userInfo"+curUser.toString());
            req.getSession().setAttribute("userInfo",curUser);
            req.getSession().setAttribute("mobile", curUser.getMobile());
            req.getSession().setAttribute("code",curUser.getCode());

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/reservation/PatientReservationService.java

@@ -114,8 +114,8 @@ public class PatientReservationService extends BaseService {
     * 客服取消预约
     */
    @Transactional
    public void userCancelOrder(Long id,String user) {
        PatientReservation obj = patientReservationDao.findOne(id);
    public void userCancelOrder(String code,String user) {
        PatientReservation obj = patientReservationDao.findByCode(code);
        if (obj.getStatus()!=0) {
            obj.setStatus(0);
            User u =userDao.findByCode(user);

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/common/thread/UploadChargeThread.java

@@ -1,6 +1,5 @@
package com.yihu.wlyy.sign.common.thread;
import com.yihu.wlyy.sign.common.util.DateUtil;
import com.yihu.wlyy.sign.common.util.SpringContextHolder;
import com.yihu.wlyy.sign.service.ChargeZYService;
import com.yihu.wlyy.sign.service.SystemDictService;

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/ChargeZYService.java

@@ -120,23 +120,28 @@ public class ChargeZYService {
            Patient patient = patientDao.findByCode(sign.getPatient());
            try {
                hm = getHospitalMapping(sign.getHospital()); //获取机构映射
    
                com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
                
                Map<String, String> params = new HashMap<>();
                params.put("IDENTITY_CARD_NO", idcard);  //身份证
                params.put("SIGN_MANAGE_YEAR", year);  //签约年度
                params.put("SICK_NAME", patient.getName());  //姓名
                jsonObject.put("IDENTITY_CARD_NO", idcard);//身份证
                jsonObject.put("SIGN_MANAGE_YEAR", year);//签约年度
                jsonObject.put("SICK_NAME", patient.getName());//姓名
                
                if(sign.getExpensesTime() == null){
                    //如果签约表的支付时间为空，则从支付表获取支付时间
                    Date newdate = DateUtil.formatCharDateYMD(charge.getChargeTime(),"yyyyMMddHHmmss");
                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(newdate));  //缴费时间
//                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(newdate));  //缴费时间
                    jsonObject.put("CHARGE_TIME", DateUtil.dateToStrLong(newdate));//缴费时间
                    sign.setExpensesTime(newdate);
                    sign.setExpensesStatus("1");//已支付
                }else{
                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(sign.getExpensesTime()));  //缴费时间
//                    params.put("CHARGE_TIME", DateUtil.dateToStrLong(sign.getExpensesTime()));  //缴费时间
                    jsonObject.put("CHARGE_TIME",DateUtil.dateToStrLong(sign.getExpensesTime()));//缴费时间
                }
                
               
                params.put("INSUR_PRO_ID", charge.getMiRegisterNo());  //医保签约号
    
                jsonObject.put("INSUR_PRO_ID",charge.getMiRegisterNo());//医保签约号
//                params.put("INSUR_PRO_ID", charge.getMiRegisterNo());  //医保签约号
                if("1".equals(sign.getRenewFlag())||"2".equals(sign.getRenewFlag())){
@@ -178,41 +183,43 @@ public class ChargeZYService {
                        return true;
                    }
                }
                params.put("PRO_ID", proId);  //标志(智业签约主键)
    
                jsonObject.put("PRO_ID",proId);////标志(智业签约主键)
//                params.put("PRO_ID", proId);  //标志(智业签约主键)
                operator = doctorMappingDao.findByDocotrCodeAndJwDoctorHospital(operator,hm[0]);  //【医生映射】
                if(operator==null)
                {
                    System.out.print("operator:"+operator+","+hm[0]);
                }
                params.put("CHARGE_OPERATOR", operator);  //收费医生
                jsonObject.put("CHARGE_OPERATOR",operator);////收费医生
//                params.put("CHARGE_OPERATOR", operator);  //收费医生
    
                //缴费明细---2017.12.12---黄文杰
                Map<String, String> INSUR_FEE_INFO = new HashMap<>();
//                Map<String, String> INSUR_FEE_INFO = new HashMap<>();
                com.alibaba.fastjson.JSONObject infoobj = new com.alibaba.fastjson.JSONObject();
                HospitalMapping hospitalMapping = hospitalMappingDao.getMappingCode(sign.getHospital(), "1");  //转换成基卫机构代码
                INSUR_FEE_INFO.put("qyjg00",hospitalMapping.getSbCode());//签约机构
                INSUR_FEE_INFO.put("qyys00",sign.getDoctorName());//签约医生
                INSUR_FEE_INFO.put("btlx00",sign.getExpensesType());//补贴类型
                INSUR_FEE_INFO.put("djjg00",hospitalMapping.getSbCode());//登记机构
                INSUR_FEE_INFO.put("djr000",sign.getDoctorName());//登记人
                INSUR_FEE_INFO.put("djsj00",DateUtil.dateToStrShort(sign.getBegin()));//登记时间
                INSUR_FEE_INFO.put("qyzt00",charge.getMiRegisterStatus());//登记状态
                INSUR_FEE_INFO.put("kfjg00",hospitalMapping.getSbCode());//扣费机构
                INSUR_FEE_INFO.put("kfrxm0",sign.getDoctorName());//扣费人
                INSUR_FEE_INFO.put("kfsj00",charge.getChargeTime());//扣费时间
                INSUR_FEE_INFO.put("kfzt00",charge.getMiCollectStatus());//扣费状态
                INSUR_FEE_INFO.put("kfdjh0",charge.getMiSettleNo());//扣费单据号
                INSUR_FEE_INFO.put("zje000",String.valueOf(charge.getMiTotalFee()));//扣费总额
                INSUR_FEE_INFO.put("zfbtzf",charge.getCadresPay());//政府补贴支付
                INSUR_FEE_INFO.put("tcjjzf",charge.getHealthCarePay());//医保统筹支付
                INSUR_FEE_INFO.put("jkzhzf",charge.getHeathPay());//健康账户支付
                INSUR_FEE_INFO.put("zhzfe0",charge.getAccountPay());//医保账户支付
                INSUR_FEE_INFO.put("xjzfe0",charge.getSelfPay());//个人现金自付
                INSUR_FEE_INFO.put("INSUR_FEE_INFO",JSONObject.fromObject(INSUR_FEE_INFO).toString());
                infoobj.put("qyjg00",hospitalMapping.getSbCode());//签约机构
                infoobj.put("qyys00",sign.getDoctorName());//签约医生
                infoobj.put("btlx00",sign.getExpensesType());//补贴类型
                infoobj.put("djjg00",hospitalMapping.getSbCode());//登记机构
                infoobj.put("djr000",sign.getDoctorName());//登记人
                infoobj.put("djsj00",DateUtil.dateToStrShort(sign.getBegin()));//登记时间
                infoobj.put("qyzt00",charge.getMiRegisterStatus());//登记状态
                infoobj.put("kfjg00",hospitalMapping.getSbCode());//扣费机构
                infoobj.put("kfrxm0",sign.getDoctorName());//扣费人
                infoobj.put("kfsj00",charge.getChargeTime());//扣费时间
                infoobj.put("kfzt00",charge.getMiCollectStatus());//扣费状态
                infoobj.put("kfdjh0",charge.getMiSettleNo());//扣费单据号
                infoobj.put("zje000",String.valueOf(charge.getMiTotalFee()));//扣费总额
                infoobj.put("zfbtzf",charge.getCadresPay());//政府补贴支付
                infoobj.put("tcjjzf",charge.getHealthCarePay());//医保统筹支付
                infoobj.put("jkzhzf",charge.getHeathPay());//健康账户支付
                infoobj.put("zhzfe0",charge.getAccountPay());//医保账户支付
                infoobj.put("xjzfe0",charge.getSelfPay());//个人现金自付
                jsonObject.put("INSUR_FEE_INFO",infoobj);
                
                String response = zysoftService.uploadChargeInfo(params, hm[0], hm[1], operator);
                String response = zysoftService.uploadChargeInfo(jsonObject, hm[0], hm[1], operator);
                Map<String, String> map = zysoftService.getJwOne(response);
                msg = map.get("MESSAGE");

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/ZysoftService.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.sign.service;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.sign.common.http.HttpApiException;
import com.yihu.wlyy.sign.common.util.StringUtil;
@@ -171,6 +172,78 @@ public class ZysoftService {
        return re;
    }
    
    /**
     * 基卫二次封装Post接口
     */
    private String postSecondJson(String api, String content, com.alibaba.fastjson.JSONObject jsonParams, Map<String,String> headers,boolean needRetry) throws Exception
    {
        String re = "";
        headers.put("INTERFACE",api);
        
        Map<String,String> paramsList = new HashMap<>();
        String msgBody = com.alibaba.fastjson.JSONObject.toJSONString(jsonParams, SerializerFeature.WriteMapNullValue);
        String msgHeader = JSONObject.fromObject(headers).toString();
        paramsList.put("msgHeader",msgHeader);
        paramsList.put("msgBody",msgBody);
    
    
        //System.out.print("msgHeader:"+msgHeader+"\r\n");
        //System.out.print("msgBody:"+msgBody+"\r\n");
    
        //新增日志
        String method = "POST";
        Boolean isSuccess = true;
        String error = "";
    
        int times = 0;
        try {
            re = ZysoftApi.getSingleton().post("base/CallEhrInterface", paramsList, null, true);
            if(needRetry)
            {
                int maxTimes = retryTimes;
                while(maxTimes>0 && re.contains("接口调用传入的参数[msgHeader]格式不正确"))    //基卫bug预防，重调接口
                {
                    re = ZysoftApi.getSingleton().post("base/CallEhrInterface", paramsList, null,true);
                    maxTimes --;
                    times++;
                }
            }
        
            Map<String,String> map = objectMapper.readValue(re, Map.class);
            String code = map.get("CODE");
        
            if(!code.equals("1"))
            {
                throw new HttpApiException(Integer.valueOf(code),map.get("MESSAGE"));
            }
        
            //保存http日志
            logService.saveHttpLog(isSuccess,api,content,method,msgHeader,msgBody,re,error);
        }
        catch (Exception ex)
        {
            isSuccess = false;
            StringWriter sw = new StringWriter();
            PrintWriter pw = new PrintWriter(sw);
            ex.printStackTrace(pw);
            error = sw.toString();
        
            //保存http日志
            logService.saveHttpLog(isSuccess,api,content,method,msgHeader,msgBody,re,error);
        
            if(ex instanceof ApiException)
            {
                ApiException apiEx = (ApiException) ex;
                throw new HttpApiException(apiEx.errorCode(),ex.getMessage());
            }
            else{
                throw new HttpApiException(-1,ex.getMessage());
            }
        }
    
        return re;
    }
    /**
@@ -479,14 +552,14 @@ public class ZysoftService {
    /**
     * 上传缴费记录
     */
    public String uploadChargeInfo(Map<String,String> params,String hospital,String licence,String operator)  throws Exception
    public String uploadChargeInfo(com.alibaba.fastjson.JSONObject jsonParams,String hospital,String licence,String operator)  throws Exception
    {
        Map<String,String> header = new HashMap<>();
        header.put("ORGCODE",hospital);
        header.put("LICENCE",licence);
        header.put("OPERATOR",operator);
        String response = postSecond("uploadPaymentInformation","上传缴费记录",params,header,true);
        String response = postSecondJson("uploadPaymentInformation","上传缴费记录",jsonParams,header,true);
        return response;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionExpressageService.java

@@ -621,16 +621,16 @@ public class PrescriptionExpressageService extends BaseService {
        return rs;
    }
    public Map<String, Object> getPresEsPayList(String keyWord, String state, String type, String startDate, String endDate, String operator,String flag,Integer page, Integer pageSize) {
    public Map<String, Object> getPresEsPayList(String doctor,String keyWord, String state, String type, String startDate, String endDate, String operator,String flag,Integer page, Integer pageSize) {
        Map<String, Object> map = new HashedMap();
        Doctor d = doctorDao.findByCode(doctor);
        String totalSql = "SELECT count(1) AS total " +
                " FROM " +
                " wlyy_prescription p " +
                " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                " WHERE" +
                " 1=1 ";
                " p.hospital = '"+d.getHospital()+"' ";
        totalSql = setSQL( totalSql,keyWord,state,type,startDate,endDate,operator,flag);
        totalSql +=  " AND p.`status`>=50 ";
        List<Map<String, Object>> totallist = jdbcTemplate.queryForList(totalSql);
@@ -660,7 +660,7 @@ public class PrescriptionExpressageService extends BaseService {
                " wlyy_prescription p " +
                " JOIN wlyy_prescription_pay py ON py.prescription_code = p.`code` " +
                " WHERE" +
                " 1=1 ";
                " p.hospital = '"+d.getHospital()+"' ";
        sql = setSQL( sql,keyWord,state,type,startDate,endDate,operator,flag);
        sql +=  " AND p.`status`>=50 " +
                " ORDER BY py.create_time DESC " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/QrcodeService.java

@@ -433,9 +433,9 @@ public class QrcodeService extends BaseService {
    /**
     * 从微信生成二维码并下载到本地
     *
     * @param content
     * @param fileName
     * @param path
     * @param content 场景值
     * @param fileName 二维码文件名
     * @param path 生成二维码路径
     * @param token
     * @throws IOException
     */
@@ -500,5 +500,57 @@ public class QrcodeService extends BaseService {
        }
    }
    /**
     * 从微信生成二维码(供第三方调用)
     *
     * @param content
     * @param token
     * @throws IOException
     */
    public String getQrcodeFromWeiXin(String content,String token) throws Exception {
        try {
            String token_url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + token;
            String params = "{\"action_name\": \"QR_LIMIT_STR_SCENE\", \"action_info\": {\"scene\": {\"scene_str\": \"" + content + "\"}}}";
            String result = HttpUtil.sendPost(token_url, params);
            if (!StringUtils.isEmpty(result)) {
                JSONObject json = new JSONObject(result);
                if (json.has("ticket")) {
                    // 请求输入流
                    InputStream inputStream = null;
                    // 二维码图片输出流
                    StringBuffer tStringBuffer = new StringBuffer();
                    // 下载二维码图片
                    URL urlGet = new URL("https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket="
                            + URLEncoder.encode(json.get("ticket").toString(), "UTF-8"));
                    HttpURLConnection connection = (HttpURLConnection) urlGet.openConnection();
                    connection.connect();
                    inputStream = connection.getInputStream();
                    // 保存图片
                    byte[] data = new byte[1024];
                    int len = 0;
                    while ((len = inputStream.read(data)) != -1) {
                        tStringBuffer.append(data);
                    }
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    return tStringBuffer.toString();
                } else {
                    throw new Exception("请求微信生成二维码失败!");
                }
            } else {
                throw new Exception("请求微信生成二维码失败!");
            }
        } catch (Exception e) {
            e.printStackTrace();
            throw new Exception(e.getMessage());
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -711,7 +711,7 @@ public class JMJkEduArticleService extends BaseService {
        patientSet.addAll(resultList);
    }
    public JSONArray pushArticleLogs(int page, int pagesize, String patientCode) throws Exception {
    public JSONArray pushArticleLogs(int page, int pagesize, String patientCode,String level1Type) throws Exception {
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
@@ -719,7 +719,13 @@ public class JMJkEduArticleService extends BaseService {
//        StringBuffer sql2 = new StringBuffer("select *  from   " + esType +
//                " where  sendCode='" + sendCode + "' ");
//        sql2.append("  order by createTime limit " + page + "," + pagesize);
        String sql = "SELECT * FROM " + esType + "  where nested(patients.code)= '" + patientCode + "' order by createTime desc limit " + page + "," + pagesize;
        String sql = "SELECT * FROM " + esType + "  where nested(patients.code)= '" + patientCode + "' ";
        
        if(!StringUtils.isEmpty(level1Type)){
            sql= sql + " and level1Type = '"+level1Type+"' ";
        }
        
        sql= sql+  " order by createTime desc limit " + page + "," + pagesize;
        List<com.yihu.es.entity.HealthEduArticlePatient> esList = elasticsearchUtil.excute(sql, com.yihu.es.entity.HealthEduArticlePatient.class, esIndex, esType);
        HealthEduArticlePatientModel heapm = null;
        com.alibaba.fastjson.JSONObject article = null;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/weixin/WeiXinCoreService.java

@@ -6,8 +6,12 @@ import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.wechat.process.WeiXinEventProcess;
import com.yihu.wlyy.wechat.util.WeiXinMessageUtils;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -99,4 +103,15 @@ public class WeiXinCoreService extends BaseService {
        return result;
    }
    /**
     * 判断是否是xml结构
     */
    public boolean isXML(String value) {
        try {
            DocumentHelper.parseText(value);
        } catch (DocumentException e) {
            return false;
        }
        return true;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionExpressageController.java

@@ -136,7 +136,7 @@ public class PrescriptionExpressageController extends WeixinBaseController {
                                   @ApiParam(name = "page", value = "页面") @RequestParam(required = true)Integer page,
                                   @ApiParam(name = "pageSize", value = "页面大小") @RequestParam(required = true)Integer pageSize){
        try {
            return write(200, "获取成功", "data", expressageService.getPresEsPayList(keyWord,state,type,startDate,endDate,operator,flag,page,pageSize));
            return write(200, "获取成功", "data", expressageService.getPresEsPayList(getUID(),keyWord,state,type,startDate,endDate,operator,flag,page,pageSize));
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -255,7 +255,7 @@ public class HealthEduArticleController extends BaseController {
                                           @ApiParam(name = "pageSize", value = "每页显示数 ，默认5")
                                           @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getUID(),2,null);
            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,getRepUID(),2,null);
//            com.alibaba.fastjson.JSONArray response = healthEducationArticleService.getCollectionArticalList(articleTitle,articleState,firstLevelCategoryId,pageIndex,pageSize,"0de7295862dd11e69faffa163e8aee56",1);
            return write(200,"查询成功！","data",response);
        }catch (Exception e){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/jimeiJkEdu/PatientJMJkEduArticleController.java

@@ -27,9 +27,10 @@ public class PatientJMJkEduArticleController extends BaseController {
    @ApiOperation("居民获取被推送文章列表 ")
    public String pushArticleLogs(
            @ApiParam(name = "page", value = "当前页 起始1", required = true) @RequestParam(value = "page", required = true) Integer page,
            @ApiParam(name = "pagesize", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize){
            @ApiParam(name = "pagesize", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize,
            @ApiParam(name = "level1Type", value = "", required = false) @RequestParam(value = "level1Type", required = false) String  level1Type){
        try {
            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.pushArticleLogs(page,pagesize,getUID());
            com.alibaba.fastjson.JSONArray response = jmJkEduArticleService.pushArticleLogs(page,pagesize,getRepUID(),level1Type);
//            Long count = healthEducationArticleService.pushArticleLogsCount("ece5c665b16542b0847e52b4a9fee44a");
            return write(200,"查询成功！","data",response);
        }catch (Exception e) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkEduArticle/ThirdJkEduArticleController.java

@@ -120,7 +120,7 @@ public class ThirdJkEduArticleController extends BaseController {
    public String cancelArticleCollection(@ApiParam(name = "articleId", value = "文章id",defaultValue = "1")
                                          @RequestParam(value = "articleId", required = true) String articleId){
        try {
            thirdJkEduArticleService.cancelArticleCollection(articleId,getUID(),1);
            thirdJkEduArticleService.cancelArticleCollection(articleId,getRepUID(),1);
//            thirdJkEduArticleService.cancelArticleCollection(articleId,"0de7295862dd11e69faffa163e8aee56",1);
            return success("取消成功！");
        }catch (Exception e){
@@ -139,7 +139,7 @@ public class ThirdJkEduArticleController extends BaseController {
                                        @ApiParam(name = "articleCategoryName", value = "文章类别名称")
                                        @RequestParam(value = "articleCategoryName", required = false) String articleCategoryName){
        try {
            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,getUID(),1);
            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,getRepUID(),1);
//            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,"0de7295862dd11e69faffa163e8aee56",1);
            return success("收藏成功！");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/ylzpay/ThirdQrcodeController.java

@@ -0,0 +1,59 @@
package com.yihu.wlyy.web.third.ylzpay;
import com.yihu.wlyy.service.app.prescription.PatientPrescriptionPayService;
import com.yihu.wlyy.service.common.QrcodeService;
import com.yihu.wlyy.service.third.jw.JwPrescriptionService;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
/**
 * Created by Reece on 2017/8/30/030.
 * <p>
 * 第三方微信相关事件
 */
@RestController
@RequestMapping(value = "/wlyygc/wechat/")
@Api(description = "供第三方微信类相关业务调用")
public class ThirdQrcodeController extends WeixinBaseController {
    @Value("${server.server_url}")
    private String server_url;
    @Autowired
    private QrcodeService qrcodeService;
    /**
     * 根据场景值获取公众号永久二维码
     *
     * @param scene 场景值
     * @return 返回服务器二维码地址
     * @throws Exception
     */
    @RequestMapping(value = "/getQrcode", method = RequestMethod.POST)
    @ApiOperation(value = "获取公众号二维码接口")
    public String getQrcode(@ApiParam(name = "scene", defaultValue = "") @RequestParam(value = "scene", required = true) String scene) throws Exception {
        try {
            String content = "wechat_" + scene;
            String path = server_url + File.separator + "qrcode";
            // 通过微信接口生成医生二维码
            String result = qrcodeService.makeQrcodeFromWeiXin(content, content.replaceAll("\r\n", ""), path, getAccessToken());
            return write(200, "生成二维码成功!", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
            return write(-1, "生成二维码失败!");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/wx/WechatCoreController.java

@@ -1,6 +1,7 @@
package com.yihu.wlyy.web.wx;
import com.yihu.wlyy.service.weixin.WeiXinCoreService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.HttpUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
@@ -39,6 +40,8 @@ public class WechatCoreController extends WeixinBaseController {
    private String appId;
    @Autowired
    private HttpUtil HttpUtil;
    @Autowired
    private PushMsgTask pushMsgTask;
    /**
     * 微信接口验证
@@ -83,12 +86,21 @@ public class WechatCoreController extends WeixinBaseController {
            if (validate(signature, timestamp, nonce)) {
                String xmlStr = weiXinCoreService.messageProcess(request, getAccessToken());
                // 判断返回值是xml、json格式（取关是空串）
                Boolean flag = weiXinCoreService.isXML(xmlStr);
                if (xmlStr == "error") {
                    // 服务器错误
                    response.setStatus(500);
                } else if (!flag && StringUtils.isNotEmpty(xmlStr)) {
                    JSONObject json = new JSONObject(xmlStr);
                    if (json.has("openId")) {
                        if (StringUtils.isNotEmpty(json.getString("openId")) && !("undefined".equals(json.getString("openId")))) {
                            pushMsgTask.putWxMsg(getAccessToken(), json.getInt("type"), json.getString("openId"), null, json);
                        }
                    }
                } else {
                    // 返回消息
                    // 返回消息(图文消息)
                    response.getWriter().print(xmlStr);
                }
            } else {
@@ -111,7 +123,7 @@ public class WechatCoreController extends WeixinBaseController {
     * @return
     * @throws NoSuchAlgorithmException
     */
    private  boolean validate(String signature, String timestamp, String nonce) throws NoSuchAlgorithmException {
    private boolean validate(String signature, String timestamp, String nonce) throws NoSuchAlgorithmException {
        String token = this.wechat_token;
        // 字典序排序
        String[] array = new String[]{token, timestamp, nonce};
@@ -160,7 +172,7 @@ public class WechatCoreController extends WeixinBaseController {
    public String createMenuTest() {
        try {
            String filePath = WechatCoreController.class.getResource("/").getPath() +
                    File.separator + "wechat"+ File.separator+"weixin_menu.txt";
                    File.separator + "wechat" + File.separator + "weixin_menu.txt";
            String url = " https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + getAccessToken();
            // 读取微信菜单配置文件
            InputStreamReader reader = new InputStreamReader(new FileInputStream(filePath), "utf-8");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -1,9 +1,12 @@
package com.yihu.wlyy.wechat.process;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.wechat.util.WeiXinMessageReplyUtils;
import com.yihu.wlyy.wechat.util.WeiXinMessageUtils;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -23,13 +26,16 @@ public class WeiXinEventProcess {
    private String appId;
    @Value("${server.server_url}")
    private String serverUrl;
    @Autowired
    private PushMsgTask pushMsgTask;
    /**
     * 微信推送事件处理
     *
     * @param message
     * @return
     */
    public  String eventProcess(Map<String, String> message) throws Exception {
    public String eventProcess(Map<String, String> message) throws Exception {
        String result = "";
        String event = message.get("Event");
@@ -60,7 +66,7 @@ public class WeiXinEventProcess {
     * @param message
     * @return
     */
    public  String clickProcess(Map<String, String> message) throws Exception {
    public String clickProcess(Map<String, String> message) throws Exception {
        String result = "";
        if (message.get("EventKey").equals("caozuoshuoming")) {
@@ -84,7 +90,7 @@ public class WeiXinEventProcess {
     * @return
     * @throws Exception
     */
    private  String clickEventProcess(Map<String, String> message) throws Exception {
    private String clickEventProcess(Map<String, String> message) throws Exception {
        String result = "";
        // 配置信息
        Properties systemConf = SystemConf.getInstance().getSystemProperties();
@@ -98,7 +104,7 @@ public class WeiXinEventProcess {
        // 图文消息图片URL
        String picUrlConsult = systemConf.getProperty("patient_operatinginstrutions_pic_url");
        // URL设置服务器URL、AppId
        urlConsult = urlConsult.replace("{server}",wechat_base_url)
        urlConsult = urlConsult.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        picUrlConsult = picUrlConsult.replace("{server}", serverUrl);
@@ -134,7 +140,7 @@ public class WeiXinEventProcess {
        // 图文消息图片URL
        String picUrlDevice = systemConf.getProperty("patient_device_pic_url");
        // URL设置服务器URL、AppId
        urlDevice = urlDevice.replace("{server}",wechat_base_url)
        urlDevice = urlDevice.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        picUrlDevice = picUrlDevice.replace("{server}", serverUrl);
@@ -153,7 +159,7 @@ public class WeiXinEventProcess {
        String picUrlFamily = systemConf.getProperty("patient_family_pic_url");
        // URL设置服务器URL、AppId
        urlFamily = urlFamily.replace("{server}", wechat_base_url)
                .replace("{appId}",appId);
                .replace("{appId}", appId);
        //图片地址
        picUrlFamily = picUrlFamily.replace("{server}", serverUrl);
@@ -178,7 +184,7 @@ public class WeiXinEventProcess {
     * @return
     * @throws Exception
     */
    private  String clickEventProcessMenu(Map<String, String> message) throws Exception {
    private String clickEventProcessMenu(Map<String, String> message) throws Exception {
        String result = "";
        // 配置信息
        Properties systemConf = SystemConf.getInstance().getSystemProperties();
@@ -208,8 +214,8 @@ public class WeiXinEventProcess {
        // 图文消息图片URL
        String inspect_pic = systemConf.getProperty("patient_inspect_pic");
        // URL设置服务器URL、AppId
        inspect = inspect.replace("{server}",wechat_base_url)
                .replace("{appId}",appId);
        inspect = inspect.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        inspect_pic = inspect_pic.replace("{server}", serverUrl);
@@ -225,10 +231,10 @@ public class WeiXinEventProcess {
        // 图文消息图片URL
        String examination_pic = systemConf.getProperty("patient_examination_pic");
        // URL设置服务器URL、AppId
        examination = examination.replace("{server}",wechat_base_url)
        examination = examination.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        examination_pic = examination_pic.replace("{server}",serverUrl);
        examination_pic = examination_pic.replace("{server}", serverUrl);
        articleExamination.put("Url", examination);
        articleExamination.put("Title", "社区体检");
@@ -243,10 +249,10 @@ public class WeiXinEventProcess {
        // 图文消息图片URL
        String prescription_pic = systemConf.getProperty("patient_prescription_pic");
        // URL设置服务器URL、AppId
        prescription = prescription.replace("{server}",wechat_base_url)
                .replace("{appId}",appId);
        prescription = prescription.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        prescription_pic = prescription_pic.replace("{server}",serverUrl);
        prescription_pic = prescription_pic.replace("{server}", serverUrl);
        articlePrescription.put("Url", prescription);
        articlePrescription.put("Title", "处方记录");
@@ -280,43 +286,61 @@ public class WeiXinEventProcess {
    /**
     * 关注事件消息发送
     * 关注事件消息构建回复消息体（图文消息xml，模板消息json串）
     *
     * @param message
     * @return
     * @throws Exception
     */
    private  String subscribeEventProcess(Map<String, String> message) throws Exception {
    private String subscribeEventProcess(Map<String, String> message) throws Exception {
        String result = "";
        // 配置信息
        Properties systemConf = SystemConf.getInstance().getSystemProperties();
        // 图文信息
        List<Map<String, String>> articles = new ArrayList<>();
        // 场景值
        String eventKey = message.get("EventKey");
        Map<String, String> article = new HashMap<>();
        // 图文URL
        String url = systemConf.getProperty("doctor_subscribe_url");
        // 图文消息图片URL
        String picUrl = systemConf.getProperty("doctor_qrcode_pic_url");
        // URL设置服务器URL、AppId
        url = url.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        picUrl = picUrl.replace("{server}", serverUrl);
        if (StringUtils.isNotEmpty(eventKey) && (("wechat_ehc").equals(eventKey)) ||
                eventKey.startsWith("qrscene_wechat_ehc")) {
            System.out.println("第三方ehr关注推送事件");
            JSONObject json = new JSONObject();
            json.put("first", "first");
            json.put("remark", "remark");
            json.put("keyword1", "keyword1");
            json.put("keyword2", "keyword2");
            json.put("url", "www.baidu.com");
            //跳转路径问题，如果是第三方不加本地服务器名称(要改push公用方法)
            json.put("openId", message.get("FromUserName"));
            json.put("type", 11);
            //模板消息json串
            result = json.toString();
        } else {
            // 配置信息
            Properties systemConf = SystemConf.getInstance().getSystemProperties();
            // 图文信息
            List<Map<String, String>> articles = new ArrayList<>();
        article.put("Url", url);
        article.put("Title", "欢迎关注厦门i健康，快来签约家庭医生吧~");
        article.put("Description", "请点击查看家庭签约");
        article.put("PicUrl", picUrl);
            Map<String, String> article = new HashMap<>();
            // 图文URL
            String url = systemConf.getProperty("doctor_subscribe_url");
            // 图文消息图片URL
            String picUrl = systemConf.getProperty("doctor_qrcode_pic_url");
            // URL设置服务器URL、AppId
            url = url.replace("{server}", wechat_base_url)
                    .replace("{appId}", appId);
            //图片地址
            picUrl = picUrl.replace("{server}", serverUrl);
        articles.add(article);
            article.put("Url", url);
            article.put("Title", "欢迎关注厦门i健康，快来签约家庭医生吧~");
            article.put("Description", "请点击查看家庭签约");
            article.put("PicUrl", picUrl);
        //设置共有的图文消息
        setUrlItems(articles, systemConf);
            articles.add(article);
        // 构建回复消息XML
        result = WeiXinMessageReplyUtils.replyNewsMessage(message.get("FromUserName"), message.get("ToUserName"), articles);
            //设置共有的图文消息
            setUrlItems(articles, systemConf);
            // 构建回复消息XML
            result = WeiXinMessageReplyUtils.replyNewsMessage(message.get("FromUserName"), message.get("ToUserName"), articles);
        }
        return result;
    }
@@ -325,7 +349,7 @@ public class WeiXinEventProcess {
     *
     * @param articles
     */
    public  void setUrlItems(List<Map<String, String>> articles, Properties systemConf) {
    public void setUrlItems(List<Map<String, String>> articles, Properties systemConf) {
        Map<String, String> articleConsult = new HashMap<>();
        // 图文URL
        String urlConsult = systemConf.getProperty("patient_consult_url");
@@ -353,7 +377,7 @@ public class WeiXinEventProcess {
        urlBooking = urlBooking.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        picUrlBooking = picUrlBooking.replace("{server}",serverUrl);
        picUrlBooking = picUrlBooking.replace("{server}", serverUrl);
        articleBooking.put("Url", urlBooking);
        articleBooking.put("Title", "预约挂号功能使用说明");
@@ -387,9 +411,9 @@ public class WeiXinEventProcess {
        String picUrlFamily = systemConf.getProperty("patient_family_pic_url");
        // URL设置服务器URL、AppId
        urlFamily = urlFamily.replace("{server}", wechat_base_url)
                .replace("{appId}",appId);
                .replace("{appId}", appId);
        //图片地址
        picUrlFamily = picUrlFamily.replace("{server}",serverUrl);
        picUrlFamily = picUrlFamily.replace("{server}", serverUrl);
        articleFamily.put("Url", urlFamily);
        articleFamily.put("Title", "我的家庭功能使用说明");
@@ -400,13 +424,13 @@ public class WeiXinEventProcess {
    }
    /**
     * 微信扫码事件处理
     * 微信扫码事件处理（封装图文消息体）
     *
     * @param message
     * @return
     * @throws Exception
     */
    private  String scanEventProcess(Map<String, String> message) throws Exception {
    private String scanEventProcess(Map<String, String> message) throws Exception {
        String result = "";
        // 场景值
        String eventKey = message.get("EventKey");
@@ -461,7 +485,7 @@ public class WeiXinEventProcess {
            String[] keys = eventKey.replace("qrscene_hs_", "").replace("hs_", "").split("_");
            // 图文消息URL
            url = url.replace("{server}",wechat_base_url)
            url = url.replace("{server}", wechat_base_url)
                    .replace("{appId}", appId)
                    .replace("{hospital}", keys[0] + ":" + keys[1]);
            //图片地址
@@ -496,7 +520,7 @@ public class WeiXinEventProcess {
            // 图文消息URL
            url = url.replace("{server}", wechat_base_url)
                    .replace("{appId}",appId)
                    .replace("{appId}", appId)
                    .replace("{town}", keys[0]);
            //图片地址
            picUrl = picUrl.replace("{server}", serverUrl);
@@ -514,6 +538,20 @@ public class WeiXinEventProcess {
            articles.add(videoText);
            // 消息XML
            result = WeiXinMessageReplyUtils.replyNewsMessage(message.get("FromUserName"), message.get("ToUserName"), articles);
        } else if (StringUtils.isNotEmpty(eventKey) && (("wechat_ehc").equals(eventKey)) ||
                eventKey.startsWith("qrscene_wechat_ehc")) {
            System.out.println("第三方ehr扫描推送事件");
            JSONObject json = new JSONObject();
            json.put("first", "first");
            json.put("remark", "remark");
            json.put("keyword1", "keyword1");
            json.put("keyword2", "keyword2");
            json.put("url", "www.baidu.com");
            //跳转路径问题，如果是第三方不加本地服务器名称(要改push公用方法)
            json.put("openId", message.get("FromUserName"));
            json.put("type", 11);
            //模板消息json串
            result = json.toString();
        }
        return result;
@@ -528,7 +566,7 @@ public class WeiXinEventProcess {
     * @param description 图文描述
     * @return
     */
    public  Map getNews(String url, String picUrl, String title, String description) {
    public Map getNews(String url, String picUrl, String title, String description) {
        Properties systemConf = SystemConf.getInstance().getSystemProperties();
        Map<String, String> news = new HashMap<>();
        // 图文URL
@@ -536,8 +574,8 @@ public class WeiXinEventProcess {
        // 图文消息图片URL
        String pictureUrl = systemConf.getProperty(picUrl);
        // URL设置服务器URL、AppId
        targetUrl = targetUrl.replace("{server}",wechat_base_url)
                .replace("{appId}",appId);
        targetUrl = targetUrl.replace("{server}", wechat_base_url)
                .replace("{appId}", appId);
        //图片地址
        pictureUrl = pictureUrl.replace("{server}", serverUrl);
        System.out.println("url ====> " + targetUrl);
@@ -559,7 +597,7 @@ public class WeiXinEventProcess {
     * @param message
     * @return
     */
    public  String replyKeyword(Map<String, String> message) throws Exception {
    public String replyKeyword(Map<String, String> message) throws Exception {
        String result = "";
        String description = "您的家庭医生签约将于6月30日到期，为了能继续给您提供健康服务，诚邀您续签家庭医生。";
        String description1 = "为了能给您提供健康服务，诚邀您签签约家庭医生。";

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -112,8 +112,8 @@ es:
#http://172.19.103.87:9088/JkEduWeb
jkEdu:
  web:
    articleBaseUrl: http://yihu.com:9088/
#    articleBaseUrl: http://172.19.103.87:9088/
#    articleBaseUrl: http://yihu.com:9088/
    articleBaseUrl: http://172.19.103.87:9088/
#消息队列
activemq: