|
@@ -297,7 +297,14 @@ public class HandlerThread {
|
297
|
297
|
}
|
298
|
298
|
ObjectMapper objectMapper = new ObjectMapper();
|
299
|
299
|
String json = objectMapper.writeValueAsString(rMap);
|
300
|
|
- PhoneWebSocket.sendMessage(phoneMap.get(his+jsonObject.get("channel").toString()),json);
|
|
300
|
+
|
|
301
|
+ String temp = phoneMap.get(his + jsonObject.get("channel").toString());
|
|
302
|
+
|
|
303
|
+ log.info("******************");
|
|
304
|
+ log.info("phone:"+temp +",json:"+json);
|
|
305
|
+ log.info("******************");
|
|
306
|
+
|
|
307
|
+ PhoneWebSocket.sendMessage(temp,json);
|
301
|
308
|
}
|
302
|
309
|
} else if (jsonObject.containsKey("phonestate") && jsonObject.get("phonestate").toString().equals("4") || jsonObject.get("phonestate").toString() == "4") {
|
303
|
310
|
Map rMap = new HashMap();
|
|
@@ -385,6 +392,7 @@ public class HandlerThread {
|
385
|
392
|
// List<DictionaryEntity> dictionaryEntityList = dictionaryDAO.selectDictionaryByKey(key);
|
386
|
393
|
List<HospitalConfig> hospitalConfigList = hospitalConfigDAO.getHospitalConfigList(key,his);
|
387
|
394
|
if (hospitalConfigList!=null&&hospitalConfigList.size()>0){
|
|
395
|
+
|
388
|
396
|
for (HospitalConfig hospitalConfig:hospitalConfigList){
|
389
|
397
|
phoneMap.put(his+hospitalConfig.getValue2(),hospitalConfig.getValue());
|
390
|
398
|
}
|