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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/emergency/EmergencyOrderVO.java

@@ -54,7 +54,7 @@ public class EmergencyOrderVO {
    private List<PatientSosContactsDO> sosContacts;//紧急联系人
    private List<Map<String,Object>> securityDevices;//安防设备列表
    private String overTimeNotResponse;
    private Integer orderType;//20紧急 22安防
    private Integer OrderType;//20紧急 22安防
    public String getId() {
        return id;
@@ -297,10 +297,10 @@ public class EmergencyOrderVO {
    }
    public Integer getOrderType() {
        return orderType;
        return OrderType;
    }
    public void setOrderType(Integer orderType) {
        this.orderType = orderType;
        OrderType = orderType;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/contacts/ContactsService.java

@@ -374,26 +374,24 @@ public class ContactsService {
                        if (StringUtils.isNotBlank(response)) {
                            String[] DelNums = del_num.split("_");
                            for (String tmp:DelNums){
                                if (!delSuccess.contains(tmp)){//本次已删除过 不再作删除操作
                                    String deviceCode = simTmp.get("device_sn").toString();
                                    JSONObject aqgDeviceInfo = patientDeviceService.getAqgDeviceInfo(deviceCode);
                                    JSONArray aqgDeviceSosNum = aqgDeviceInfo.getJSONArray("sos_numbers");
                                    Integer numIndex=0;
                                    for (int i=0;i<aqgDeviceSosNum.size();i++){
                                        JSONObject aqgTmp = aqgDeviceSosNum.getJSONObject(i);
                                        String aqgNum = aqgTmp.getString("num");
                                        if (aqgNum.equals(tmp)){
                                            numIndex = aqgTmp.getInteger("seqid");
                                            break;
                                        }
                                    }
                                    if (numIndex!=0){
                                      JSONObject response2 =  patientDeviceService.updAqgDeviceSosInfo(deviceCode,numIndex+"",null,null,null,"1");
                                      if (response2.getBoolean("success")){
                                          delSuccess += "_"+tmp;
                                      }
                                String deviceCode = simTmp.get("device_sn").toString();
                                JSONObject aqgDeviceInfo = patientDeviceService.getAqgDeviceInfo(deviceCode);
                                JSONArray aqgDeviceSosNum = aqgDeviceInfo.getJSONArray("sos_numbers");
                                Integer numIndex=0;
                                for (int i=0;i<aqgDeviceSosNum.size();i++){
                                    JSONObject aqgTmp = aqgDeviceSosNum.getJSONObject(i);
                                    String aqgNum = aqgTmp.getString("num");
                                    if (aqgNum.equals(tmp)){
                                        numIndex = aqgTmp.getInteger("seqid");
                                        break;
                                    }
                                }
                                if (numIndex!=0){
                                  JSONObject response2 =  patientDeviceService.updAqgDeviceSosInfo(deviceCode,numIndex+"",null,null,null,"1");
                                  if (response2.getBoolean("success")){
                                      delSuccess += "_"+tmp;
                                  }
                                }
                            }
                        }
                    }
@@ -404,7 +402,7 @@ public class ContactsService {
        }
        //保存修改记录
        List<PatientSosContactsDO> modify = new ArrayList<>();
        for (String num:numTmp){
        for(String num:numTmp){
            if (StringUtils.isNotBlank(num)){
                PatientSosContactsDO patientSosContactsDO = sosContactsDao.findByPatientAndSosPhone(patient,num);
                patientSosContactsDO.setUpdateTime(new Date());