代码修改

business/base-service/src/main/java/com/yihu/jw/device/dao/PatientDeviceDao.java

@@ -42,6 +42,9 @@ public interface PatientDeviceDao extends JpaRepository<DevicePatientDevice, Lon
    DevicePatientDevice findByDeviceSnAndUserType(String deviceSn, String userType);
    @Query("select a from DevicePatientDevice a where a.deviceSn=?1 and a.userType =?2 ")
    List<DevicePatientDevice> findByDeviceSnAndUserType2(String deviceSn, String userType);
    @Query("select pd from DevicePatientDevice pd where pd.deviceSn = ?1 and pd.del=0")
    List<DevicePatientDevice> findByDeviceSn(String deviceSn);

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/service/PatientDeviceService.java

@@ -107,8 +107,13 @@ public class PatientDeviceService  {
        //校验sn码是否被使用
        if (needVerify) {
            if("1".equals(isScan)){
                //解绑
                List<DevicePatientDevice> devices = patientDeviceDao.findByDeviceSnAndUserType2(sn, userType);
                patientDeviceDao.deleteAll(devices);
            }
            DevicePatientDevice device = patientDeviceDao.findByDeviceSnAndUserType(sn, userType);
            if (!"1".equals(isScan)&&device != null && !device.getId().equals(patientDevice.getId())) {
            if (device != null && !device.getId().equals(patientDevice.getId())) {
                throw new ServiceException("sn码" + sn + "已被使用！");
            }
            deviceDetailService.registerToWlyy(patientDevice);