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/DoorServiceApplicationService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/MessageUtil.java
	svr/svr-door-serivce/src/main/resources/application.yml

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDO.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
@@ -273,6 +274,9 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
     */
    private String voucherNo;
    private String diagnosisName;
    private String diagnosisSubName;
    /**
     * 处方审方唯一标识
     */
@@ -693,4 +697,22 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
    public void setVoucherNo(String voucherNo) {
        this.voucherNo = voucherNo;
    }
    @Transient
    public String getDiagnosisName() {
        return diagnosisName;
    }
    public void setDiagnosisName(String diagnosisName) {
        this.diagnosisName = diagnosisName;
    }
    @Transient
    public String getDiagnosisSubName() {
        return diagnosisSubName;
    }
    public void setDiagnosisSubName(String diagnosisSubName) {
        this.diagnosisSubName = diagnosisSubName;
    }
}

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

@@ -15,8 +15,10 @@ 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.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDiagnosisDao;
import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.dao.ConsultTeamDao;
import com.yihu.jw.im.util.ImUtil;
@@ -134,6 +136,8 @@ public class DoorOrderService {
    private SystemMessageDao systemMessageDao;
    @Autowired
    private PrescriptionDao prescriptionDao;
    @Autowired
    private PrescriptionDiagnosisDao prescriptionDiagnosisDao;
    /**
     * 互联网查询待服务工单数
@@ -362,13 +366,36 @@ public class DoorOrderService {
        doorConclusion.setServiceCount(count);
        doorServiceOrder.setDoorConclusion(doorConclusion);
        //获取上门前后开方详情
        getPrescription(doorServiceOrder);
        return doorServiceOrder;
    }
    /**
     *  //获取上门前后开方详情
     * @param doorServiceOrder
     */
    public void getPrescription(WlyyDoorServiceOrderDO doorServiceOrder){
        String id = doorServiceOrder.getId();
        List<WlyyPrescriptionDO> doorBeforePrescriptionDOList = prescriptionDao.findByOrderIdAndIsAfterDoor(id, 1);
        List<WlyyPrescriptionDO> doorAfterPrescriptionDOList = prescriptionDao.findByOrderIdAndIsAfterDoor(id, 2);
        getPrescriptionList(doorBeforePrescriptionDOList);
        getPrescriptionList(doorAfterPrescriptionDOList);
        doorServiceOrder.setPrescriptionDOList(doorBeforePrescriptionDOList);
        doorServiceOrder.setAfterPrescriptionList(doorAfterPrescriptionDOList);
    }
        return doorServiceOrder;
    public void getPrescriptionList(List<WlyyPrescriptionDO> prescriptionDOList){
        for (WlyyPrescriptionDO one : prescriptionDOList){
            List<WlyyPrescriptionDiagnosisDO> diagnosisDOs = prescriptionDiagnosisDao.findByPrescriptionId(one.getId() ,1);
            for (WlyyPrescriptionDiagnosisDO diagnosisDO:diagnosisDOs){
                if(diagnosisDO.getType()==1){
                    one.setDiagnosisName(diagnosisDO.getName());
                }else if(diagnosisDO.getType()==2&&StringUtils.isEmpty(one.getDiagnosisSubName())){
                    one.setDiagnosisSubName(diagnosisDO.getName());
                }
            }
        }
    }
    /**
@@ -565,6 +592,7 @@ public class DoorOrderService {
            first = first.replace("key2", null != doorServiceOrder.getDoctorName() ? doorServiceOrder.getDoctorName() : "");
            messageUtil.putTemplateWxMessage(wxId,"template_process_feedback","smyyyjjd",patient.getOpenid(),first,null,null,30,json,DateUtil.dateToStrShort(new Date()),"上门服务已接单");
        }catch (Exception e){
            e.printStackTrace();
            logger.error(e.getMessage());
        }
        //  待接单消息设为已操作， 434 医生接单-- 王五接受了服务工单12345678

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

@@ -174,6 +174,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
    @Autowired
    private PrescriptionDao prescriptionDao;
    /**
     * 上门服务工单服务基本信息
     *
@@ -1023,7 +1024,8 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
        //获取上门前后开方详情
        List<WlyyPrescriptionDO> doorBeforePrescriptionDOList = prescriptionDao.findByOrderIdAndIsAfterDoor(id, 1);
        List<WlyyPrescriptionDO> doorAfterPrescriptionDOList = prescriptionDao.findByOrderIdAndIsAfterDoor(id, 2);
        doorOrderService.getPrescriptionList(doorBeforePrescriptionDOList);
        doorOrderService.getPrescriptionList(doorAfterPrescriptionDOList);
        orderJson.put("doorBeforePrescription",doorBeforePrescriptionDOList);
        orderJson.put("doorAfterPrescription", doorAfterPrescriptionDOList);
        return orderJson;

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

@@ -156,7 +156,12 @@ public class MessageUtil {
    public void putTemplateWxMessage(String wechatId, String templateName, String scene, String openId, String first,String url, String remark, Integer type,JSONObject josn,String ...keywords) {
        try {
            System.out.println(wechatId);
            WxAccessTokenDO wxAccessTokenDO = wxAccessTokenService.getWxAccessTokenById(wechatId);
            List<WxAccessTokenDO> list = wxAccessTokenDao.getWxAccessTokenById(wechatId);
            if(list.size()==0){
                return;
            }
            WxAccessTokenDO wxAccessTokenDO = list.get(0);
            if (wxAccessTokenDO == null) {
                logger.info("wx_access_token表获取为空，wechatId" + wechatId);
                return;
@@ -287,7 +292,6 @@ public class MessageUtil {
                logger.error("当前工单没有医生待接单消息！orderId:" + orderId);
            }else {
                messages.forEach(message->{
                    systemMessageDao.orderMessageDel(message.getReceiver(),message.getRelationCode());
                    if (message.getType().equals("403") ) {
                        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doorServiceOrder.getDispatcher());//·
                        String msg=doorServiceOrder.getDispatcherName() + "接受了服务工单"+ doorServiceOrder.getNumber();

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

@@ -334,11 +334,11 @@ base:
  hospitalUrl: http://10.9.1.247:10022/
wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fwlyy
  accId: gh_ffd64560fb21
  appId: wxad04e9c4c5255acf1
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d31
  wechat_token: 27eb3bb24f149a7760cf1bb154b080401
  wechat_base_url: http%3a%2f%2fwww.xmt1yw.cn%2fwlyy
  accId: gh_ffd64560fb211
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
  flag: true #演示环境  true走Mysql数据库  false走Oracle