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

patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/service/AsyncService.java

@@ -102,6 +102,7 @@ public class AsyncService extends BaseService{
            int type = data.getType();
            String msgContent = "";
            String msgContentTemp = "";
            //血糖校验
            if (type == 1) {
                // 血糖记录，查询患者血糖预警值
@@ -130,7 +131,7 @@ public class AsyncService extends BaseService{
                // 餐后
                if (index % 2 == 0) {
                    if (!checkHealthIndex(NumberUtils.toDouble(value1), maxValueAfter ,minValueAfter )) {
//                    msgContent += patient.getName() + "血糖异常（" + value1 + "mmol/L），请处理";
                        msgContentTemp += patient.getName() + "血糖异常（" + value1 + "mmol/L），请处理";
                        if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueAfter ,minValueAfter)==1){
                            msgContent = "<a>"+patient.getName()+"</a><span style=\"color: #FF4C4C;\">血糖偏高</span>";
                        }else if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueAfter ,minValueAfter)==2){
@@ -143,7 +144,7 @@ public class AsyncService extends BaseService{
                    }
                } else { //餐前
                    if (!checkHealthIndex(NumberUtils.toDouble(value1), maxValueBefore, minValueBefore)) {
//                    msgContent += patient.getName() + "血糖异常（" + value1 + "mmol/L），请处理";
                        msgContentTemp += patient.getName() + "血糖异常（" + value1 + "mmol/L），请处理";
                        if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueAfter ,minValueAfter)==1){
                            msgContent = "<a>"+patient.getName()+"</a><span style=\"color: #FF4C4C;\">血糖偏高</span>";
                        }else if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueAfter ,minValueAfter)==2){
@@ -182,7 +183,7 @@ public class AsyncService extends BaseService{
                }
                // 收缩压/舒张压校验
                if (!checkHealthIndex(NumberUtils.toDouble(value1), maxValueSSY, minValueSSY) || !checkHealthIndex(NumberUtils.toDouble(value2), maxValueSZY, minValueSZY)) {
//                msgContent = patient.getName() + "血压异常（舒张压 " + value2 + "mmHg、收缩压 " + value1 + "mmHg），请处理";
                    msgContentTemp = patient.getName() + "血压异常（舒张压 " + value2 + "mmHg、收缩压 " + value1 + "mmHg），请处理";
                    if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueSSY, minValueSSY)==1||checkHealthIndexDetail(NumberUtils.toDouble(value2), maxValueSZY, minValueSZY)==1){
                        msgContent = "<a>"+patient.getName()+"</a><span style=\"color: #FF4C4C;\">血压偏高</span>";
                    }else if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueSSY, minValueSSY)==2||checkHealthIndexDetail(NumberUtils.toDouble(value2), maxValueSZY, minValueSZY)==2){
@@ -197,7 +198,7 @@ public class AsyncService extends BaseService{
            //超标则发送消息
            if (msgContent != null && msgContent.length() > 0) {
                sendMessage(msgContent, patient, data);
                sendMessage(msgContent, patient, data,msgContentTemp);
            }
        }catch (Exception e){
            e.printStackTrace();
@@ -230,7 +231,7 @@ public class AsyncService extends BaseService{
    /**
     * 推送信息
     */
    private void sendMessage(String content, Patient patient, PatientHealthIndex model) {
    private void sendMessage(String content, Patient patient, PatientHealthIndex model,String contentTemp) {
        logger.info("======start sendMessage======");
        String patientCode = patient.getCode();
        String patientName = patient.getName();
@@ -312,7 +313,7 @@ public class AsyncService extends BaseService{
                json.put("receiver", receiver);
                json.put("type", MessageType.MESSAGE_TYPE_DOCTOR_HEALTH_INDEX.D_HI_01.name());
                json.put("title", MessageType.MESSAGE_TYPE_DOCTOR_HEALTH_INDEX.体征指标.name());
                json.put("msg", content);
                json.put("msg", contentTemp);
                json.put("data", "");
                array.add(json);
            }