修改

src/main/java/com/dashitech/callcenter/socket/HandlerThread.java

@@ -327,7 +327,11 @@ public class HandlerThread  {
             if (callLog!=null){
                 if (jsonObject.containsKey("dtmfa")&& StringUtils.isNotEmpty(jsonObject.get("dtmfa").toString())&&!jsonObject.get("dtmfa").toString().equals("")&&!jsonObject.get("dtmfa").toString().equals(" ")){
                     // 查询科室信息 并赋值
-                    getDeptByDTMFA(jsonObject.get("dtmfa").toString(), callLog);
+                    String dtmfa = jsonObject.get("dtmfa").toString();
+                    if (0 == callLog.getCallType() && callLog.getdTMFB() != null) {
+                        dtmfa = callLog.getdTMFB();
+                    }
+                    getDeptByDTMFA(dtmfa, callLog);
                 }else {
                     callLog.setCallDept("暂无");
                 }
@@ -403,8 +407,8 @@ public class HandlerThread  {
                     callLog.setPhyIDA(jsonObject.get("phyIDA").toString());
                 }
                 if (jsonObject.containsKey("DTMFA")){
-                    callLog.setdTMFA(jsonObject.get("DTMFA").toString());
                     getDeptByDTMFA(jsonObject.get("DTMFA").toString(), callLog);
+                    callLog.setdTMFA(jsonObject.get("DTMFA").toString());
                 }
                 if (jsonObject.containsKey("DTMFB")){
                     callLog.setdTMFB(jsonObject.get("DTMFB").toString());
@@ -438,6 +442,9 @@ public class HandlerThread  {
                     }
 //                    callLog.setCallState(1);
                 }
+                if (0 == callLog.getCallType() && callLog.getdTMFB() != null) {
+                    getDeptByDTMFA(callLog.getdTMFB(), callLog);
+                }
                 //是否接电话，1接了，0未接
                 if (jsonObject.get("rstime") != null && StringUtils.isNotEmpty(jsonObject.get("rstime").toString())){
                     callLog.setCallState(1);