Merge branch 'dev' of chinawu123/wlyy2.0 into dev

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

@@ -888,6 +888,16 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        String failMsg = "当前救助工单已取消";
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg,JSONObject.parseObject(JSON.toJSONStringWithDateFormat(assistanceDO,"yyyy-MM-dd HH:mm:ss", SerializerFeature.WriteMapNullValue)));
        BaseEmergencyWarnLogDO logTypeDO = new BaseEmergencyWarnLogDO();
        logTypeDO.setUserCode(patient);
        logTypeDO.setUserName(assistanceDO.getPatientName());
        logTypeDO.setOrderId(orderId);
        logTypeDO.setUserType(1);
        logTypeDO.setCreateTime(new Date());
        logTypeDO.setContent("前往定位");
        logTypeDO.setType(6);
        logDao.save(logTypeDO);
        return result;
    }
@@ -1434,13 +1444,15 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            jsonObject.put("status",map.get("status"));
            jsonObject.put("createTime",map.get("createTime"));
        }
        String sql = "select * from base_emergency_warn_log where user_type = 2 and order_id = '"+orderId+"' and type IS NOT NULL ";
        String sql = "select * from base_emergency_warn_log where (user_type = 2 and order_id = '"+orderId+"' and type IS NOT NULL) " +
                " OR (user_type = 1 AND order_id = '"+"+orderId+"+"' and type IS NOT NULL)";
        List<BaseEmergencyWarnLogDO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BaseEmergencyWarnLogDO.class));
        jsonObject.put("type1_status",0);
        jsonObject.put("type2_status",0);
        jsonObject.put("type3_status",0);
        jsonObject.put("type4_status",0);
        jsonObject.put("type5_status",0);
        jsonObject.put("type6_status",0);
        for (BaseEmergencyWarnLogDO baseEmergencyWarnLogDO : query) {
            switch (baseEmergencyWarnLogDO.getType()){
                case 1:
@@ -1473,6 +1485,12 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                    jsonObject.put("type5_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type5_time",baseEmergencyWarnLogDO.getCreateTime());
                    break;
                case 6:
                    jsonObject.put("type6_status",1);
                    jsonObject.put("type6_name",baseEmergencyWarnLogDO.getUserName());
                    jsonObject.put("type6_content",baseEmergencyWarnLogDO.getContent());
                    jsonObject.put("type6_time",baseEmergencyWarnLogDO.getCreateTime());
                default:
                    break;
            }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -36,7 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
@@ -192,7 +191,11 @@ public class PatientInfoPlatFormService {
            //能力状况
            BaseCapacityLabelDO capacityLabelDO = capacityLabelDao.findByPatient(patient);
            result.put("capacityLabelDO",capacityLabelDO);
            result.put("capacityLabelDOStr",capacityLabelDO.getCapacityLabels());
            if (capacityLabelDO.getCapacityLabels().size() > 0) {
                result.put("capacityLabelDOStr", capacityLabelDO.getCapacityLabels());
            }else {
                result.put("capacityLabelDOStr", null);
            }
            return result;
        }
        return null;