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

common/common-entity/src/main/java/com/yihu/device/entity/DeviceDetail.java

@@ -34,10 +34,10 @@ public class DeviceDetail extends IdEntity{
    //1.4.8版本新增字段
    private String sim;//SIM卡
    private String manufacturerId;//厂商表的业务关联code
    private Boolean grant;//是否发放（0否1是）
    private Integer isGrant;//是否发放（0否1是）
    private String grantAdminTeam;//发放的患者所在团队
    private String grantOrgCode;//发放所在机构
    private Integer binding;//是否绑定（0否 1 绑定单端口 2 绑定双端口）
    private Integer isBinding;//是否绑定（0否 1 绑定单端口 2 绑定双端口）
    private String bindingCount;//绑定次数（{"1":"0", "2":"0"}）
    private Date grantTime;//发放时间
@@ -230,12 +230,12 @@ public class DeviceDetail extends IdEntity{
    }
    @Column(name = "is_grant")
    public Boolean getGrant() {
        return grant;
    public Integer getIsGrant() {
        return isGrant;
    }
    public void setGrant(Boolean grant) {
        this.grant = grant;
    public void setIsGrant(Integer grant) {
        isGrant = grant;
    }
    @Column(name = "grant_admin_team")
@@ -257,12 +257,12 @@ public class DeviceDetail extends IdEntity{
    }
    @Column(name = "is_binding")
    public Integer getBinding() {
        return binding;
    public Integer getIsBinding() {
        return isBinding;
    }
    public void setBinding(Integer binding) {
        this.binding = binding;
    public void setIsBinding(Integer isBinding) {
        this.isBinding = isBinding;
    }
    @Column(name = "binding_count")

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

@@ -22,9 +22,9 @@ public interface DeviceDetailDao extends PagingAndSortingRepository<DeviceDetail
    @Modifying
    @Query("update DeviceDetail dd set dd.isGrant=1,dd.grantAdminTeam=?1,dd.grantOrgCode=?2,dd.bindingCount=?3,dd.isBinding=1 where dd.deviceCode=?4")
    void updateAfterBinding(String adminTeam, String hospital, String isFirstBinding,String deviceSn);
    void updateAfterBinding(String adminTeam, String hospital, String isFirstBinding,String deviceSn,int isBinding);
    @Modifying
    @Query("update DeviceDetail dd set dd.isBinding=0 where dd.deviceCode=?1")
    void updateUnbindAll(String deviceSn);
    void updateUnbindAll(int isbinding,String deviceSn);
}

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

@@ -86,7 +86,9 @@ public class DeviceDetailService extends BaseService {
		if (isFirst){
			deviceDetailDao.updateAfterBindingFirst(String.valueOf(adminTeam),hospital,isFirstBind,grantTime,patientDevice.getDeviceSn());
		}else {
			deviceDetailDao.updateAfterBinding(String.valueOf(adminTeam),hospital,isFirstBind,patientDevice.getDeviceSn());
			List<PatientDevice> patientDeviceList = patientDeviceDao.findByDeviceSn(patientDevice.getDeviceSn());
			int patientDeviceSize = patientDeviceList.size();
			deviceDetailDao.updateAfterBinding(String.valueOf(adminTeam),hospital,isFirstBind,patientDevice.getDeviceSn(),patientDeviceSize);
		}
	}
@@ -146,7 +148,13 @@ public class DeviceDetailService extends BaseService {
	public void unBindUpdateIsBinding(String deviceSn)throws Exception{
		List<PatientDevice> patientDeviceList = patientDeviceDao.findByDeviceSn(deviceSn);
		if (patientDeviceList.size()==0){
			deviceDetailDao.updateUnbindAll(deviceSn);
			deviceDetailDao.updateUnbindAll(0,deviceSn);
		}
		if (patientDeviceList.size()==1){
			deviceDetailDao.updateUnbindAll(1,deviceSn);
		}
		if (patientDeviceList.size()>1){
			deviceDetailDao.updateUnbindAll(2,deviceSn);
		}
	}
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/device/PatientDeviceController.java

@@ -225,7 +225,7 @@ public class PatientDeviceController extends BaseController {
            String sn = device.getDeviceSn();
            synchronized (sn.intern()){
                patientDeviceService.saveDevice(device);
                patientDeviceLogService.savePatientDeviceLog(device,2,1);
                patientDeviceLogService.savePatientDeviceLog(device,device.getDeviceSn(),2,1);
            }
            //修改设备表中{"1":"0", "2":"0"}的绑定次数 和其他绑定信息,
            deviceDetailService.updateAfterBinding(device,new Date(),flag);