冲突合并

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

@@ -666,7 +666,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     *  @param status 处方状态 1审方失败，2审核完成，3结算完成
     * @return
     */
    public boolean updatePrescriptionByHisStatu(String admNo,String realOrder,String status)throws Exception {
    public Map<String,Object> updatePrescriptionByHisStatu(String admNo,String realOrder,String status)throws Exception {
        Map<String,Object> rs = new HashedMap();
        String sql = "";
        //status 处方流程状态 ，13  开方失败/调整中，20 诊断完成/开方成功/待支付,已完成：100 已完成
        //pay_status`:处方结算状态，0为未结算，1为结算成功，默认为0',
@@ -714,14 +716,19 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                prescriptionDao.save(wlyyPrescriptionDO);
            }
            //发送取药系统消息
            sendPatientGetDrugMes(outpatientDO,wlyyPrescriptionDO);
            SystemMessageDO systemMessageDO = sendPatientGetDrugMes(outpatientDO,wlyyPrescriptionDO);
            rs.put("mes",systemMessageDO);
        }
        return true;
        rs.put("flag",true);
        return rs;
    }
    public Boolean sendPatientGetDrugMes(WlyyOutpatientDO outpatient,WlyyPrescriptionDO prescriptionDO){
    public SystemMessageDO sendPatientGetDrugMes(WlyyOutpatientDO outpatient,WlyyPrescriptionDO prescriptionDO){
        SystemMessageDO systemMessageDO = new SystemMessageDO();
        try{
            SystemMessageDO systemMessageDO = new SystemMessageDO();
            systemMessageDO.setTitle("患者取药");
            systemMessageDO.setType("7");
            systemMessageDO.setReceiver(outpatient.getDoctor());
@@ -744,9 +751,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }catch (Exception e){
            logger.error("sendPatientGetDrugMes :"+e.toString());
            return false;
        }
        return true;
        return systemMessageDO;
    }
    /**
@@ -3486,9 +3492,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        //3.创建候诊室
        createRoom(outpatient,chargeType);
        //4.发送协同门诊系统消息
        sendOutPatientMes(outpatient);
        return outpatient;
    }
@@ -3497,9 +3500,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param outpatient
     * @return
     */
    public Boolean sendOutPatientMes(WlyyOutpatientDO outpatient){
    public SystemMessageDO sendOutPatientMes(WlyyOutpatientDO outpatient){
        SystemMessageDO systemMessageDO = new SystemMessageDO();
        try{
            SystemMessageDO systemMessageDO = new SystemMessageDO();
            //1.在线复诊2.协同门诊
            if("2".equals(outpatient.getOutpatientType())){
                systemMessageDO.setTitle("协同门诊");
@@ -3532,10 +3535,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }catch (Exception e){
            logger.error("sendOutPatientMes :"+e.toString());
            return false;
            return null;
        }
        return true;
        return systemMessageDO;
    }
    /**
     * 指定门诊医生医生
     * @param outpatientJson

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/third/PrescriptionUpdateController.java

@@ -1,6 +1,8 @@
package com.yihu.jw.entrance.controller.third;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entrance.service.HospitalSystemMessageService;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.Map;
/**
 * Created by zdm on 2019/5/30.
@@ -26,6 +29,9 @@ public class PrescriptionUpdateController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyHttpLogDao wlyyHttpLogDao;
    @Autowired
    private HospitalSystemMessageService hospitalSystemMessageService;
    @PostMapping(value = "/preUpdate")
    @ApiOperation(value = "药房配药his提示处方变更")
    public ObjEnvelop prescriptionUpdate(
@@ -37,16 +43,22 @@ public class PrescriptionUpdateController extends EnvelopRestEndpoint {
            @RequestParam(value = "status") String status) {
        try {
            WlyyHttpLogDO log = new WlyyHttpLogDO();
            log.setCode("prescriptionUpdate");
            log.setName("药房发药回调");
            log.setRequest("admNo="+admNo+"&realOrder="+realOrder+"&status="+status);
            log.setCreateTime(new Date());
            log.setStatus("0");
            log = wlyyHttpLogDao.save(log);
            boolean obj= prescriptionService.updatePrescriptionByHisStatu(admNo,realOrder,status);
            log.setResponse("更新结果"+obj);
            Map<String,Object> obj= prescriptionService.updatePrescriptionByHisStatu(admNo,realOrder,status);
            log.setResponse("更新结果"+obj.get("flag"));
            wlyyHttpLogDao.save(log);
            return ObjEnvelop.getSuccess("更新成功",obj);
            //推送IM消息
            hospitalSystemMessageService.sendImMessage((SystemMessageDO)obj.get("mes"));
            return ObjEnvelop.getSuccess("更新成功",obj.get("flag"));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("更新失败"+e.getMessage());

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/service/HospitalSystemMessageService.java

@@ -0,0 +1,64 @@
package com.yihu.jw.entrance.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.im.service.ImService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
 * 互联网医院系统消息业务层
 * @author huangwenjie
 * @date 2019/11/22 13:53
 */
@Service
public class HospitalSystemMessageService  {
    private static Logger logger = LoggerFactory.getLogger(HospitalSystemMessageService.class);
    @Autowired
    private SystemMessageService systemMessageService;
    @Autowired
    private ImService imService;
    /**
     * 保存系统消息
     * @param systemMessageDO
     * @throws Exception
     */
    public void saveMessage(SystemMessageDO systemMessageDO) throws Exception{
        //发送系统消息
        systemMessageService.saveMessage(systemMessageDO);
        //发型IM外层消息
        JSONObject object = new JSONObject();
        object.put("socket_sms_type",11);//系统消息刷新事件
        object.put("relation_code",systemMessageDO.getType());
        imService.sendWaiSocketMessage(systemMessageDO.getSender(),systemMessageDO.getReceiver(),object.toString(),"1");
    }
    /**
     * 发送IM消息推送
     * @param systemMessageDO
     * @throws Exception
     */
    public void sendImMessage(SystemMessageDO systemMessageDO) throws Exception{
        try{
            //发型IM外层消息
            JSONObject object = new JSONObject();
            object.put("socket_sms_type",11);//系统消息刷新事件
            object.put("relation_code",systemMessageDO.getType());
            imService.sendWaiSocketMessage(systemMessageDO.getSender(),systemMessageDO.getReceiver(),object.toString(),"1");
        }catch (Exception e){
            logger.error(e.toString());
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/SystemMessage/HospitalSystemMessageService.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.im.service.ImService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -15,7 +17,10 @@ import org.springframework.stereotype.Service;
 */
@Service
public class HospitalSystemMessageService  {
	
	private static Logger logger = LoggerFactory.getLogger(HospitalSystemMessageService.class);
	@Autowired
	private SystemMessageService systemMessageService;
	
@@ -38,4 +43,22 @@ public class HospitalSystemMessageService  {
		imService.sendWaiSocketMessage(systemMessageDO.getSender(),systemMessageDO.getReceiver(),object.toString(),"1");
	}
	/**
	 * 发送IM消息推送
	 * @param systemMessageDO
	 * @throws Exception
     */
	public void sendImMessage(SystemMessageDO systemMessageDO) throws Exception{
		try{
			//发型IM外层消息
			JSONObject object = new JSONObject();
			object.put("socket_sms_type",11);//系统消息刷新事件
			object.put("relation_code",systemMessageDO.getType());
			imService.sendWaiSocketMessage(systemMessageDO.getSender(),systemMessageDO.getReceiver(),object.toString(),"1");
		}catch (Exception e){
			logger.error(e.toString());
		}
	}
}