Merge branch 'dev' of wujunjie/patient-co-management into dev

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

@@ -1,6 +1,7 @@
package com.yihu.wlyy.service.app.prescription;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -498,14 +499,14 @@ public class PatientPrescriptionPayService extends BaseService {
                        expressage.setDel(1);//快递信息状态 1可用 0删除
                        expressageDao.save(expressage);
                        prescriptionDao.save(prescription);
                        if (sendType==2){
                        if (sendType == 2) {
                            //插入发送给团队长的系统消息
                            Message message= messageDao.findByRelationCode(prescriptionCode);
                            Message message = messageDao.findByRelationCode(prescriptionCode);
                            String receiver = message.getReceiver();
                            int type = message.getType();
                            String title = message.getTitle();
                            String content = message.getContent();
                            pushMsgTask.put(receiver,"3",title , content,"");
                            pushMsgTask.put(receiver, "3", title, content, "");
                            message.setOver("1");//操作结束
                            message.setState(1);//已发送
                            message.setCzrq(new Date());
@@ -662,7 +663,7 @@ public class PatientPrescriptionPayService extends BaseService {
                        " FROM wlyy_sign_family t,wlyy_admin_team a,wlyy_doctor d " +
                        " WHERE t.admin_team_code=a.id AND d.code=a.leader_code " +
                        " AND t.patient=? ";
                Map<String,Object> team = jdbcTemplate.queryForMap(sql,people);
                Map<String, Object> team = jdbcTemplate.queryForMap(sql, people);
                String teamCode = team.get("teamCode").toString();
                String leaderCode = team.get("leaderCode").toString();
                String leaderName = team.get("leaderName").toString();
@@ -678,8 +679,8 @@ public class PatientPrescriptionPayService extends BaseService {
                message.setSender("SYSTEM");//发送者
                message.setSenderName("SYSTEM");//发送者
                message.setTitle("新增系统消息");
                SimpleDateFormat format=new SimpleDateFormat("MM月dd日");
                String content=format.format(new Date())+"新增1个签约居民待分配健管师，目前共"+amount+"人待处理";
                SimpleDateFormat format = new SimpleDateFormat("MM月dd日");
                String content = format.format(new Date()) + "新增1个签约居民待分配健管师，目前共" + amount + "人待处理";
                message.setContent(content);
                message.setType(3);//分配健管师
                message.setPlatform(2);//消息平台，1微信端/患者端，2医生APP端
@@ -789,10 +790,10 @@ public class PatientPrescriptionPayService extends BaseService {
            JSONObject recipe = jsonParams.getJSONObject("recipeContent");
            params.put("recipeContent", recipe);// 处方主信息
            prescriptionPay.setRecipeContent(recipe.toJSONString());//处方主信息
            JSONObject zdContent = jsonParams.getJSONObject("zdlist");
            JSONArray zdContent = jsonParams.getJSONArray("zdlist");
            params.put("zdlist", zdContent);// 诊断明细
            prescriptionPay.setZdlist(zdContent.toJSONString());//诊断明细
            JSONObject mxContent = jsonParams.getJSONObject("mxlist");
            JSONArray mxContent = jsonParams.getJSONArray("mxlist");
            params.put("mxlist", mxContent);//处方明细
            prescriptionPay.setMxlist(mxContent.toJSONString());//处方明细

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

@@ -237,22 +237,22 @@ public class WeiXinEventProcess {
        articles.add(articleExamination);
//        新增处方记录图文消息
//        Map<String, String> articlePrescription = new HashMap<>();
//        // 图文URL
//        String prescription = systemConf.getProperty("patient_prescription_url");
//        // 图文消息图片URL
//        String prescription_pic = systemConf.getProperty("patient_prescription_pic");
//        // URL设置服务器URL、AppId
//        prescription = prescription.replace("{server}",wechat_base_url)
//                .replace("{appId}",appId);
//        //图片地址
//        prescription_pic = prescription_pic.replace("{server}",serverUrl);
//
//        articlePrescription.put("Url", prescription);
//        articlePrescription.put("Title", "处方记录");
//        articlePrescription.put("Description", "处方记录");
//        articlePrescription.put("PicUrl", prescription_pic);
//        articles.add(articlePrescription);
        Map<String, String> articlePrescription = new HashMap<>();
        // 图文URL
        String prescription = systemConf.getProperty("patient_prescription_url");
        // 图文消息图片URL
        String prescription_pic = systemConf.getProperty("patient_prescription_pic");
        // URL设置服务器URL、AppId
        prescription = prescription.replace("{server}",wechat_base_url)
                .replace("{appId}",appId);
        //图片地址
        prescription_pic = prescription_pic.replace("{server}",serverUrl);
        articlePrescription.put("Url", prescription);
        articlePrescription.put("Title", "处方记录");
        articlePrescription.put("Description", "处方记录");
        articlePrescription.put("PicUrl", prescription_pic);
        articles.add(articlePrescription);
        // 构建回复消息XML
        result = WeiXinMessageReplyUtils.replyNewsMessage(message.get("FromUserName"), message.get("ToUserName"), articles);

patient-co/patient-co-wlyy/src/main/resources/system.properties

@@ -25,7 +25,7 @@ patient_inspect_url =https://open.weixin.qq.com/connect/oauth2/authorize?appid={
#社区体检
patient_examination_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjiankangtijian.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
#处方记录
patient_prescription_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjiankangtijian.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
patient_prescription_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fprescription%2fhtml%2fprescription_records.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect
#就诊记录