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

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

@@ -109,7 +109,7 @@ public class DoctorDeviceController extends BaseController {
			//绑定
			patientDeviceService.saveDevice(device);
			//修改设备表中是否是首绑{"1":"1", "2":"1"}修改成{"1":"0", "2":"0"} 和其他绑定信息,
			//修改设备表中{"1":"0", "2":"0"}绑定次数 和其他绑定信息,
			wlyyDeviceDetailService.updateAfterBinding(device.getDeviceSn(),device.getUserIdcard(),device.getUserType(),new Date(),flag);
			//调用增加积分接口
			if (flag){
@@ -118,34 +118,31 @@ public class DoctorDeviceController extends BaseController {
				JSONObject jsonObject = JSONObject.parseObject(creditDetail);
				JSONObject response = creditLogService.insert(jsonObject);
				String status = response.getString("status");
				if ("200".equals(status)){
                    List<Map<String,Object>> list = (List<Map<String,Object>>)response.get("detailModelList");
                    if (list!=null && list.size()>0){
                        String integrate = String.valueOf(list.get(0).get("integrate"));
                        String flagType = String.valueOf(list.get(0).get("flag"));
                        
                        //@TODO 调用发送微信模板接口
	                    try {
		                    Patient people = patientDao.findByCode(device.getUser());
		                    String openId = people.getOpenid();
		                    String name = people.getName();
		                    org.json.JSONObject sendJson = new org.json.JSONObject();
		                    String first = "";
		                    String remark = "";
		                    String deviceName = device.getDeviceName();
		                    WechatTemplateConfig templateConfig = templateConfigDao.findByScene("template_patient_bind_device","bdsb");
		                    first = templateConfig.getFirst();
		                    first = first.replace("key1",(deviceName==null?"":deviceName));
		                    remark = templateConfig.getRemark();
		                    String keyword1 = templateConfig.getKeyword1();
		                    sendJson.put("keyword1", keyword1);
		                    sendJson.put("keyword2", device.getCzrq());
		                    sendJson.put("first", first);
		                    sendJson.put("remark", remark);
		                    sendJson.put("url", templateConfig.getUrl());//带参数的模板跳转链接
		                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 22, openId, name, sendJson);
				if (!"200".equals(status)){
					logger.info("添加积分失败！");
                }
			}
			try {
				Patient people = patientDao.findByCode(device.getUser());
				String openId = people.getOpenid();
				String name = people.getName();
				org.json.JSONObject sendJson = new org.json.JSONObject();
				String first = "";
				String remark = "";
				String deviceName = device.getDeviceName();
				WechatTemplateConfig templateConfig = templateConfigDao.findByScene("template_patient_bind_device","bdsb");
				first = templateConfig.getFirst();
				first = first.replace("key1",(deviceName==null?"":deviceName));
				remark = templateConfig.getRemark();
				String keyword1 = templateConfig.getKeyword1();
				sendJson.put("keyword1", keyword1);
				sendJson.put("keyword2", device.getCzrq());
				sendJson.put("first", first);
				sendJson.put("remark", remark);
				sendJson.put("url", templateConfig.getUrl());//带参数的模板跳转链接
				pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 22, openId, name, sendJson);
//	                    //发送代理人
//	                    jsonArray = weiXinOpenIdUtils.getAgentOpenId(patient, openId);
//	                    if (jsonArray != null && jsonArray.length() > 0) {
@@ -162,15 +159,10 @@ public class DoctorDeviceController extends BaseController {
//			                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 19, member.getOpenid(), name, sendJson);
//		                    }
//	                    }
	                    }catch (Exception e){
		                    logger.info("设备绑定微信模板消息发送失败："+e.getMessage());
			}catch (Exception e){
				logger.info("设备绑定微信模板消息发送失败："+e.getMessage());
//	                        e.printStackTrace();
	                    }
                    }
                }
			}
			return success("设备保存成功！");
		}
		catch (Exception ex) {

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

@@ -220,7 +220,7 @@ public class PatientDeviceController extends BaseController {
            //判断是否为积分设备
            DeviceDetail deviceDetail = wlyyDeviceDetailService.findBySn(device.getDeviceSn());
            if (deviceDetail!=null){
                //修改设备表中是否是首绑{"1":"1", "2":"1"}修改成{"1":"0", "2":"0"} 和其他绑定信息,
                //修改设备表中{"1":"0", "2":"0"}的绑定次数 和其他绑定信息,
                wlyyDeviceDetailService.updateAfterBinding(device.getDeviceSn(),device.getUserIdcard(),device.getUserType(),new Date(),flag);
                if (flag){
                    Patient patient = patientService.findByCode(device.getUser());