111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/admin/CommonEndpoint.java

@@ -1,9 +1,6 @@
package com.yihu.jw.care.endpoint.admin;
import com.alibaba.fastjson.JSONObject;
import com.getui.push.v2.sdk.ApiHelper;
import com.getui.push.v2.sdk.GtApiConfiguration;
import com.getui.push.v2.sdk.api.PushApi;
import com.yihu.jw.care.dao.label.BaseCapacityLabelDao;
import com.yihu.jw.care.service.common.CommomService;
import com.yihu.jw.care.service.device.DevicePatientFaceService;
@@ -12,7 +9,6 @@ import com.yihu.jw.care.util.DingdingUtil;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.care.label.BaseCapacityLabelDO;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.push.service.GetuiService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -1609,8 +1609,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                    "from base_emergency_assistance_order o " +
                    "LEFT JOIN wlyy_devices wd on wd.device_code=o.device_sn " +
                    "LEFT JOIN dm_device dd on dd.category_code = wd.category_code " +
                    " WHERE id = ?";
                    " WHERE o.id = ?";
        }
        if ("22".equals(orderType)){
            eaSql   = "SELECT o.`status`,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') AS createTime,o.patient,o.team_code,o.serve_desc serveDesc,dd.photo " +
@@ -1644,20 +1643,47 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        Map<Integer,List<BaseEmergencyWarnLogDO>> resultMap = warnLogDOList.stream().collect(Collectors.groupingBy(e -> e.getType()));
        //预警核实
        List<BaseEmergencyWarnLogDO> check = new ArrayList<>();
        check.addAll(resultMap.get(8));
        check.addAll(resultMap.get(9));
        check.addAll(resultMap.get(10));
        if(resultMap.containsKey(8)){
            check.addAll(resultMap.get(8));
        }
        if(resultMap.containsKey(9)){
            check.addAll(resultMap.get(9));
        }
        if(resultMap.containsKey(10)){
            check.addAll(resultMap.get(10));
        }
        if(check.size()>0){
            check.forEach(logDO->{
                if(logDO.getUserType()==1){
                    logDO.setUserTypeName("居民");
                }else{
                    logDO.setUserTypeName("社工");
                }
            });
            check = check.stream().sorted(Comparator.comparing(BaseEmergencyWarnLogDO::getCreateTime)).collect(Collectors.toList());
            jsonObject.put("check",check);
        }
        //预警处置
        List<BaseEmergencyWarnLogDO> dealWith = new ArrayList<>();
        dealWith.addAll(resultMap.get(2));
        dealWith.addAll(resultMap.get(3));
        dealWith.addAll(resultMap.get(4));
        if(resultMap.containsKey(2)){
            dealWith.addAll(resultMap.get(2));
        }
        if(resultMap.containsKey(3)){
            dealWith.addAll(resultMap.get(3));
        }
        if(resultMap.containsKey(4)){
            dealWith.addAll(resultMap.get(4));
        }
        if(dealWith.size()>0){
            dealWith.forEach(logDO->{
                if(logDO.getUserType()==1){
                    logDO.setUserTypeName("居民");
                }else{
                    logDO.setUserTypeName("社工");
                }
            });
            dealWith = dealWith.stream().sorted(Comparator.comparing(BaseEmergencyWarnLogDO::getCreateTime)).collect(Collectors.toList());
            jsonObject.put("dealWith",dealWith);
        }
@@ -1665,19 +1691,37 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        //处置结论
        List<BaseEmergencyWarnLogDO> conclusion = resultMap.get(5);
        if(conclusion!=null){
            jsonObject.put("conclusion",conclusion.get(0));
            BaseEmergencyWarnLogDO logDO = conclusion.get(0);
            if(logDO.getUserType()==1){
                logDO.setUserTypeName("居民");
            }else{
                logDO.setUserTypeName("社工");
            }
            jsonObject.put("conclusion",logDO);
        }
        //预警复核
        List<BaseEmergencyWarnLogDO> review = resultMap.get(7);
        if(review!=null){
            jsonObject.put("review",review.get(0));
            BaseEmergencyWarnLogDO logDO = review.get(0);
            if(logDO.getUserType()==1){
                logDO.setUserTypeName("居民");
            }else{
                logDO.setUserTypeName("社工");
            }
            jsonObject.put("review",logDO);
        }
        //取消
        List<BaseEmergencyWarnLogDO> cancel = resultMap.get(6);
        if(cancel!=null){
            jsonObject.put("cancel",cancel.get(0));
            BaseEmergencyWarnLogDO logDO = cancel.get(0);
            if(logDO.getUserType()==1){
                logDO.setUserTypeName("居民");
            }else{
                logDO.setUserTypeName("社工");
            }
            jsonObject.put("cancel",logDO);
        }
        return jsonObject;
@@ -1702,22 +1746,17 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            noticeObj.put("name", patientDO1.getName());
            noticeObj.put("photo", patientDO1.getPhoto());
            noticeObj.put("mobile", patientDO1.getMobile());
            List<Map<String, Object>> arr = new ArrayList<>();
            Map<String, Object> tmp = new HashMap<>();
            tmp.put("name", "系统预警");
            tmp.put("status", 0);
            tmp.put("statusName", "未读");
            noticeObj.put("status", 0);
            noticeObj.put("statusName", "未读");
            SystemMessageDO messageDO = systemMessageDao.findByRelationCodeAndReceiver(orderId, patientId);
            if (messageDO != null) {
                if (StringUtils.isNotBlank(messageDO.getIsRead())) {
                    tmp.put("status", Integer.parseInt(messageDO.getIsRead()));
                    noticeObj.put("status", Integer.parseInt(messageDO.getIsRead()));
                    if (Integer.parseInt(messageDO.getIsRead()) == 1) {
                        tmp.put("statusName", "已读");
                        noticeObj.put("statusName", "已读");
                    }
                }
            }
            arr.add(tmp);
            noticeObj.put("response", arr);
            noticePersons.add(noticeObj);
        }
        return noticePersons;