双数据源

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

@@ -1,18 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.DrugsBagEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-/**
- * Created by chi on 2019/9/12.
- */
-public interface IDrugsBagDAO  extends JpaRepository<DrugsBagEntity, String> {
-
-    @SuppressWarnings("unchecked")
-    DrugsBagEntity save(DrugsBagEntity drugsBagEntity);
-
-    @Query(value = "select id from DrugsBagEntity where packid=:packid")
-    Long selectIdByPackid(@Param("packid")String packid);
-}

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

@@ -1,15 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.DrugsEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * Created by chi on 2019/9/10.
- */
-public interface IDrugsDAO extends JpaRepository<DrugsEntity, String> {
-
-    @SuppressWarnings("unchecked")
-    DrugsEntity save(DrugsEntity drugsEntity);
-
-
-}

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

@@ -1,38 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.InspectEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * Created by chi on 2019/9/12.
- */
-public interface IInspectDAO  extends JpaRepository<InspectEntity, String> {
-
-    @SuppressWarnings("unchecked")
-    InspectEntity save(InspectEntity inspectEntity);
-
-    @Query(value = "select id from InspectEntity where inspectCode=:inspectCode")
-    Long selectIdByInspectCode(@Param("inspectCode")String inspectCode);
-
-    @Query(value = "select ie from InspectEntity ie where ie.inspectCode=:inspectCode")
-    List<InspectEntity> selectInspectByInspectCode(@Param("inspectCode")String inspectCode);
-
-    @Query(value = "select ie from InspectEntity ie where ie.inspectCode like CONCAT(:inspectCode,'%')")
-    List<InspectEntity> selectInspectByInspectCodeLike(@Param("inspectCode")String inspectCode);
-
-    @Query(value = "select ie from InspectEntity ie where ie.inspectState in (307,443) and ie.patientCode=:patientCode")
-    List<InspectEntity> selectInspectByPatientCode(@Param("patientCode")String patientCode);
-
-    @Modifying
-    @Transactional
-    @Query(value = "UPDATE itsm_transport_inspect set yytime = ?2 WHERE inspect_code = ?1",nativeQuery = true)
-    int upInspectYyTime(String inspectCode,String yytime);
-
-
-}

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

@@ -1,18 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.JPBagEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-/**
- * Created by chi on 2019/9/12.
- */
-public interface IJPBagDAO extends JpaRepository<JPBagEntity, String> {
-
-    @SuppressWarnings("unchecked")
-    JPBagEntity save(JPBagEntity jpBagEntity);
-
-    @Query(value = "select id from JPBagEntity where packid=:packid")
-    Long selectIdByPackid(@Param("packid")String packid);
-}

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

@@ -1,12 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.JPDetailsEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * Created by chi on 2019/9/12.
- */
-public interface IJPDetailsDAO extends JpaRepository<JPDetailsEntity, String> {
-    @SuppressWarnings("unchecked")
-    JPDetailsEntity save(JPDetailsEntity jpDetailsEntity);
-}

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

@@ -1,33 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.PatientEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * Created by chi on 2019/9/11.
- */
-public interface IPatientDAO extends JpaRepository<PatientEntity, String> {
-
-    @SuppressWarnings("unchecked")
-    PatientEntity save(PatientEntity patientEntity);
-
-    //@Query(value = "select id from PatientEntity where patientcode =?1 limit 1 ")
-    @Query(value = "select id from itsm_patient where patientcode =?1 limit 1 ",nativeQuery = true)
-    Integer selectIdByCode(String code);
-
-    @Query(value = "select * from itsm_patient where bednum is not null and pinyin is null",nativeQuery = true)
-    List<PatientEntity> selectPatient();
-
-    @Query(value = "select * from itsm_patient where patientcode =?1 limit 1 ",nativeQuery = true)
-    PatientEntity selectPatientByCode(String code);
-
-    @Modifying
-    @Transactional
-    @Query(value = "UPDATE itsm_patient set bednum = null WHERE patientcode <> ?1 and bednum = ?2 and roomnum = ?3 and department = ?4 ",nativeQuery = true)
-    int upPatientBednum(String patientcode,String bednum,String roomnum,Integer department);
-}

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

@@ -1,20 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.PatientLogEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Created by xuweihua on 2021/1/13.
- */
-public interface IPatientLogDAO extends JpaRepository<PatientLogEntity, String> {
-    @SuppressWarnings("unchecked")
-    PatientLogEntity save(PatientLogEntity patientLogEntity);
-
-    @Modifying
-    @Transactional
-    @Query(value = "DELETE FROM itsm_patient_log WHERE time < date_add(now(),interval-1 month)",nativeQuery = true)
-    int deletePatientLog();
-}

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

@@ -1,41 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.SpecimenEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * Created by chi on 2019/9/10.
- */
-public interface ISpecimenDAO extends JpaRepository<SpecimenEntity, String> {
-
-    @SuppressWarnings("unchecked")
-    SpecimenEntity save(SpecimenEntity specimen);
-
-    @Query(value = "select se from SpecimenEntity se where id=:id")
-    SpecimenEntity getById(@Param("id") Long id);
-
-    @Query(value = "select id from SpecimenEntity where scode=:scode")
-    Long selectIdByScode(@Param("scode")String scode);
-
-    @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 se from SpecimenEntity se where se.orderNumber=:orderNumber")
-    List<SpecimenEntity> selectListByorderNumber(@Param("orderNumber")String orderNumber);
-
-    @Modifying
-    @Transactional
-    @Query(value = "UPDATE itsm_transport_specimen set spe_state = ?1 WHERE patient_no = ?2 and spe_state = 332 and gdid is null",nativeQuery = true)
-    int upSpecimenState(Long state,Integer patientNo);
-
-    @Modifying
-    @Transactional
-    @Query(value = "update itsm_transport_specimen SET spe_state = (SELECT id from itsm_base_dictionary WHERE _key = 'speState' and _value = '110') WHERE spe_state = (SELECT id from itsm_base_dictionary WHERE _key = 'speState' and _value = '1') and print_date <= date_add(now(),interval-1 day)",nativeQuery = true)
-    int upSpecimenState();
-}

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

@@ -1,22 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.SpecimenEntity;
-import com.dashitech.businessdata.entity.SpecimenHistoryEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * Created by xuweihua on 2020/12/17.
- */
-public interface ISpecimenHistoryDAO  extends JpaRepository<SpecimenHistoryEntity, String> {
-    @SuppressWarnings("unchecked")
-    SpecimenEntity save(SpecimenEntity specimen);
-
-
-    @Modifying
-    @Transactional
-    @Query(value = "DELETE FROM itsm_specimen_history WHERE creat_time < date_add(now(),interval-1 month)",nativeQuery = true)
-    int deleteSpecimenHistoryLog();
-}

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

@@ -1,20 +0,0 @@
-package com.dashitech.businessdata.dao;
-
-import com.dashitech.businessdata.entity.WorkOrderEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.List;
-
-/**
- * Created by xuweihua on 2020/11/20.
- */
-public interface IWorkOrderDAO  extends JpaRepository<WorkOrderEntity, String> {
-    @SuppressWarnings("unchecked")
-    WorkOrderEntity save(WorkOrderEntity workOrderEntity);
-
-    @Query(value = "select * from itsm_transport_workorder where patientId =?1 and gdstate in(69,70,71,433) " +
-            "and task_type_id in (SELECT id from itsm_task_type WHERE delete_flag = 0 and association_type_id = " +
-            "(SELECT id from itsm_base_dictionary WHERE _key = 'association_types' and _value = 'inspect' LIMIT 1))",nativeQuery = true)
-    List<WorkOrderEntity> selectWorkOrderByPatientId(String patientId);
-}

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

