修改

src/main/java/com/dashitech/businessdata/dao/IDepartmentDAO.java

@@ -45,4 +45,9 @@ public interface IDepartmentDAO extends JpaRepository<DepartmentEntity, String>
 
     @Query(value = "SELECT id FROM itsm_uc_hospital WHERE _hos_no =?1 AND delete_flag = 0 ", nativeQuery = true)
     Long getHosIdByCode(String gender);
-}
+
+    @Query(value = "SELECT * FROM itsm_uc_dept g WHERE g.many_phone like CONCAT('%',:phone,'%') AND g.delete_flag = 0 limit 1", nativeQuery = true)
+    DepartmentEntity getDeptByPhone(@Param("phone")String phone);
+
+
+}

src/main/java/com/dashitech/businessdata/entity/CallLogEntity.java

@@ -67,6 +67,10 @@ public class CallLogEntity implements Serializable {
     @Column(name = "hos_id")
     private Integer hosId;
 
+    @I18n("来电科室id")
+    @Column(name = "call_dept_id")
+    private Long callDeptId;
+
     public Integer getHosId() {
         return hosId;
     }
@@ -163,6 +167,14 @@ public class CallLogEntity implements Serializable {
         this.version = version;
     }
 
+    public Long getCallDeptId() {
+        return callDeptId;
+    }
+
+    public void setCallDeptId(Long callDeptId) {
+        this.callDeptId = callDeptId;
+    }
+
     @Override
     public String toString() {
         return "CallLogEntity{" + "id=" + id + ", version=" + version + ", callDept='" + callDept + '\'' + ", phyIDA='" + phyIDA + '\'' + ", dTMFA='" + dTMFA + '\'' + ", dTMFB='" + dTMFB + '\'' + ", responseTime=" + responseTime + ", longTime='" + longTime + '\'' + ", path='" + path + '\'' + ", callType=" + callType + ", callState=" + callState + ", hosId=" + hosId + '}';

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

@@ -3,10 +3,13 @@ package com.dashitech.callcenter.socket;
 import com.dashitech.businessdata.dao.*;
 import com.dashitech.businessdata.entity.CallLogEntity;
 import com.dashitech.businessdata.entity.CallRecordEntity;
+import com.dashitech.businessdata.entity.DepartmentEntity;
 import com.dashitech.businessdata.entity.HospitalConfig;
 import com.dashitech.callcenter.webSocket.service.PhoneWebSocket;
 import com.dashitech.hsms.dao.IHsmsCallLogDAO;
+import com.dashitech.hsms.dao.IHsmsDepartmentDAO;
 import com.dashitech.hsms.entity.HsmsCallLogEntity;
+import com.dashitech.hsms.entity.HsmsDepartmentEntity;
 import com.dashitech.utils.DateUtil2;
 import com.dashitech.utils.JsonUtil;
 import com.dashitech.utils.PropertiesUtil;
@@ -73,6 +76,12 @@ public class HandlerThread  {
         HandlerThread.hospitalConfigDAO = hospitalConfigDAO;
     }
 
+    private static IHsmsDepartmentDAO hsmsDepartmentDAO;
+    @Autowired
+    public static void setHsmsDepartmentDAO(IHsmsDepartmentDAO hsmsDepartmentDAO) {
+        HandlerThread.hsmsDepartmentDAO = hsmsDepartmentDAO;
+    }
+
     private static String project;
     private static String projectMain;
     private static String recordNginxPath;
@@ -318,7 +327,7 @@ 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(" ")){
                     // 查询科室信息 并赋值
-                    callLog.setCallDept(getDeptByDTMFA(jsonObject.get("dtmfa").toString()));
+                    getDeptByDTMFA(jsonObject.get("dtmfa").toString(), callLog);
                 }else {
                     callLog.setCallDept("暂无");
                 }
@@ -357,7 +366,7 @@ public class HandlerThread  {
         }
         if (jsonObject.containsKey("dtmfa")) {
             callLog.setdTMFA(jsonObject.get("dtmfa").toString());
-            callLog.setCallDept(getDeptByDTMFA(jsonObject.get("dtmfa").toString()));
+            getDeptByDTMFA(jsonObject.get("dtmfa").toString(), callLog);
         }
         if (jsonObject.containsKey("dtmfb")){
             callLog.setdTMFB(jsonObject.get("dtmfb").toString());
@@ -395,7 +404,7 @@ public class HandlerThread  {
                 }
                 if (jsonObject.containsKey("DTMFA")){
                     callLog.setdTMFA(jsonObject.get("DTMFA").toString());
-                    callLog.setCallDept(getDeptByDTMFA(jsonObject.get("DTMFA").toString()));
+                    getDeptByDTMFA(jsonObject.get("DTMFA").toString(), callLog);
                 }
                 if (jsonObject.containsKey("DTMFB")){
                     callLog.setdTMFB(jsonObject.get("DTMFB").toString());
@@ -444,37 +453,36 @@ public class HandlerThread  {
         }
     }
 
-    private String getDeptByDTMFA(String phone){
+    private void getDeptByDTMFA(String phone,CallLogEntity callLog){
         try {
-            if (phone!=null){
-                phone = phone.trim();
-                if (phone.equals("")){
-                    return "暂无";
-                }
+            if (StringUtils.isNotBlank(phone)){
                 //给来电科室赋值
                 String deptName = "";
+                Long deptId = null;
                 if("HSMS".equals(projectMain)) {
-                    deptName = hsmsCallLogDAO.getDeptNameByPhone(phone);
+                    HsmsDepartmentEntity dept = hsmsDepartmentDAO.getDeptByPhone(phone);
+                    deptName = dept.getDept();
+                    deptId = dept.getId();
                 } else {    //其它,以运维项目为主
-                    deptName = departmentDAO.getDeptNameByPhone(phone);
+                    DepartmentEntity dept = departmentDAO.getDeptByPhone(phone);
+                    deptName = dept.getDept();
+                    deptId = dept.getId();
                 }
 
-                if (deptName!=null&&!deptName.equals("")){
-                    return deptName;
-                }else {
-               /*     String deptName2 = departmentDAO.getDeptNameByWorkOrderPhone(phone);
-                    if (deptName2!=null&&!deptName2.equals("")){
-                        return deptName2;
-                    }else {
-                        return "暂无";
-                    }*/
-                    return "暂无";
+                if (StringUtils.isNotBlank(deptName)) {
+                    callLog.setCallDept(deptName);
+                } else {
+                    callLog.setCallDept("暂无");
+                }
+                if (deptId != null) {
+                    callLog.setCallDeptId(deptId);
                 }
+            } else {
+                callLog.setCallDept("暂无");
             }
         }catch (Exception e){
             e.printStackTrace();
         }
-        return "暂无";
     }
 
     /**

src/main/java/com/dashitech/hsms/dao/IHsmsDepartmentDAO.java

@@ -0,0 +1,22 @@
+package com.dashitech.hsms.dao;
+
+import com.dashitech.hsms.entity.HsmsDepartmentEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by chi on 2019/9/12.
+ */
+@Repository
+public interface IHsmsDepartmentDAO extends JpaRepository<HsmsDepartmentEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    HsmsDepartmentEntity save(HsmsDepartmentEntity departmentEntity);
+
+    @Query(value = "SELECT * FROM itsm_uc_dept g WHERE g.many_phone like CONCAT('%',:phone,'%') AND g.delete_flag = 0 limit 1", nativeQuery = true)
+    HsmsDepartmentEntity getDeptByPhone(@Param("phone")String phone);
+
+
+}

src/main/java/com/dashitech/hsms/entity/HsmsCallLogEntity.java

@@ -67,6 +67,10 @@ public class HsmsCallLogEntity implements Serializable {
     @Column(name = "call_accept")
     private String callAccept;
 
+    @I18n("来电科室id")
+    @Column(name = "call_dept_id")
+    private Long callDeptId;
+
     public Integer getVersion() {
         return version;
     }
@@ -171,4 +175,11 @@ public class HsmsCallLogEntity implements Serializable {
         this.callState = callState;
     }
 
+    public Long getCallDeptId() {
+        return callDeptId;
+    }
+
+    public void setCallDeptId(Long callDeptId) {
+        this.callDeptId = callDeptId;
+    }
 }

src/main/java/com/dashitech/hsms/entity/HsmsDepartmentEntity.java

@@ -0,0 +1,239 @@
+package com.dashitech.hsms.entity;
+
+import com.dashitech.utils.I18n;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ *  hospital 主表为id，这里为编码
+ */
+
+@Entity
+@Table(name = "itsm_uc_dept")
+public class HsmsDepartmentEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name="id",length = 20)
+	private Long id;
+
+	@I18n("科室名")
+	@Column(name="dept")
+	private String dept;
+
+	@I18n("科室编码")
+	@Column(name="code")
+	private String pcode;
+
+	@I18n("HIS科室编码")
+	@Column(name="his_code")
+	private String hisCode;
+
+
+	@I18n("删除标识")
+	@Column(name = "delete_flag")
+	private Integer deleteFlag;
+
+	@I18n("科室别名")
+	@Column(name = "dept_alias")
+	private String deptalias;
+
+
+	@I18n("科室类型，检查科室1、检验科室2、临床科室3、其他科室4")
+	@Column(name = "_type")
+	private String type;
+
+	@I18n("科室位置")
+	@Column(name = "_address")
+	private String address;
+
+	@I18n("所属院区")
+	@Column(name = "_hospital_id")
+	private Long hospital;
+
+	@I18n("电话号码")
+	@Column(name = "_phone")
+	private String phone;
+
+	@I18n("开头字母拼音")
+	@Column(name = "input_code")
+	private String inputCode;
+
+	@I18n("全拼")
+	@Column(name = "pinyin")
+	private String pinyin;
+
+	@I18n("别名开头字母拼音")
+	@Column(name = "alias_input_code")
+	private String aliasInputCode;
+
+	@I18n("别名全拼")
+	@Column(name = "alias_pinyin")
+	private String aliasPinyin;
+
+	@I18n("二维码，不需同步")
+	@Column(name = "qrcode")
+	private String qrcode;
+
+	@I18n("父级科室ID")
+	@Column(name = "parentId")
+	private Long parent;
+
+	@I18n("是否启用")
+	@Column(name = "flag")
+	private Integer flag;
+
+	public Integer getFlag() {
+		return flag;
+	}
+
+	public void setFlag(Integer flag) {
+		this.flag = flag;
+	}
+
+	public String getHisCode() {
+		return hisCode;
+	}
+
+	public void setHisCode(String hisCode) {
+		this.hisCode = hisCode;
+	}
+
+	public Long getParent() {
+		return parent;
+	}
+
+	public void setParent(Long parent) {
+		this.parent = parent;
+	}
+
+	public String getQrcode() {
+		return qrcode;
+	}
+
+	public void setQrcode(String qrcode) {
+		this.qrcode = qrcode;
+	}
+
+	public String getAliasInputCode() {
+		return aliasInputCode;
+	}
+
+	public void setAliasInputCode(String aliasInputCode) {
+		this.aliasInputCode = aliasInputCode;
+	}
+
+	public String getAliasPinyin() {
+		return aliasPinyin;
+	}
+
+	public void setAliasPinyin(String aliasPinyin) {
+		this.aliasPinyin = aliasPinyin;
+	}
+
+	public String getInputCode() {
+		return inputCode;
+	}
+
+	public void setInputCode(String inputCode) {
+		this.inputCode = inputCode;
+	}
+
+	public String getPinyin() {
+		return pinyin;
+	}
+
+	public void setPinyin(String pinyin) {
+		this.pinyin = pinyin;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getDept() {
+		return dept;
+	}
+
+	public void setDept(String dept) {
+		this.dept = dept;
+	}
+
+	public String getPcode() {
+		return pcode;
+	}
+
+	public void setPcode(String pcode) {
+		this.pcode = pcode;
+	}
+
+	public Integer getDeleteFlag() {
+		return deleteFlag;
+	}
+
+	public void setDeleteFlag(Integer deleteFlag) {
+		this.deleteFlag = deleteFlag;
+	}
+
+	public String getDeptalias() {
+		return deptalias;
+	}
+
+	public void setDeptalias(String deptalias) {
+		this.deptalias = deptalias;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public Long getHospital() {
+		return hospital;
+	}
+
+	public void setHospital(Long hospital) {
+		this.hospital = hospital;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	@Override
+	public String toString() {
+		return "DepartmentEntity{" +
+				"id=" + id +
+				", dept='" + dept + '\'' +
+				", pcode='" + pcode + '\'' +
+				", deleteFlag=" + deleteFlag +
+				", deptalias='" + deptalias + '\'' +
+				", type='" + type + '\'' +
+				", address='" + address + '\'' +
+				", hospital=" + hospital +
+				", phone='" + phone + '\'' +
+				'}';
+	}
+}