Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PatientDeviceDao.java

@@ -22,4 +22,6 @@ public interface PatientDeviceDao extends PagingAndSortingRepository<PatientDevi
	PatientDevice findByDeviceSnAndCategoryCodeAndUserType(String deviceSn, String categoryCode,String userType);
	PatientDevice findByDeviceIdAndDeviceSnAndUserType(Long deviceId, String deviceSn,String userType);
	PatientDevice findByDeviceSnAndUserType(String deviceSn,String userType);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/PatientDeviceService.java

@@ -99,7 +99,8 @@ public class PatientDeviceService extends BaseService {
			//校验sn码是否被使用
			if(needVerify) {
				PatientDevice device = patientDeviceDao.findByDeviceIdAndDeviceSnAndUserType(deviceId, sn, userType);
//				PatientDevice device = patientDeviceDao.findByDeviceIdAndDeviceSnAndUserType(deviceId, sn, userType);
				PatientDevice device = patientDeviceDao.findByDeviceSnAndUserType(sn, userType);
				if (device != null && !device.getId().equals(patientDevice.getId())) {
					throw new Exception("sn码" + sn + "已被使用！");
				}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwSmjkService.java

@@ -94,9 +94,9 @@ public class JwSmjkService {
                ex.printStackTrace();
            }
            if(re.equals("[{}]"))
            if(re.contains("[{}]"))
            {
                re = "";
                re = re.replace("[{}]","[]");
            }
            return re;
@@ -234,9 +234,9 @@ public class JwSmjkService {
                    throw new Exception("null response.");
                }
                if(re.equals("[{}]"))
                if(re.contains("[{}]"))
                {
                    re = "";
                    re = re.replace("[{}]","[]");
                }
                return re;
@@ -282,9 +282,9 @@ public class JwSmjkService {
                throw new Exception("null response.");
            }
            if(result.equals("[{}]"))
            if(result.contains("[{}]"))
            {
                result = "";
                result = result.replace("[{}]","[]");
            }
            return result;