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/DoorOrderService.java

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/SystemMessageDao.java

@@ -21,5 +21,8 @@ public interface SystemMessageDao extends PagingAndSortingRepository<SystemMessa
    @Query("from SystemMessageDO p where p.id = ?1")
    SystemMessageDO queryById(String id);
    @Modifying
    @Query("delete from SystemMessageDO a   where a.receiver = ?1 and a.relationCode = ?2 and a.type ='407'")
    int orderMessageDel(String doctor, String orderId);
}

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

@@ -12,6 +12,7 @@ import com.yihu.jw.entity.base.im.ConsultTeamDo;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.door.*;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.dao.ConsultTeamDao;
import com.yihu.jw.im.util.ImUtil;
@@ -119,7 +120,8 @@ public class DoorOrderService {
    private String hospitalUrl;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private SystemMessageDao systemMessageDao;
    @Value("${wechat.id}")
    private String wxId;
    @Autowired
@@ -487,7 +489,7 @@ public class DoorOrderService {
        doorServiceOrderDao.save(doorServiceOrder);
        messageUtil.orderMessageDel(null,orderId,"407",doorServiceOrder.getDoctor());
        systemMessageDao.orderMessageDel(doorServiceOrder.getDoctor(),orderId);
        if(doorServiceOrder.getType() == null|| doorServiceOrder.getType() != 3) {
            //获取咨询
@@ -547,7 +549,7 @@ public class DoorOrderService {
            logger.error("当前工单没有医生待接单消息！orderId:" + orderId);
        }else {
            messages.forEach(message->{
                messageUtil.orderMessageDel(message.getId(),message.getRelationCode(),message.getType(),message.getReceiver());
                systemMessageDao.orderMessageDel(message.getReceiver(),message.getRelationCode());
                if (message.getType().equals("403") ) {
                    BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doorServiceOrder.getDispatcher());//·
                    String msg=doorServiceOrder.getDispatcherName() + "接受了服务工单"+ doorServiceOrder.getNumber();
@@ -579,7 +581,7 @@ public class DoorOrderService {
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doorServiceOrder.getProxyPatient());//·
            this.createMessage("代预约服务工单重新派单","403","system","system", doorServiceOrder.getId(), doorServiceOrder.getProxyPatient(),baseDoctorDO.getName() ,null, doorServiceOrder.getPatientName() + "的代预约服务工单需重新派单，请您前往处理");
        } else {
            messageUtil.orderMessageDel(null,orderId,"407",doorServiceOrder.getDoctor());
            systemMessageDao.orderMessageDel(doorServiceOrder.getDoctor(),orderId);
            if(StringUtils.isNotBlank(doorServiceOrder.getDispatcher())){
                BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doorServiceOrder.getDispatcher());//·
                this.createMessage("服务工单拒单待重新派单","404","system","system", doorServiceOrder.getId(), doorServiceOrder.getDispatcher(),baseDoctorDO.getName() , null,doorServiceOrder.getDoctorName() + "拒绝了" + doorServiceOrder.getProxyPatientName() + "的服务预约申请，请重新派单");
@@ -589,7 +591,6 @@ public class DoorOrderService {
                    logger.error("当前工单没有医生待接单消息！orderId:" + orderId);
                } else {
                    SystemMessageDO message = messages.get(0);
                    messageUtil.orderMessageDel(message.getId(),message.getRelationCode(),message.getType(),message.getReceiver());
                    String msg=doorServiceOrder.getDoctorName() + "拒绝了服务工单" + doorServiceOrder.getNumber() + ", 请重新派单";
                    messageUtil.saveSystemMessage(message.getId(),message.getRelationCode(),"医生拒单","435",doorServiceOrder.getDoctor(),doorServiceOrder.getDoctorName(),
                            doorServiceOrder.getDispatcher(),doorServiceOrder.getDispatcherName(),null,msg,message.getOver());

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

@@ -7,7 +7,6 @@ import com.yihu.jw.door.dao.DoorServiceVoucherDao;
import com.yihu.jw.door.util.MessageUtil;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
import com.yihu.jw.entity.door.WlyyDoorServiceApplicationDo;
import com.yihu.jw.entity.door.WlyyDoorServiceVoucherDo;
import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
@@ -23,7 +22,6 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -508,7 +506,6 @@ public class DoorServiceApplicationService {
            List<SystemMessageDO> messages = messageUtil.findSystemMesage(String.valueOf(id),null);
            messages.forEach(item->{
                item.setOver("0");
                messageUtil.orderMessageDel(item.getId(),null,null,null);
                messageUtil.saveSystemMessage(item);
            });
/*            List<Message> messages=messageDao.findMessageByRelationCode(String.valueOf(id));
@@ -547,7 +544,6 @@ public class DoorServiceApplicationService {
            List<SystemMessageDO> messages = messageUtil.findSystemMesage(String.valueOf(id),null);
            messages.forEach(item->{
                item.setOver("0");
                messageUtil.orderMessageDel(item.getId(),null,null,null);
                messageUtil.saveSystemMessage(item);
            });
/*            List<Message> messages=messageDao.findMessageByRelationCode(String.valueOf(id));

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

@@ -16,6 +16,7 @@ import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.door.*;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.org.dao.BaseOrgDao;
@@ -163,6 +164,8 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
    @Autowired
    private DoorServiceApplicationService doorServiceApplicationService;
    @Autowired
    private SystemMessageDao systemMessageDao;
    @Autowired
    private MessageUtil messageUtil;
    /**
     * 上门服务工单服务基本信息
@@ -1368,7 +1371,6 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                // 432 调度员拒单即取消工单-- 李四拒绝了张三的服务工单12345678
                messages.forEach(
                        message -> {
                            messageUtil.orderMessageDel(message.getId(),message.getRelationCode(),message.getType(),message.getReceiver());
                            if (message.getType() .equals("430")) {
                                String msg=orderDO.getDispatcherName() + "拒绝了"+ orderDO.getPatientName() +"的服务工单" + orderDO.getNumber();
                                messageUtil.saveSystemMessage(message.getId(),message.getRelationCode(),"调度员拒单","432",dispatcher,dispatcherName,
@@ -2432,11 +2434,14 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        messageDO.setRelationCode(relationCode);
        messageDO.setReceiver(Receiver);
        messageDO.setReceiverName(ReceiverName);
        messageDO.setOver("1");
        net.sf.json.JSONObject data = new net.sf.json.JSONObject();
        data.put("name", ReceiverName);
        try {
            data.put("age", IdCardUtil.getAgeForIdcard(idCard));
            data.put("gender", IdCardUtil.getSexForIdcard(idCard));
            if(StringUtils.isNoneBlank(idCard)){
                data.put("age", IdCardUtil.getAgeForIdcard(idCard));
                data.put("gender", IdCardUtil.getSexForIdcard(idCard));
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -2446,23 +2451,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
//        Date date = messageDO.getCreateTime();
//        String dateTime=format.format(date);
        messageDO.setCreateTime(new Date());
        messageUtil.saveSystemMessage(messageDO);
/*        Message message=new Message();
        message.setCzrq(new Date());
        message.setCreateTime(new Date());
        message.setRead(1);
        message.setState(1);
        message.setRelationCode(orderId);
        message.setOver("1");
        message.setReceiver(receiver);
        message.setSender(sender);
        message.setCode(getCode());
        message.setTitle(title);
        message.setContent(Content);
        //消息类型：401为资质申请审核
        message.setType(type);
        message.setDel("1");
        messageDao.save(message);*/
        systemMessageDao.save(messageDO);
    }
    /**

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/MessageUtil.java

@@ -2,7 +2,6 @@ package com.yihu.jw.door.util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.wx.BasePatientWechatDo;
import com.yihu.jw.entity.base.wx.WxAccessTokenDO;
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
@@ -16,11 +15,9 @@ import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.wechat.WeixinMessagePushUtils;
import com.yihu.jw.util.wechat.wxhttp.HttpUtil;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.jw.wechat.dao.WxTemplateConfigDao;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.yihu.utils.network.HttpUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -365,9 +362,6 @@ public class MessageUtil {
//        }
//    }
    public void updateMessage(SystemMessageDO message) {
        orderMessageDel(message.getId(),null,null,null);
    }
    public List<SystemMessageDO> findSystemMesage(String relationCode,String type){
        StringBuilder sql =new StringBuilder("select * from base.base_system_message where 1=1 ");
@@ -381,30 +375,6 @@ public class MessageUtil {
        return list;
    }
    public void orderMessageDel(String id,String relationCode,String type,String receiver){
        StringBuilder sql = new StringBuilder(" DELETE  from  base.base_system_message where 1=1 ");
        int runStatus=0;
        if (StringUtils.isNoneBlank(id)){
            sql.append(" and id='"+id+"' ");
            runStatus=1;
        }
        if (StringUtils.isNoneBlank(relationCode)){
            sql.append(" and relation_code='"+relationCode+"' ");
            runStatus=1;
        }
        if (StringUtils.isNoneBlank(type)){
            sql.append(" and type='"+type+"' ");
            runStatus=1;
        }
        if (StringUtils.isNoneBlank(receiver)){
            sql.append(" and receiver='"+receiver+"' ");
            runStatus=1;
        }
        if (runStatus==1){
            jdbcTemplate.execute(sql.toString());
        }
    }
    public  void test(){
        String sql="select w.* from base.wx_template_config w where w.wechat_id='xm_ykyy_wx' and w.template_name='template_evaluate_notice' and w.scene='fwqjtx' and w.status=1";
        List<Map<String,Object>> config =  jdbcTemplate.queryForList(sql);

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

@@ -343,16 +343,16 @@ wechat:
  flag: true #演示环境  true走Mysql数据库  false走Oracle
im:
  im_list_get: http://27.155.101.77:3000/
  im_list_get: http://10.9.1.247:3000/
  data_base_name: im
es:
  pwflag: 1 # 1需要密码，2不需要密码
  index:
    Statistics: hlw_quota_test
    Statistics: hlw_quota_prod
  type:
    Statistics: hlw_quota_test
  host:  http://172.26.0.55:9000
  tHost: 172.26.0.55:9300
    Statistics: hlw_quota_prod
  host:  http://10.9.1.247:9200
  tHost: 10.9.1.247:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion