Merge branch 'dev' of linzhuo/patient-co-management into dev

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

@@ -183,6 +183,7 @@ public class PatientDeviceService extends BaseService {
		}
		for(PatientDevice patientDevice: patientDevices){
			patientDevice.setDelUser(uuid);
			patientDevice.setDel(1);
			patientDeviceDao.save(patientDevice);
		}
	}
@@ -194,6 +195,7 @@ public class PatientDeviceService extends BaseService {
	public List<JSONObject> deleteDevice(String id,String uuid) {
		PatientDevice device = patientDeviceDao.findOne(Long.valueOf(id));
		device.setDelUser(uuid);
		device.setDel(1);
		patientDeviceDao.save(device);
		List<PatientDevice> patientDevices = patientDeviceDao.findByDeviceSnAndCategoryCodeAndDel(device.getDeviceSn(),device.getCategoryCode(),0);
		List<JSONObject> objects = new ArrayList<>();

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -476,7 +476,7 @@ public class WechatController extends WeixinBaseController {
                    return error(-1, errorMessage);
                }else if(patients.size()>1&&StringUtils.isBlank(patient)) {
                    return write(1, "存在多个用户", "data", patients);
                }else if(patients.size()>1&&StringUtils.isNotBlank(patient)){
                }else{
                    Patient p = null;
                    if(patients.size()==1){
                        p  = patients.get(0);

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

@@ -91,9 +91,12 @@ public class DoctorDeviceController extends BaseController {
			PatientDevice pd = patientDeviceService.findById(id);
			if(pd!=null)
			{
				if(StringUtils.isNotBlank(pd.getDoctor())){
					List<AdminTeam> adminTeamMembers = adminTeamService.findDoctorsTeams(pd.getUser(),getUID());
				if(StringUtils.isNotBlank(pd.getDoctor())&&StringUtils.equals(pd.getDoctor(), getUID())){
					List<JSONObject> objects = patientDeviceService.deleteDevice(id,getUID());
					return write(200,"","data",objects);
				}
				else if(StringUtils.isNotBlank(pd.getDoctor())&&!StringUtils.equals(pd.getDoctor(), getUID())){
					List<AdminTeam> adminTeamMembers = adminTeamService.findDoctorsTeams(pd.getDoctor(),getUID());
					boolean bo = false;
					if(adminTeamMembers!=null && adminTeamMembers.size()>0)
					{
@@ -105,10 +108,7 @@ public class DoctorDeviceController extends BaseController {
					}else{
						return error(-1, "只允许删除自己及自己行政团队绑定的设备！");
					}
				}else if(StringUtils.isNotBlank(pd.getDoctor())&&StringUtils.equals(pd.getDoctor(), getUID())){
					List<JSONObject> objects = patientDeviceService.deleteDevice(id,getUID());
					return write(200,"","data",objects);
				}else{
				} else{
					return error(-1, "只允许删除自己及自己行政团队绑定的设备！");
				}
			}