1111

main.go

@@ -5,6 +5,8 @@ import (
 	"Data_Upload_Api/service"
 	"Data_Upload_Api/service/city"
 	"github.com/astaxie/beego"
+
+
 )
 
 func init() {
@@ -12,7 +14,24 @@ func init() {
 }
 
 func main() {
-	city.BeginAutoJob()
-	city.SyncToLhblYxxxzx()
+	//city.BeginAutoJob()
+	//var ids []int64
+	//ids = append(ids,8420)
+	//ids = append(ids,28202)
+	//ids = append(ids,28310)
+	//city.SyncToSzblgpYxxxzx()
+	//city.SyncToSzbltmp()
+	//city.SyncToSzblgpYxxxzx()
+	//city.SyncToSzzxtmp()
+	//city.SyncToSzblbrYxxxzxtmpp()
+	//city.SyncToSzblpg()
+	//city.SyncToSzblgpYxxxzx()
+	// 创建一个新的调度器
+
+
+
+	city.SyncToSzblpg()
+
+
 	beego.Run()
 }

models/src_data.go

@@ -75,6 +75,8 @@ type UserAdminRole struct {
 	Status      int64  `gorm:"column:status" json:"status"`
 	Ctime       int64  `gorm:"column:ctime" json:"ctime"`
 	Mtime       int64  `gorm:"column:mtime" json:"mtime"`
+	DoctorNumber string `gorm:"column:doctor_number" json:"doctor_number"`
+	DoctorCode   string `gorm:"column:doctor_code" json:"doctor_code"`
 }
 
 func (UserAdminRole) TableName() string {
@@ -1861,6 +1863,8 @@ type HisOrder struct {
 
 	RequestLog       string `gorm:"column:request_log" json:"request_log" form:"request_log"`
 	RefundRequestLog string `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+	HisPatient HisPatient `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
+
 }
 
 func (HisOrder) TableName() string {

models/sz/target_data.go

@@ -283,6 +283,29 @@ func (TempWdDmDisinfect) TableName() string {
 	return "t_hd_wm_disinfect"
 }
 
+type TB_HIS_MZ_BL_Detail struct {
+	YLJGDM string    `gorm:"column:YLJGDM" json:"YLJGDM" form:"YLJGDM"`
+	BLLSH  string    `gorm:"column:BLLSH" json:"BLLSH" form:"BLLSH"`
+	JZLSH  string    `gorm:"column:JZLSH" json:"JZLSH" form:"JZLSH"`
+	KH     string    `gorm:"column:KH" json:"KH" form:"KH"`
+	KLX    string    `gorm:"column:KLX" json:"KLX" form:"KLX"`
+	HZXM   string    `gorm:"column:HZXM" json:"HZXM" form:"HZXM"`
+	JZLX   string    `gorm:"column:JZLX" json:"JZLX" form:"JZLX"`
+	JZRQSJ string    `gorm:"column:JZRQSJ" json:"JZRQSJ" form:"JZRQSJ"`
+	MJZH   string    `gorm:"column:MJZH" json:"MJZH" form:"MJZH"`
+	CZBZ   string    `gorm:"column:CZBZ" json:"CZBZ" form:"CZBZ"`
+	YSGH   string    `gorm:"column:YSGH" json:"YSGH" form:"YSGH"`
+	YSXM   string    `gorm:"column:YSXM" json:"YSXM" form:"YSXM"`
+	JLRQSJ string    `gorm:"column:JLRQSJ" json:"JLRQSJ" form:"JLRQSJ"`
+	SJSCSJ time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ" form:"SJSCSJ"`
+	XGBZ   int64     `gorm:"column:XGBZ" json:"XGBZ" form:"XGBZ"`
+}
+
+func (TB_HIS_MZ_BL_Detail) TableName() string {
+	return "TB_EMR_MJGBL"
+}
+
+
 type TempHdPatient struct {
 	HospitalId        string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
 	PatientNk         int64     `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`

service/city_data_uoload_service.go

@@ -141,7 +141,7 @@ func FindOrgHisDoctorAdviceInfo(org_id int64, lastUploadTime int64, nowTime int6
 }
 
 func FindOrgHisDoctorAdviceInfoByPid(org_id int64, pid int64) (patient []*models.HisDoctorAdviceInfo, err error) {
-	db := readDb.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? and prescription_id = ?", org_id)
+	db := readDb.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? and prescription_id = ?", org_id,pid)
 	err = db.Find(&patient).Error
 	return
 }
@@ -1200,6 +1200,35 @@ func CreateSickbed(wms []*sz.TempHdSickbed, rdb *gorm.DB) (err error) {
 	return
 }
 
+
+func CreateSickbed2(wms []*sz.TempHdSickbed, rdb *gorm.DB) (err error) {
+	if len(wms) > 0 {
+		utx := rdb
+		if len(wms) > 0 {
+			for _, wm := range wms {
+				thisSQL := "INSERT INTO t_hd_sickbed (sickbed_no,hospital_id,division_id,sickbed_code,sickbed_type,xgbz,create_time,update_time,sjscsj,ylyl1) VALUES "
+				insertParams := make([]string, 0)
+				insertData := make([]interface{}, 0)
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, wm.SickbedNo)
+				insertData = append(insertData, wm.HospitalId)
+				insertData = append(insertData, wm.DivisionId)
+				insertData = append(insertData, wm.SickbedCode)
+				insertData = append(insertData, wm.SickbedType)
+				insertData = append(insertData, wm.Xgbz)
+				insertData = append(insertData, wm.CreateTime)
+				insertData = append(insertData, wm.UpdateTime)
+				insertData = append(insertData, wm.Sjscsj)
+				insertData = append(insertData, wm.Ylyl1)
+
+				thisSQL += strings.Join(insertParams, ", ")
+				utx.Exec(thisSQL, insertData...)
+			}
+		}
+	}
+	return
+}
+
 func CreateDiagnosis(wms []*sz.TempHdDiagnosis, rdb *gorm.DB) (err error) {
 	if len(wms) > 0 {
 		utx := rdb
@@ -1906,3 +1935,29 @@ func BatchCreateTB_STAT_YWL_Report(ps *sz.TB_STAT_YWL_Report, rdb *gorm.DB) (err
 	err = rdb.Create(&ps).Error
 	return err
 }
+
+func FindOrgPatientDataTwo(org_id int64,ids []int64) (patient []*models.Patients, err error) {
+	db := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? and id in (?)", org_id,ids)
+	err = db.Find(&patient).Error
+	return
+}
+
+func FindNewOrgHisOrder(org_id int64, lastUploadTime int64, nowTime int64) (patient []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{}).Preload("HisPatient", "status = 1").Where("status = 1 AND user_org_id = ? AND med_type = 14", org_id)
+	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
+	err = db.Find(&patient).Error
+	return
+}
+
+func FindUserRoleData(org_id int64, admin_user_id int64) (role models.UserAdminRole, err error) {
+	db := readUserDb.Model(&models.UserAdminRole{}).Where("status = 1 AND org_id = ? and admin_user_id = ?  ", org_id, admin_user_id)
+	//db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
+	err = db.Find(&role).Error
+	return
+}
+
+
+func BatchCreateTB_HIS_MZ_BL_Detail(ps *sz.TB_HIS_MZ_BL_Detail, rdb *gorm.DB) (err error) {
+	err = rdb.Create(&ps).Error
+	return err
+}