@@ -1,145 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by chi on 2019/9/12.
- * 药品大包表
- *
- * launch、target 这里为编码 主表为id
- */
-@Entity
-@Table(name = "itsm_transport_drugs_bag")
-public class DrugsBagEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Long id;
-
-    @I18n("来源科室（发药科室），这里为编码 主表为id")
-    @Column(name="launch")
-    private String launch;
-
-    @I18n("目标科室（申请科室），这里为编码 主表为id")
-    @Column(name="target")
-    private String target;
-
-    @I18n("药品包号")
-    @Column(name = "packid")
-    private String packid;
-
-    @I18n("药品状态")
-    @Column(name = "drugs_state")
-    private Long drugsState;
-
-    @I18n("打包时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "pack_time")
-    private Date packTime;
-
-    @I18n("批次创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "creat_time")
-    private Date creatTime;
-
-    @I18n("批次号")
-    @Column(name = "batch_No")
-    private String batchNo;
-
-    @I18n("院区编码")
-    @Column(name = "hos_id")
-    private String hosId;
-
-    public String getHosId() {
-        return hosId;
-    }
-
-    public void setHosId(String hosId) {
-        this.hosId = hosId;
-    }
-
-    public String getLaunch() {
-        return launch;
-    }
-
-    public void setLaunch(String launch) {
-        this.launch = launch;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public String getPackid() {
-        return packid;
-    }
-
-    public void setPackid(String packid) {
-        this.packid = packid;
-    }
-
-    public Long getDrugsState() {
-        return drugsState;
-    }
-
-    public void setDrugsState(Long drugsState) {
-        this.drugsState = drugsState;
-    }
-
-    public Date getPackTime() {
-        return packTime;
-    }
-
-    public void setPackTime(Date packTime) {
-        this.packTime = packTime;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getCreatTime() {
-        return creatTime;
-    }
-
-    public void setCreatTime(Date creatTime) {
-        this.creatTime = creatTime;
-    }
-
-    public String getBatchNo() {
-        return batchNo;
-    }
-
-    public void setBatchNo(String batchNo) {
-        this.batchNo = batchNo;
-    }
-
-    @Override
-    public String toString() {
-        return "DrugsBagEntity{" +
-                "id=" + id +
-                ", launch='" + launch + '\'' +
-                ", target='" + target + '\'' +
-                ", packid='" + packid + '\'' +
-                ", drugsState=" + drugsState +
-                ", packTime=" + packTime +
-                ", creatTime=" + creatTime +
-                ", batchNo='" + batchNo + '\'' +
-                '}';
-    }
-}

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

@@ -1,137 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Created by chi on 2019/9/10.
- */
-@Entity
-@Table(name = "itsm_transport_drugs")
-public class DrugsEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Integer id;
-
-    @I18n("病人唯一标识")
-    @Column(name = "patient_no")
-    private String patientNo;
-
-    @I18n("病人信息")
-    @Column(name = "patient_info")
-    private String patientInfo;
-
-    @I18n("药品具体信息")
-    @Column(name = "drugs_info")
-    private String drugsInfo;
-
-    @I18n("药品计量")
-    @Column(name = "drugs_num")
-    private Integer drugsNum;
-
-    @I18n("打包号批次号")
-    @Column(name = "bag_id")
-    private Long bagId;
-
-    @I18n("床号")
-    @Column(name = "bed_num")
-    private String bedNum;
-
-    @I18n("院区编码")
-    @Column(name = "hos_id")
-    private String hosId;
-
-    @I18n("药品类型")
-    @Column(name = "drug_type")
-    private String drugType;
-
-    public String getDrugType() {
-        return drugType;
-    }
-
-    public void setDrugType(String drugType) {
-        this.drugType = drugType;
-    }
-
-    public String getHosId() {
-        return hosId;
-    }
-
-    public void setHosId(String hosId) {
-        this.hosId = hosId;
-    }
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPatientNo() {
-        return patientNo;
-    }
-
-    public void setPatientNo(String patientNo) {
-        this.patientNo = patientNo;
-    }
-
-    public String getPatientInfo() {
-        return patientInfo;
-    }
-
-    public void setPatientInfo(String patientInfo) {
-        this.patientInfo = patientInfo;
-    }
-
-    public String getDrugsInfo() {
-        return drugsInfo;
-    }
-
-    public void setDrugsInfo(String drugsInfo) {
-        this.drugsInfo = drugsInfo;
-    }
-
-    public Integer getDrugsNum() {
-        return drugsNum;
-    }
-
-    public void setDrugsNum(Integer drugsNum) {
-        this.drugsNum = drugsNum;
-    }
-
-    public Long getBagId() {
-        return bagId;
-    }
-
-    public void setBagId(Long bagId) {
-        this.bagId = bagId;
-    }
-
-    public String getBedNum() {
-        return bedNum;
-    }
-
-    public void setBedNum(String bedNum) {
-        this.bedNum = bedNum;
-    }
-
-    @Override
-    public String toString() {
-        return "DrugsEntity{" +
-                "id=" + id +
-                ", patientNo='" + patientNo + '\'' +
-                ", patientInfo='" + patientInfo + '\'' +
-                ", drugsInfo='" + drugsInfo + '\'' +
-                ", drugsNum=" + drugsNum +
-                ", bagId=" + bagId +
-                ", bedNum='" + bedNum + '\'' +
-                '}';
-    }
-}

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

@@ -1,270 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by chi on 2019/9/12.
- * 送检信息，病人检查
- * execDept、applyDept 主表为id，这里是编码
- */
-@Entity
-@Table(name = "itsm_transport_inspect")
-public class InspectEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Long id;
-
-    @I18n("病人标识")
-    @Column(name = "patient_code")
-    private String patientCode;
-
-    @I18n("病人姓名")
-    @Column(name = "patient_name")
-    private String patientName;
-
-    @I18n("腕带条码")
-    @Column(name = "patient_bar_code")
-    private String barCode;
-
-    @I18n("状态")//待检查  待到达 待送达 检查中 已完成,申请
-    @Column(name="inspect_state")
-    private Integer inspectState;
-
-    @I18n("自定义检查状态")
-    @Column(name = "inspect_check_type")
-    private Integer inspectCheckType;
-
-    @I18n("申请检查单标识")
-    @Column(name = "inspect_code")
-    private String inspectCode;
-
-    @I18n("检查标识类型")
-    @Column(name = "inspect_type_code")
-    private String inspectTypeCode;
-
-    @I18n("检查类型名称")
-    @Column(name = "inspect_type_name")
-    private String inspectName;
-
-    @I18n("申请科室,主表为id这里为编码")
-    @Column(name="apply_dept")
-    private String applyDept;
-
-    @I18n("检查部位名称")
-    @Column(name = "inspect_bwname")
-    private String bwName;
-
-    @I18n("执行科室,主表为id这里为编码")
-    @Column(name="exec_Dept")
-    private String execDept;
-
-    @I18n("预约时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "yytime")
-    private Date yyTime;
-
-    @I18n("床号")
-    @Column(name = "bed_num")
-    private String bedNum;
-
-    @I18n("检查时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "inspect_time")
-    private Date inspectTime;
-
-    @I18n("检查人")
-    @Column(name = "inspector")
-    private String inspector;
-
-    @I18n("预约号码")
-    @Column(name = "reservation_number")
-    private String reservationNumber;
-
-    @I18n("优先级")
-    @Column(name = "priority")
-    private String priority;
-
-    @I18n("院区id")
-    @Column(name = "hos_id")
-    private Long hosId;
-
-    public Integer getInspectCheckType() {
-        return inspectCheckType;
-    }
-
-    public void setInspectCheckType(Integer inspectCheckType) {
-        this.inspectCheckType = inspectCheckType;
-    }
-
-    public Long getHosId() {
-        return hosId;
-    }
-
-    public void setHosId(Long hosId) {
-        this.hosId = hosId;
-    }
-
-    public String getPriority() {
-        return priority;
-    }
-
-    public void setPriority(String priority) {
-        this.priority = priority;
-    }
-
-    public String getReservationNumber() {
-        return reservationNumber;
-    }
-
-    public void setReservationNumber(String reservationNumber) {
-        this.reservationNumber = reservationNumber;
-    }
-
-    public String getInspectName() {
-        return inspectName;
-    }
-
-    public void setInspectName(String inspectName) {
-        this.inspectName = inspectName;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getPatientCode() {
-        return patientCode;
-    }
-
-    public void setPatientCode(String patientCode) {
-        this.patientCode = patientCode;
-    }
-
-    public String getPatientName() {
-        return patientName;
-    }
-
-    public void setPatientName(String patientName) {
-        this.patientName = patientName;
-    }
-
-    public String getBarCode() {
-        return barCode;
-    }
-
-    public void setBarCode(String barCode) {
-        this.barCode = barCode;
-    }
-
-    public Integer getInspectState() {
-        return inspectState;
-    }
-
-    public void setInspectState(Integer inspectState) {
-        this.inspectState = inspectState;
-    }
-
-    public String getInspectCode() {
-        return inspectCode;
-    }
-
-    public void setInspectCode(String inspectCode) {
-        this.inspectCode = inspectCode;
-    }
-
-    public String getInspectTypeCode() {
-        return inspectTypeCode;
-    }
-
-    public void setInspectTypeCode(String inspectTypeCode) {
-        this.inspectTypeCode = inspectTypeCode;
-    }
-
-    public String getBwName() {
-        return bwName;
-    }
-
-    public void setBwName(String bwName) {
-        this.bwName = bwName;
-    }
-
-    public Date getYyTime() {
-        return yyTime;
-    }
-
-    public void setYyTime(Date yyTime) {
-        this.yyTime = yyTime;
-    }
-
-    public String getBedNum() {
-        return bedNum;
-    }
-
-    public void setBedNum(String bedNum) {
-        this.bedNum = bedNum;
-    }
-
-    public Date getInspectTime() {
-        return inspectTime;
-    }
-
-    public void setInspectTime(Date inspectTime) {
-        this.inspectTime = inspectTime;
-    }
-
-    public String getInspector() {
-        return inspector;
-    }
-
-    public void setInspector(String inspector) {
-        this.inspector = inspector;
-    }
-
-    public String getApplyDept() {
-        return applyDept;
-    }
-
-    public void setApplyDept(String applyDept) {
-        this.applyDept = applyDept;
-    }
-
-    public String getExecDept() {
-        return execDept;
-    }
-
-    public void setExecDept(String execDept) {
-        this.execDept = execDept;
-    }
-
-    @Override
-    public String toString() {
-        return "InspectEntity{" +
-                "id=" + id +
-                ", patientCode='" + patientCode + '\'' +
-                ", patientName='" + patientName + '\'' +
-                ", barCode='" + barCode + '\'' +
-                ", inspectState=" + inspectState +
-                ", inspectCode='" + inspectCode + '\'' +
-                ", inspectTypeCode='" + inspectTypeCode + '\'' +
-                ", applyDept='" + applyDept + '\'' +
-                ", bwName='" + bwName + '\'' +
-                ", execDept='" + execDept + '\'' +
-                ", yyTime=" + yyTime +
-                ", bedNum='" + bedNum + '\'' +
-                ", inspectTime=" + inspectTime +
-                ", inspector='" + inspector + '\'' +
-                '}';
-    }
-}

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

@@ -1,120 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by chi on 2019/9/12.
- * 静配大包表
- * target、launch 这里为编码 主表为id
- */
-@Entity
-@Table(name = "itsm_jp_bag")
-public class JPBagEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Long id;
-
-    @I18n("大包id")
-    @Column(name = "packid")
-    private String packid;
-
-    @I18n("目标科室编码，这里为编码 主表为id（发起申请的临床科室编码）")
-    @Column(name = "target")
-    private String target;
-
-    @I18n("来源科室编码，这里为编码 主表为id（发药科室编码）")
-    @Column(name = "launch")
-    private String launch;
-
-    @I18n("大包创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "creat_time")
-    private Date creatTime;
-
-    @I18n("药品状态")
-    @Column(name = "jp_state")
-    private Integer jpState;
-
-    @I18n("院区编码")
-    @Column(name = "hos_id")
-    private String hosID;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getPackid() {
-        return packid;
-    }
-
-    public void setPackid(String packid) {
-        this.packid = packid;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public String getLaunch() {
-        return launch;
-    }
-
-    public void setLaunch(String launch) {
-        this.launch = launch;
-    }
-
-    public Date getCreatTime() {
-        return creatTime;
-    }
-
-    public void setCreatTime(Date creatTime) {
-        this.creatTime = creatTime;
-    }
-
-    public Integer getJpState() {
-        return jpState;
-    }
-
-    public void setJpState(Integer jpState) {
-        this.jpState = jpState;
-    }
-
-    public String getHosID() {
-        return hosID;
-    }
-
-    public void setHosID(String hosID) {
-        this.hosID = hosID;
-    }
-
-    @Override
-    public String toString() {
-        return "JPBagEntity{" +
-                "id=" + id +
-                ", packid='" + packid + '\'' +
-                ", target='" + target + '\'' +
-                ", launch='" + launch + '\'' +
-                ", creatTime=" + creatTime +
-                ", jpState=" + jpState +
-                ", hosID='" + hosID + '\'' +
-                '}';
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Created by chi on 2019/9/12.
- * 静配详情
- */
-@Entity
-@Table(name = "itsm_jp_details")
-public class JPDetailsEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Integer id;
-
-    @I18n("病人唯一标识")
-    @Column(name = "patient_no")
-    private String patientNo;
-
-    @I18n("病人信息")
-    @Column(name = "patient_info")
-    private String patientInfo;
-
-    @I18n("药品具体信息")
-    @Column(name = "jp_info")
-    private String jpInfo;
-
-    @I18n("药品计量")
-    @Column(name = "jp_num")
-    private Integer jpNum;
-
-    @I18n("关联大包，批次号")
-    @Column(name = "bag_id")
-    private Long bagId;
-
-    @I18n("床号")
-    @Column(name = "bed_num")
-    private String bedNum;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPatientNo() {
-        return patientNo;
-    }
-
-    public void setPatientNo(String patientNo) {
-        this.patientNo = patientNo;
-    }
-
-    public String getPatientInfo() {
-        return patientInfo;
-    }
-
-    public void setPatientInfo(String patientInfo) {
-        this.patientInfo = patientInfo;
-    }
-
-    public String getJpInfo() {
-        return jpInfo;
-    }
-
-    public void setJpInfo(String jpInfo) {
-        this.jpInfo = jpInfo;
-    }
-
-    public Integer getJpNum() {
-        return jpNum;
-    }
-
-    public void setJpNum(Integer jpNum) {
-        this.jpNum = jpNum;
-    }
-
-    public Long getBagId() {
-        return bagId;
-    }
-
-    public void setBagId(Long bagId) {
-        this.bagId = bagId;
-    }
-
-    public String getBedNum() {
-        return bedNum;
-    }
-
-    public void setBedNum(String bedNum) {
-        this.bedNum = bedNum;
-    }
-
-    @Override
-    public String toString() {
-        return "JPDetailsEntity{" +
-                "id=" + id +
-                ", patientNo='" + patientNo + '\'' +
-                ", patientInfo='" + patientInfo + '\'' +
-                ", jpInfo='" + jpInfo + '\'' +
-                ", jpNum=" + jpNum +
-                ", bagId=" + bagId +
-                ", bedNum='" + bedNum + '\'' +
-                '}';
-    }
-}

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

@@ -1,236 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by chi on 2019/9/11.
- *
- * department主表为id 这里为编码
- */
-@Entity
-@Table(name = "itsm_patient")
-public class PatientEntity  implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Integer id;
-
-    @I18n("病人标识")
-    @Column(name = "patientcode")
-    private String patientcode;
-
-    @I18n("病人姓名")
-    @Column(name = "patientname")
-    private String patientname;
-
-    @I18n("住院科室id，主表为id这里为编码")
-    @Column(name = "department")
-    private Integer department;
-
-    @I18n("住院号")
-    @Column(name = "residence_no")
-    private String residenceNo;
-
-    @I18n("腕带条码")
-    @Column(name = "Bar_code")
-    private String barCode;
-
-    @I18n("房间号")
-    @Column(name = "roomnum")
-    private String roomnum;
-
-    @I18n("床号")
-    @Column(name = "bednum" )
-    private String bednum;
-
-    @I18n("年龄")
-    @Column(name = "age" )
-    private String age;
-
-    @Column(name = "VERSION" )
-    private Integer version;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "hospitalized_time" )
-    private Date hospitalizedTime;
-
-    @I18n("拼音")
-    @Column(name = "pinyin" )
-    private String pinyin;
-    @I18n("拼音简写")
-    @Column(name = "input_code" )
-    private String inputCode;
-
-    @I18n("是否重点关注,1为重点关注 0为不需重点关注")
-    @Column(name = "focus_patient")
-    private Integer focusPatient;
-
-    @I18n("院区id")
-    @Column(name = "hos_id")
-    private Long hosId;
-
-    @I18n("护理等级(字典表id)")
-    @Column(name = "level_of_care_id")
-    private Long levelOfCare;
-
-    @I18n("病情代理(字典表id)")
-    @Column(name = "state_of_an_illness_id")
-    private Long stateOfAnIllness;
-
-    public Long getStateOfAnIllness() {
-        return stateOfAnIllness;
-    }
-
-    public void setStateOfAnIllness(Long stateOfAnIllness) {
-        this.stateOfAnIllness = stateOfAnIllness;
-    }
-
-    public Long getLevelOfCare() {
-        return levelOfCare;
-    }
-
-    public void setLevelOfCare(Long levelOfCare) {
-        this.levelOfCare = levelOfCare;
-    }
-
-    public Long getHosId() {
-        return hosId;
-    }
-
-    public void setHosId(Long hosId) {
-        this.hosId = hosId;
-    }
-
-    public Integer getFocusPatient() {
-        return focusPatient;
-    }
-
-    public void setFocusPatient(Integer focusPatient) {
-        this.focusPatient = focusPatient;
-    }
-
-    public String getPinyin() {
-        return pinyin;
-    }
-
-    public void setPinyin(String pinyin) {
-        this.pinyin = pinyin;
-    }
-
-    public String getInputCode() {
-        return inputCode;
-    }
-
-    public void setInputCode(String inputCode) {
-        this.inputCode = inputCode;
-    }
-
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
-    public Date getHospitalizedTime() {
-        return hospitalizedTime;
-    }
-
-    public void setHospitalizedTime(Date hospitalizedTime) {
-        this.hospitalizedTime = hospitalizedTime;
-    }
-
-    public String getPatientcode() {
-        return patientcode;
-    }
-
-    public void setPatientcode(String patientcode) {
-        this.patientcode = patientcode;
-    }
-
-    public String getPatientname() {
-        return patientname;
-    }
-
-    public void setPatientname(String patientname) {
-        this.patientname = patientname;
-    }
-
-    public Integer getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(Integer department) {
-        this.department = department;
-    }
-
-    public String getBarCode() {
-        return barCode;
-    }
-
-    public void setBarCode(String barCode) {
-        this.barCode = barCode;
-    }
-
-    public String getRoomnum() {
-        return roomnum;
-    }
-
-    public void setRoomnum(String roomnum) {
-        this.roomnum = roomnum;
-    }
-
-    public String getBednum() {
-        return bednum;
-    }
-
-    public void setBednum(String bednum) {
-        this.bednum = bednum;
-    }
-
-    public String getResidenceNo() {
-        return residenceNo;
-    }
-
-    public void setResidenceNo(String residenceNo) {
-        this.residenceNo = residenceNo;
-    }
-
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-    @Override
-    public String toString() {
-        return "PatientEntity{" +
-                "id=" + id +
-                ", patientcode='" + patientcode + '\'' +
-                ", patientname='" + patientname + '\'' +
-                ", department='" + department + '\'' +
-                ", residenceNo='" + residenceNo + '\'' +
-                ", barCode='" + barCode + '\'' +
-                ", roomnum='" + roomnum + '\'' +
-                ", bednum='" + bednum + '\'' +
-                ", age='" + age + '\'' +
-                '}';
-    }
-}

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

@@ -1,125 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by xuweihua on 2021/1/12.
- */
-@Entity
-@Table(name = "itsm_patient_log")
-public class PatientLogEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Long id;
-
-    @I18n("类型")
-    @Column(name = "type")
-    private Long type;
-
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "time" )
-    private Date time;
-
-    @I18n("申请科室")
-    @Column(name = "sq_dept")
-    private Long sqDept;
-
-    @I18n("转入科室")
-    @Column(name = "zr_dept")
-    private Long zrDept;
-
-    @I18n("病人id")
-    @Column(name = "patient_id")
-    private Long patientId;
-
-    @I18n("前床号")
-    @Column(name = "qbednum")
-    private String qbednum;
-
-    @I18n("床号")
-    @Column(name = "bednum")
-    private String bednum;
-
-    @I18n("院区id")
-    @Column(name = "hos_id")
-    private Long hosId;
-
-    public Long getHosId() {
-        return hosId;
-    }
-
-    public void setHosId(Long hosId) {
-        this.hosId = hosId;
-    }
-
-    public String getQbednum() {
-        return qbednum;
-    }
-
-    public void setQbednum(String qbednum) {
-        this.qbednum = qbednum;
-    }
-
-    public String getBednum() {
-        return bednum;
-    }
-
-    public void setBednum(String bednum) {
-        this.bednum = bednum;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getType() {
-        return type;
-    }
-
-    public void setType(Long type) {
-        this.type = type;
-    }
-
-    public Date getTime() {
-        return time;
-    }
-
-    public void setTime(Date time) {
-        this.time = time;
-    }
-
-    public Long getSqDept() {
-        return sqDept;
-    }
-
-    public void setSqDept(Long sqDept) {
-        this.sqDept = sqDept;
-    }
-
-    public Long getZrDept() {
-        return zrDept;
-    }
-
-    public void setZrDept(Long zrDept) {
-        this.zrDept = zrDept;
-    }
-
-    public Long getPatientId() {
-        return patientId;
-    }
-
-    public void setPatientId(Long patientId) {
-        this.patientId = patientId;
-    }
-}

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

@@ -1,291 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by chi on 2019/9/10.
- *标本
- * doctor、putNurse、collectNurse、inspector、patientNo、sickRoom、checkDept，主表为id 这里为编码
- */
-@Entity
-@Table(name = "itsm_transport_specimen")
-public class SpecimenEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Long id;
-
-    @I18n("标本采集时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "print_date")
-    private Date printDate;
-
-    @I18n("医生申请时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "doctor_apply_time")
-    private Date doctorApplyTime;
-
-    @I18n("护士贴标时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "nurse_put_time")
-    private Date nursePutTime;
-
-
-    @I18n("采集护士，主表为id 这里为编码")
-    @Column(name="collect_nurse_id")
-    private String collectNurse;
-
-    @I18n("检验人员，主表为id 这里为编码")
-    @Column(name="inspector")
-    private String inspector;
-
-    @I18n("检验时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "inspection_time")
-    private Date inspectionTime;
-
-    @I18n("标本状态： 0新标本，1已取标本  2已送达标本")
-    @Column(name="spe_state")
-    private Integer speState;
-
-    @I18n("标本类型")
-    @Column(name="stype")
-    private String stype;
-
-    @I18n("标本条码")
-    @Column(name = "scode")
-    private String scode;
-
-    @I18n("病人唯一标识，主表为id 这里为编码")
-    @Column(name = "patient_no")
-    private String patientNo;
-
-    @I18n("病人姓名")
-    @Column(name = "patientname")
-    private String patientName;
-
-    @I18n("住院科室(起点科室)，主表为id 这里为编码")
-    @Column(name="sick_room")
-    private String sickRoom;
-
-    @I18n("检验科室(目标科室)，主表为id 这里为编码")
-    @Column(name="check_dept")
-    private String checkDept;
-
-    @I18n("房间号")
-    @Column(name = "roomnum")
-    private String roomNum;
-
-    @I18n("床号")
-    @Column(name = "bednum")
-    private String bedNum;
-
-    @I18n("是否紧急，0一般，1加急")
-    @Column(name = "urgent")
-    private Integer  urgent;
-
-    @I18n("院区编码")
-    @Column(name = "hos_id")
-    private String hosID;
-
-    @I18n("检验的单号")
-    @Column(name = "order_number")
-    private String orderNumber;
-
-    @I18n("系统送达时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "sys_arrive_time")
-    private Date sysArriveTime;
-
-    public Date getSysArriveTime() {
-        return sysArriveTime;
-    }
-
-    public void setSysArriveTime(Date sysArriveTime) {
-        this.sysArriveTime = sysArriveTime;
-    }
-
-    public String getOrderNumber() {
-        return orderNumber;
-    }
-
-    public void setOrderNumber(String orderNumber) {
-        this.orderNumber = orderNumber;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getPrintDate() {
-        return printDate;
-    }
-
-    public void setPrintDate(Date printDate) {
-        this.printDate = printDate;
-    }
-
-    public Date getDoctorApplyTime() {
-        return doctorApplyTime;
-    }
-
-    public void setDoctorApplyTime(Date doctorApplyTime) {
-        this.doctorApplyTime = doctorApplyTime;
-    }
-
-    public Date getNursePutTime() {
-        return nursePutTime;
-    }
-
-    public void setNursePutTime(Date nursePutTime) {
-        this.nursePutTime = nursePutTime;
-    }
-
-    public String getCollectNurse() {
-        return collectNurse;
-    }
-
-    public void setCollectNurse(String collectNurse) {
-        this.collectNurse = collectNurse;
-    }
-
-    public void setSickRoom(String sickRoom) {
-        this.sickRoom = sickRoom;
-    }
-
-    public void setCheckDept(String checkDept) {
-        this.checkDept = checkDept;
-    }
-
-    public String getInspector() {
-        return inspector;
-    }
-
-    public void setInspector(String inspector) {
-        this.inspector = inspector;
-    }
-
-    public Date getInspectionTime() {
-        return inspectionTime;
-    }
-
-    public void setInspectionTime(Date inspectionTime) {
-        this.inspectionTime = inspectionTime;
-    }
-
-    public Integer getSpeState() {
-        return speState;
-    }
-
-    public void setSpeState(Integer speState) {
-        this.speState = speState;
-    }
-
-    public String getStype() {
-        return stype;
-    }
-
-    public void setStype(String stype) {
-        this.stype = stype;
-    }
-
-    public String getScode() {
-        return scode;
-    }
-
-    public void setScode(String scode) {
-        this.scode = scode;
-    }
-
-    public String getPatientNo() {
-        return patientNo;
-    }
-
-    public void setPatientNo(String patientNo) {
-        this.patientNo = patientNo;
-    }
-
-    public String getPatientName() {
-        return patientName;
-    }
-
-    public void setPatientName(String patientName) {
-        this.patientName = patientName;
-    }
-
-    public String getRoomNum() {
-        return roomNum;
-    }
-
-    public void setRoomNum(String roomNum) {
-        this.roomNum = roomNum;
-    }
-
-    public String getBedNum() {
-        return bedNum;
-    }
-
-    public void setBedNum(String bedNum) {
-        this.bedNum = bedNum;
-    }
-
-    public Integer getUrgent() {
-        return urgent;
-    }
-
-    public void setUrgent(Integer urgent) {
-        this.urgent = urgent;
-    }
-
-    public String getSickRoom() {
-        return sickRoom;
-    }
-
-    public String getCheckDept() {
-        return checkDept;
-    }
-
-    public String getHosID() {
-        return hosID;
-    }
-
-    public void setHosID(String hosID) {
-        this.hosID = hosID;
-    }
-
-    @Override
-    public String toString() {
-        return "SpecimenEntity{" +
-                "id=" + id +
-                ", printDate=" + printDate +
-                ", doctorApplyTime=" + doctorApplyTime +
-                ", nursePutTime=" + nursePutTime +
-                ", collectNurse='" + collectNurse + '\'' +
-                ", inspector='" + inspector + '\'' +
-                ", inspectionTime=" + inspectionTime +
-                ", speState=" + speState +
-                ", stype='" + stype + '\'' +
-                ", scode='" + scode + '\'' +
-                ", patientNo='" + patientNo + '\'' +
-                ", patientName='" + patientName + '\'' +
-                ", sickRoom='" + sickRoom + '\'' +
-                ", checkDept='" + checkDept + '\'' +
-                ", roomNum='" + roomNum + '\'' +
-                ", bedNum='" + bedNum + '\'' +
-                ", urgent=" + urgent +
-                ", hosID='" + hosID + '\'' +
-                '}';
-    }
-}

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

@@ -1,91 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Dictionary;
-
-/**
- * Created by xuweihua on 2020/12/17.
- * 标本历史
- */
-@Entity
-@Table(name = "itsm_specimen_history")
-public class SpecimenHistoryEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Long id;
-
-    @I18n("创建")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "creat_time")
-    private Date creatTime;
-
-    @I18n("操作类型")
-    @Column(name="operation_type")
-    private Long operationType;
-
-    @I18n("操作人")
-    @Column(name = "operation_user_name")
-    private String operationUserName;
-
-    @I18n("操作人id")
-    @Column(name = "operation_user_id")
-    private Long operationUserId;
-
-    @I18n("标本编码")
-    @Column(name = "scode")
-    private String scode;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getCreatTime() {
-        return creatTime;
-    }
-
-    public void setCreatTime(Date creatTime) {
-        this.creatTime = creatTime;
-    }
-
-    public Long getOperationType() {
-        return operationType;
-    }
-
-    public void setOperationType(Long operationType) {
-        this.operationType = operationType;
-    }
-
-    public String getOperationUserName() {
-        return operationUserName;
-    }
-
-    public void setOperationUserName(String operationUserName) {
-        this.operationUserName = operationUserName;
-    }
-
-    public Long getOperationUserId() {
-        return operationUserId;
-    }
-
-    public void setOperationUserId(Long operationUserId) {
-        this.operationUserId = operationUserId;
-    }
-
-    public String getScode() {
-        return scode;
-    }
-
-    public void setScode(String scode) {
-        this.scode = scode;
-    }
-}

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

@@ -1,88 +0,0 @@
-package com.dashitech.businessdata.entity;
-
-import com.dashitech.utils.I18n;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Created by xuweihua on 2020/11/20.
- */
-@Entity
-@Table(name = "itsm_transport_workorder")
-public class WorkOrderEntity  implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name="id",length = 20)
-    private Integer id;
-
-    // 创建科室不展示实体
-    @I18n("创建科室")
-    @Column(name="create_department_id")
-    private Integer  createDept;
-    @I18n("起点科室id")
-    @Column(name="start_department_id")
-    private Integer  startDept;
-
-    @I18n("终点科室")
-    @Column(name="end_department_ids")
-    private String endDeptIds;
-
-    @I18n("工单状态")
-    @Column(name="gdstate")
-    private Integer  gdState;
-
-    @I18n("病人唯一标识")
-    @Column(name="patientId")
-    private String patientId;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getStartDept() {
-        return startDept;
-    }
-
-    public void setStartDept(Integer startDept) {
-        this.startDept = startDept;
-    }
-
-    public Integer getGdState() {
-        return gdState;
-    }
-
-    public void setGdState(Integer gdState) {
-        this.gdState = gdState;
-    }
-
-    public String getPatientId() {
-        return patientId;
-    }
-
-    public void setPatientId(String patientId) {
-        this.patientId = patientId;
-    }
-
-    public Integer getCreateDept() {
-        return createDept;
-    }
-
-    public void setCreateDept(Integer createDept) {
-        this.createDept = createDept;
-    }
-
-    public String getEndDeptIds() {
-        return endDeptIds;
-    }
-
-    public void setEndDeptIds(String endDeptIds) {
-        this.endDeptIds = endDeptIds;
-    }
-}

src/main/java/com/dashitech/callcenter/init/TestInit.java

@@ -0,0 +1,51 @@
+package com.dashitech.callcenter.init;
+
+import com.dashitech.hsms.dao.IHsmsCallLogDAO;
+import com.dashitech.hsms.entity.HsmsCallLogEntity;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+@Order(10)
+public class TestInit implements ApplicationRunner {
+
+    private static Log log = LogFactory.getLog(TestInit.class);
+    @Autowired
+    private IHsmsCallLogDAO hsmsCallLogDAO;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+//        testHsmsCallLogEntity();
+
+
+
+    }
+
+    private void testHsmsCallLogEntity() {
+        log.info("start");
+        HsmsCallLogEntity hsmsCallLog = new HsmsCallLogEntity();
+        hsmsCallLog.setVersion(0);
+        hsmsCallLog.setCallDept(null);
+        hsmsCallLog.setCallAccept("AAAAAAAAA");
+        hsmsCallLog.setPhyIDA("1111");
+        hsmsCallLog.setdTMFA("2222");
+        hsmsCallLog.setdTMFB("33333");
+        hsmsCallLog.setResponseTime(new Date());
+        hsmsCallLog.setLongTime("123");
+        hsmsCallLog.setPath("d:/a.txt");
+        hsmsCallLog.setCallType(1);
+        hsmsCallLog.setCallState(1);
+        hsmsCallLog.setHosId(1);
+        hsmsCallLogDAO.save(hsmsCallLog);
+        log.info("保存HSMS通话记录完成！");
+    }
+}

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

@@ -5,6 +5,8 @@ import com.dashitech.businessdata.entity.CallLogEntity;
 import com.dashitech.businessdata.entity.CallRecordEntity;
 import com.dashitech.businessdata.entity.HospitalConfig;
 import com.dashitech.callcenter.webSocket.service.PhoneWebSocket;
+import com.dashitech.hsms.dao.IHsmsCallLogDAO;
+import com.dashitech.hsms.entity.HsmsCallLogEntity;
 import com.dashitech.utils.DateUtil2;
 import com.dashitech.utils.JsonUtil;
 import com.dashitech.utils.PropertiesUtil;
@@ -36,6 +38,13 @@ public class HandlerThread  {
 
     private static ICallRecordDAO callRecordDAO;
 
+    private static IHsmsCallLogDAO hsmsCallLogDAO;
+
+    @Autowired
+    public void setHsmsCallRecordDAO(IHsmsCallLogDAO hsmsCallLogDAO) {
+        HandlerThread.hsmsCallLogDAO = hsmsCallLogDAO;
+    }
+
     @Autowired
     public void setCallRecordDAO(ICallRecordDAO callRecordDAO) {
         HandlerThread.callRecordDAO = callRecordDAO;
@@ -65,6 +74,7 @@ public class HandlerThread  {
     }
 
     private static String project;
+    private static String projectMain;
     private static String recordNginxPath;
     private static String recordRegex;
 
@@ -74,6 +84,7 @@ public class HandlerThread  {
 
     private static Map<String,CallLogEntity> phoneLog = new HashMap<>();
     private String his = "";
+    private String serialNo = "";
     public HandlerThread() {
     }
 
@@ -108,6 +119,7 @@ public class HandlerThread  {
 
                 if(project == null) {
                     project = PropertiesUtil.getProperty("project");
+                    projectMain = PropertiesUtil.getProperty("project.main");
                     recordNginxPath = PropertiesUtil.getProperty("db.hjzx.record.nginx");
                     recordRegex = PropertiesUtil.getProperty("db.hjzx.record.path.regex");
                 }
@@ -134,15 +146,20 @@ public class HandlerThread  {
                     if (data.indexOf("loginreq") >= 0){
                         //{"cmd":"loginreq","ipaddr":"192.168.25.37","serialNo":"21380501019804","recordNumber":4,"webport":80,"filestoretype":0}his
                         if(JsonUtil.toJSONObject(data).containsKey("serialNo")){
-                            his = JsonUtil.toJSONObject(data).getString("serialNo");
+                            serialNo = JsonUtil.toJSONObject(data).getString("serialNo");
                         }else{
-                            his = JsonUtil.toJSONObject(data).getString("sernelNo");
+                            serialNo = JsonUtil.toJSONObject(data).getString("sernelNo");
                         }
                         // 设备 21040501017523 写死支持 院区1
-                        if(his.equals("21040501017523")){
+                        if(serialNo.equals("21040501017523")){
                             his = "1";
                         }else{
-                            his = callLogDAO.selectSernelNo("sernelNo",his);
+                            //呼叫中心,以转运项目为主
+                            if("HSMS".equals(projectMain)) {
+                                his = hsmsCallLogDAO.selectSernelNo("sernelNo",serialNo);
+                            } else {    //其它,以运维项目为主
+                                his = callLogDAO.selectSernelNo("sernelNo",serialNo);
+                            }
                         }
                         dataStr = "{\"cmd\":\"loginres\", \"error\":\"0\", \"timestamp\":\"" + (System.currentTimeMillis() / 1000) + "\"}";
                     }
@@ -261,6 +278,7 @@ public class HandlerThread  {
                                 }
 
                                 saveItsmCallRecord(callLogEntity,jsonObject.optString("uuid"));
+                                saveHsmsCallLog(callLogEntity,jsonObject.optString("uuid"));
                             }else {
                                 rMap.put("phone","");
                                 rMap.put("status", 201);
@@ -302,7 +320,7 @@ public class HandlerThread  {
                     callLog.setCallDept("暂无");
                 }
                 callLog.setHosId(Integer.parseInt(his));
-                callLogDAO.save(callLog);
+//                callLogDAO.save(callLog);
 
                 log.info("先保存通话记录1："+jsonObject.toString());
                 //TODO 先保存通话记录，打不通的走这里
@@ -311,6 +329,7 @@ public class HandlerThread  {
                 }
 
                 saveItsmCallRecord(callLog,jsonObject.optString("uuid"));
+                saveHsmsCallLog(callLog,jsonObject.optString("uuid"));
 
             }
         }else if(jsonObject.get("phonestate").toString().equals("1")){
@@ -414,9 +433,10 @@ public class HandlerThread  {
                     callLog.setCallState(0);
                 }
                 callLog.setHosId(Integer.parseInt(his));
-                callLogDAO.save(callLog);
+//                callLogDAO.save(callLog);
                 //TODO 根据配置文件开关，是否保存到ITSM的通话记录数据
                 saveItsmCallRecord(callLog,null);
+                saveHsmsCallLog(callLog,null);
             }
         }
     }
@@ -453,9 +473,12 @@ public class HandlerThread  {
      */
     private void saveItsmCallRecord(CallLogEntity callLog,String uuid) {
         try {
-            if("ITSM".equals(project)) {
+            if("ITSM".equals(project) || "ALL".equals(project)) {
                 CallRecordEntity recordEntity = null;
-                log.info("开始保存通话记录");
+                log.info("开始保存ITSM通话记录");
+
+                String hosId = callLogDAO.selectSernelNo("sernelNo",serialNo);
+
                 //TODO 根据uuid区分是：新增通话记录，还是修改附件的通话记录
                 if(StringUtils.isNotEmpty(uuid)) {   //新增
                     Long id = callRecordDAO.selectIdByUuid(uuid);
@@ -469,7 +492,7 @@ public class HandlerThread  {
                         recordEntity.setIsAnswered(callLog.getCallState());
                         recordEntity.setCallTime("0");
                         recordEntity.setOverTime(new Date());
-                        recordEntity.setBranch(callLog.getHosId() == null ? null : callLog.getHosId().longValue());
+                        recordEntity.setBranch(StringUtils.isEmpty(hosId)? null : Long.valueOf(hosId));
                         if(callLog.getCallType() != null && "0".equals(callLog.getCallType().toString())) {
                             recordEntity.setCallType("1");
                         }else if(callLog.getCallType() != null && "1".equals(callLog.getCallType().toString())) {
@@ -477,21 +500,22 @@ public class HandlerThread  {
                         }
                         recordEntity.setGateWay(callLog.getPhyIDA());
                         callRecordDAO.save(recordEntity);
-                        log.info("新增临时通话记录完成");
+                        log.info("新增ITSM临时通话记录完成");
+
                     }else {
-                        log.info("已有临时通话记录，忽略此条uuid："+uuid);
+                        log.info("已有ITSM临时通话记录，忽略此条uuid："+uuid);
                     }
                 }else { //修改
-                    log.info("开始匹配临时通话记录");
+                    log.info("开始匹配ITSM临时通话记录");
                     recordEntity = callRecordDAO.selectByParams(callLog.getdTMFA(), callLog.getdTMFB(), callLog.getResponseTime());
 
                     //TODO 根据【主叫、被叫、起始时间】判断是否查询到对应数据，来绑定附件，如果未匹配到，直接新增
                     String newUUID = null;
                     if(recordEntity != null) {
-                        log.info("匹配到临时通话记录！开始修改");
+                        log.info("匹配到ITSM临时通话记录！开始修改");
                         newUUID = recordEntity.getCallAccept();
                     }else {
-                        log.info("未匹配到临时通话记录！开始新增");
+                        log.info("未匹配ITSM到临时通话记录！开始新增");
                         recordEntity = new CallRecordEntity();
                         newUUID = UUID.randomUUID().toString();
                     }
@@ -511,9 +535,7 @@ public class HandlerThread  {
                         recordEntity.setOverTime(overTime);
                     }
                     //院区
-                    if(callLog.getHosId() != null) {
-                        recordEntity.setBranch(callLog.getHosId().longValue());
-                    }
+                    recordEntity.setBranch(StringUtils.isEmpty(hosId)? null : Long.valueOf(hosId));
                     //呼入呼出，其它
                     if(callLog.getCallType() != null) {
                         if("1".equals(callLog.getCallType().toString())) {
@@ -533,20 +555,90 @@ public class HandlerThread  {
                         }
                         recordEntity.setRecordingFileName(newPath);
                     }else {
-                        log.info("callLog 保存没有路径path");
+                        log.info("ITSM callLog 保存没有路径path");
                         return;
                     }
 
                     callRecordDAO.save(recordEntity);
-                    log.info("附件通话记录保存完成");
+                    log.info("ITSM附件通话记录保存完成");
+                }
+
+                log.info("保存ITSM通话记录完成："+recordEntity.getCallAccept());
+                System.out.println("保存ITSM通话记录完成："+recordEntity.getCallAccept());
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    private void saveHsmsCallLog(CallLogEntity callLog,String uuid) {
+        log.info("开始保存HSMS通话记录2");
+        HsmsCallLogEntity hsmsCallLog = null;
+
+        try {
+            if("HSMS".equals(project) || "ALL".equals(project)) {
+                String hosId = hsmsCallLogDAO.selectSernelNo("sernelNo",serialNo);
+
+                if(StringUtils.isNotEmpty(uuid)) {
+                    Long id = callRecordDAO.selectIdByUuid(uuid);
+                    if(id == null) {
+                        hsmsCallLog = new HsmsCallLogEntity();
+                        copyCallLog(callLog,hsmsCallLog);
+                        hsmsCallLog.setCallAccept(uuid);
+                        hsmsCallLog.setHosId(StringUtils.isEmpty(hosId)? null : Integer.valueOf(hosId));
+                        hsmsCallLogDAO.save(hsmsCallLog);
+                        log.info("新增HSMS临时通话记录完成");
+                    }else {
+                        log.info("已有HSMS临时通话记录，忽略此条uuid："+uuid);
+                    }
+                }else {
+                    log.info("开始匹配HSMS临时通话记录");
+                    hsmsCallLog = hsmsCallLogDAO.selectByParams(callLog.getdTMFA(), callLog.getdTMFB(), callLog.getResponseTime());
+                    if(hsmsCallLog == null) {   //新增
+                        hsmsCallLog = new HsmsCallLogEntity();
+                        copyCallLog(callLog,hsmsCallLog);
+                        hsmsCallLog.setVersion(0);
+                        hsmsCallLog.setCallAccept(UUID.randomUUID().toString());
+                        hsmsCallLog.setHosId(StringUtils.isEmpty(hosId)? null : Integer.valueOf(hosId));
+                    }
+                    if(callLog.getPath() != null && StringUtils.isNotEmpty(callLog.getPath())) {
+                        String newPath = callLog.getPath();
+                        String[] arr = callLog.getPath().split(recordRegex);
+                        if (arr.length > 1) {
+                            newPath = recordNginxPath + arr[1];
+                        }
+                        hsmsCallLog.setPath(newPath);
+                    }else {
+                        log.info("HSMS callLog 保存没有路径path");
+                        return;
+                    }
+                    hsmsCallLogDAO.save(hsmsCallLog);
+                    log.info("保存HSMS通话记录2完成！");
                 }
 
-                log.info("ITSM保存通话记录完成："+recordEntity.getCallAccept());
-                System.out.println("ITSM保存通话记录完成："+recordEntity.getCallAccept());
+                log.info("保存HSMS通话记录完成："+hsmsCallLog.getCallAccept());
             }
         } catch (Exception ex) {
             ex.printStackTrace();
         }
+
+    }
+
+    private HsmsCallLogEntity copyCallLog(CallLogEntity callLog,HsmsCallLogEntity hsmsCallLog) {
+        hsmsCallLog.setId(callLog.getId());
+        hsmsCallLog.setVersion(callLog.getVersion());
+        hsmsCallLog.setHosId(callLog.getHosId());
+        hsmsCallLog.setCallAccept(callLog.getCallDept());
+        hsmsCallLog.setCallDept(callLog.getCallDept());
+        hsmsCallLog.setPhyIDA(callLog.getPhyIDA());
+        hsmsCallLog.setdTMFA(callLog.getdTMFA());
+        hsmsCallLog.setdTMFB(callLog.getdTMFB());
+        hsmsCallLog.setResponseTime(callLog.getResponseTime());
+        hsmsCallLog.setLongTime(callLog.getLongTime());
+        hsmsCallLog.setPath(callLog.getPath());
+        hsmsCallLog.setCallType(callLog.getCallType());
+        hsmsCallLog.setCallState(callLog.getCallState());
+        return hsmsCallLog;
     }
 
     public static void main(String[] args) {

src/main/java/com/dashitech/config/DataSourceConfig.java

@@ -19,6 +19,17 @@ import javax.sql.DataSource;
 public class DataSourceConfig {
 
     /**
+     *  数据源1
+     */
+    @Primary    //配置该数据源为主数据源
+    @Bean(name = "mysql1DataSource")
+    @Qualifier(value = "mysql1DataSource")  //spring装配bean的唯一标识
+    @ConfigurationProperties(prefix = "mysql1.spring.datasource")   //application.properties配置文件中该数据源的配置前缀
+    public DataSource mysql1DataSource(){
+        return DataSourceBuilder.create().build();
+    }
+
+    /**
      *  数据源2
      */
 

src/main/java/com/dashitech/config/datasource/MySQL1DataSourceConfig.java

@@ -0,0 +1,111 @@
+package com.dashitech.config.datasource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
+import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.Database;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.persistence.EntityManager;
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by chi on 2019/9/20.
+ */
+
+@Configuration
+@EnableTransactionManagement
+@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactoryMysql1",   //EntityManagerFactory引用
+        transactionManagerRef = "transactionManagerMysql1",      //transactionManager引用
+        basePackages = {"com.dashitech.hsms"})                  //设置 基因网orderDiscountDataSource应用到的包
+public class MySQL1DataSourceConfig {
+
+    /**
+     * 注入 基因网订单折扣数据源
+     */
+    @Autowired()
+    @Qualifier("mysql1DataSource")
+    private DataSource mysql1DataSource;
+
+    /**
+     * 注入JPA配置实体
+     */
+    @Autowired
+    private JpaProperties jpaProperties;
+
+    /**
+     * 通过调用JPA配置实体中的解析方法，解析datasource中各属性的值
+     * @param dataSource    数据源
+     * @return     本数据源中各参数
+     * Map中设值分别为：
+     *      hibernate-dialect   方言
+     *      hibernate.hbm2ddl.auto  DDL执行策略
+     *      hibernate.physical_naming_strategy  命名策略
+     *
+     *这些和不同类型数据库密切相关的属性设置，不能设置在application.properties中，所以需要再不同的数据源中具体设置，赋值给JpaProperties
+     */
+    private Map<String,String> getVendorProperties(DataSource dataSource){
+        jpaProperties.setDatabase(Database.MYSQL);
+        Map<String,String> map = new HashMap<>();
+        map.put("hibernate.dialect","org.hibernate.dialect.MySQL5Dialect");
+        map.put("hibernate.hbm2ddl.auto","update");
+        map.put("hibernate.physical_naming_strategy","org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl");
+        jpaProperties.setProperties(map);
+        return  jpaProperties.getHibernateProperties(dataSource);
+    }
+
+    /**
+     * 配置EntityManagerFactory实体
+     * @param builder
+     * @return      实体管理工厂
+     * packages     扫描@Entity注释的软件包名称
+     * persistenceUnit  持久性单元的名称。 如果只建立一个EntityManagerFactory，你可以省略这个，但是如果在同一个应用程序中有多个，你应该给它们不同的名字
+     * properties       标准JPA或供应商特定配置的通用属性。 这些属性覆盖构造函数中提供的任何值。
+     *
+     */
+    @Primary
+    @Bean(name = "entityManagerFactoryMysql1")
+    public LocalContainerEntityManagerFactoryBean entityManagerFactoryMysql1(EntityManagerFactoryBuilder builder){
+        return builder
+                .dataSource(mysql1DataSource)
+                .properties(getVendorProperties(mysql1DataSource))
+                .packages(new String[]{"com.dashitech.hsms"})
+                .persistenceUnit("mysql1PersistenceUnit")
+                .build();
+    }
+
+    /**
+     * 配置EntityManager实体
+     * @param builder
+     * @return      实体管理器
+     */
+    @Primary
+    @Bean(name = "entityManagerMysql1")
+    public EntityManager entityManager(EntityManagerFactoryBuilder builder){
+        return entityManagerFactoryMysql1(builder).getObject().createEntityManager();
+    }
+
+
+    /**
+     * 配置事务transactionManager
+     * @param builder
+     * @return      事务管理器
+     */
+    @Primary
+    @Bean(name = "transactionManagerMysql1")
+    public PlatformTransactionManager transactionManagerOrderDiscount(EntityManagerFactoryBuilder builder){
+        return  new JpaTransactionManager(entityManagerFactoryMysql1(builder).getObject());
+    }
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.dashitech.hsms.dao;
+
+import com.dashitech.hsms.entity.HsmsCallLogEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
+
+public interface IHsmsCallLogDAO extends JpaRepository<HsmsCallLogEntity, String> {
+
+    @SuppressWarnings("unchecked")
+    HsmsCallLogEntity save(HsmsCallLogEntity callLogEntity);
+
+    @Query(value = " select a from HsmsCallLogEntity a where a.dTMFA=:callerIdNumber and a.dTMFB=:destinationNumber and a.responseTime=:createdTime ")
+    HsmsCallLogEntity selectByParams(@Param("callerIdNumber") String callerIdNumber, @Param("destinationNumber") String destinationNumber, @Param("createdTime") Date createdTime);
+
+    @Query(value = "select hos_id from itsm_system_hospital_config where _key = ?1 and _value =?2 limit 1 ",nativeQuery = true)
+    String selectSernelNo(String key,String value);
+
+}

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

@@ -0,0 +1,174 @@
+package com.dashitech.hsms.entity;
+
+import com.dashitech.utils.I18n;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "itsm_call_log")
+public class HsmsCallLogEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name="id",length = 20)
+    private Long id;
+
+    @I18n("version")
+    @Column(name = "version")
+    private Integer version;
+
+    @I18n("来电科室")
+    @Column(name = "call_dept")
+    private String callDept;
+
+    @I18n("通道号")
+    @Column(name = "phyIDA")
+    private String phyIDA;
+
+    @I18n("主叫号码")
+    @Column(name = "DTMFA")
+    private String dTMFA;
+
+    @I18n("被叫号码")
+    @Column(name = "DTMFB")
+    private String dTMFB;
+
+    @I18n("录音起始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "response_time")
+    private Date responseTime;
+
+    @I18n("录音时长单位秒")
+    @Column(name = "long_time")
+    private String longTime;
+
+    @I18n("原文件存放位置")
+    @Column(name = "_path")
+    private String path;
+
+    @I18n("呼入呼出 1 呼入 0 呼出")
+    @Column(name = "call_type")
+    private Integer callType;
+
+    @I18n("已接未接 1 已接 0 未接")
+    @Column(name = "call_state")
+    private Integer callState;
+
+    @I18n("院区id")
+    @Column(name = "hos_id")
+    private Integer hosId;
+
+    @I18n("通话流水")
+    @Column(name = "call_accept")
+    private String callAccept;
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public String getCallAccept() {
+        return callAccept;
+    }
+
+    public void setCallAccept(String callAccept) {
+        this.callAccept = callAccept;
+    }
+
+    public Integer getHosId() {
+        return hosId;
+    }
+
+    public void setHosId(Integer hosId) {
+        this.hosId = hosId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCallDept() {
+        return callDept;
+    }
+
+    public void setCallDept(String callDept) {
+        this.callDept = callDept;
+    }
+
+    public String getPhyIDA() {
+        return phyIDA;
+    }
+
+    public void setPhyIDA(String phyIDA) {
+        this.phyIDA = phyIDA;
+    }
+
+    public String getdTMFA() {
+        return dTMFA;
+    }
+
+    public void setdTMFA(String dTMFA) {
+        this.dTMFA = dTMFA;
+    }
+
+    public String getdTMFB() {
+        return dTMFB;
+    }
+
+    public void setdTMFB(String dTMFB) {
+        this.dTMFB = dTMFB;
+    }
+
+    public Date getResponseTime() {
+        return responseTime;
+    }
+
+    public void setResponseTime(Date responseTime) {
+        this.responseTime = responseTime;
+    }
+
+    public String getLongTime() {
+        return longTime;
+    }
+
+    public void setLongTime(String longTime) {
+        this.longTime = longTime;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public Integer getCallType() {
+        return callType;
+    }
+
+    public void setCallType(Integer callType) {
+        this.callType = callType;
+    }
+
+    public Integer getCallState() {
+        return callState;
+    }
+
+    public void setCallState(Integer callState) {
+        this.callState = callState;
+    }
+
+}

src/main/resources/application.properties

@@ -1,5 +1,36 @@
+
+# //TODO 如果只启用1个，把两边数据源，配置成一样就行，避免启动报错
+
+# //TODO 转运配置
+mysql1.spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+mysql1.spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#mysql1.spring.datasource.url=jdbc:mysql://localhost:3306/hsms2_0622?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+#mysql1.spring.datasource.url=jdbc:mysql://192.168.3.108:3306/hsms2_0622?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+mysql1.spring.datasource.url=jdbc:mysql://192.168.3.111:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
+mysql1.spring.datasource.username=root
+#mysql1.spring.datasource.password=DStech@123
+mysql1.spring.datasource.password=100100
+
+# 下面为连接池的补充设置，应用到上面所有数据源中
+# 初始化大小，最小，最大
+mysql1.spring.datasource.initialSize=3
+mysql1.spring.datasource.minIdle=1
+mysql1.spring.datasource.maxActive=150
+# 配置获取连接等待超时的时间
+mysql1.spring.datasource.maxWait=60000
+# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+mysql1.spring.datasource.timeBetweenEvictionRunsMillis=60000
+# 配置一个连接在池中最小生存的时间，单位是毫秒
+mysql1.spring.datasource.minEvictableIdleTimeMillis=300000
+# Oracle请使用select 1 from dual
+mysql1.spring.datasource.validationQuery=SELECT 'x'
+mysql1.spring.datasource.testWhileIdle=true
+mysql1.spring.datasource.testOnBorrow=true
+mysql1.spring.datasource.testOnReturn=true
+
+
+# //TODO ITSM配置
 mysql2.spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-#\u8F6C\u8FD0\u4E1A\u52A1\u5E93\u6570\u636E\u6E90
 mysql2.spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #mysql2.spring.datasource.url=jdbc:mysql://localhost:3306/hsms2_1129?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 mysql2.spring.datasource.url=jdbc:mysql://192.168.3.111:3306/md2?autoReconnect=true&useUnicode=true&characterEncoding=utf8
@@ -7,19 +38,12 @@ mysql2.spring.datasource.username=root
 #mysql2.spring.datasource.password=DStech@123
 mysql2.spring.datasource.password=100100
 
-
-# \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
-# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
-mysql2.spring.datasource.initialSize=5
+mysql2.spring.datasource.initialSize=3
 mysql2.spring.datasource.minIdle=1
 mysql2.spring.datasource.maxActive=150
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
 mysql2.spring.datasource.maxWait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
 mysql2.spring.datasource.timeBetweenEvictionRunsMillis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
 mysql2.spring.datasource.minEvictableIdleTimeMillis=300000
-# Oracle\u8BF7\u4F7F\u7528select 1 from dual
 mysql2.spring.datasource.validationQuery=SELECT 'x'
 mysql2.spring.datasource.testWhileIdle=true
 mysql2.spring.datasource.testOnBorrow=true
@@ -27,9 +51,14 @@ mysql2.spring.datasource.testOnReturn=true
 
 #project=HSMS
 project=ITSM
+#project=ALL
+#配置呼叫中心以哪个项目为主，单个与project一致即可
+project.main=ITSM
 db.hjzx.record.nginx=/hjzxRecord
 db.hjzx.record.path.regex=voice
 
+
+
 #spring.redis.host=192.168.245.108
 spring.redis.host=localhost
 spring.redis.port=6379

src/main/resources/readme

@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+