张保健 1 주 전
부모
커밋
070e20f393
5개의 변경된 파일1010개의 추가작업 그리고 2397개의 파일을 삭제
  1. 12 21
      main.go
  2. 28 47
      models/sz/target_data.go
  3. 955 2255
      service/city/auto_create_week_schedules_service.go
  4. 12 74
      service/city_data_uoload_service.go
  5. 3 0
      service/db.go

+ 12 - 21
main.go 파일 보기

@@ -4,9 +4,9 @@ import (
4 4
 	_ "Data_Upload_Api/routers"
5 5
 	"Data_Upload_Api/service"
6 6
 	"Data_Upload_Api/service/city"
7
+	"fmt"
7 8
 	"github.com/astaxie/beego"
8
-
9
-
9
+	"github.com/astaxie/beego/logs"
10 10
 )
11 11
 
12 12
 func init() {
@@ -14,25 +14,16 @@ func init() {
14 14
 }
15 15
 
16 16
 func main() {
17
-	//city.BeginAutoJob()
18
-	//var ids []int64
19
-	//ids = append(ids,8420)
20
-	//ids = append(ids,28202)
21
-	//ids = append(ids,28310)
22
-	//city.SyncToSzblgpYxxxzx()
23
-	//city.SyncToSzbltmp()
24
-	//city.SyncToSzblgpYxxxzx()
25
-	//city.SyncToSzzxtmp()
26
-	//city.SyncToSzblbrYxxxzxtmpp()
27
-	//city.SyncToSzblpg()
28
-	//city.SyncToSzblgpYxxxzx()
29
-	// 创建一个新的调度器
30
-
31
-	//city.SyncToSzbl()
32
-	//city.SyncToSzblbr()
33
-	//city.SyncToSzblpg()
34
-	//city.SyncToSzblYxxxzx()
35
-
36 17
 
18
+	// 配置日志输出到文件
19
+	logPath := "./app.log"                                         // 日志文件路径
20
+	logConf := fmt.Sprintf(`{"filename":"%s","level":7}`, logPath) // 日志配置,level为7表示记录所有级别的日志
21
+	errs := logs.SetLogger(logs.AdapterFile, logConf)
22
+	if errs != nil {
23
+		panic(errs)
24
+	}
25
+	city.BeginAutoJob()
26
+	//city.SyncToSmzy()
27
+	city.SyncToSzshxytxzx()
37 28
 	beego.Run()
38 29
 }

+ 28 - 47
models/sz/target_data.go 파일 보기

@@ -283,29 +283,6 @@ func (TempWdDmDisinfect) TableName() string {
283 283
 	return "t_hd_wm_disinfect"
284 284
 }
285 285
 
286
-type TB_HIS_MZ_BL_Detail struct {
287
-	YLJGDM string    `gorm:"column:YLJGDM" json:"YLJGDM" form:"YLJGDM"`
288
-	BLLSH  string    `gorm:"column:BLLSH" json:"BLLSH" form:"BLLSH"`
289
-	JZLSH  string    `gorm:"column:JZLSH" json:"JZLSH" form:"JZLSH"`
290
-	KH     string    `gorm:"column:KH" json:"KH" form:"KH"`
291
-	KLX    string    `gorm:"column:KLX" json:"KLX" form:"KLX"`
292
-	HZXM   string    `gorm:"column:HZXM" json:"HZXM" form:"HZXM"`
293
-	JZLX   string    `gorm:"column:JZLX" json:"JZLX" form:"JZLX"`
294
-	JZRQSJ string    `gorm:"column:JZRQSJ" json:"JZRQSJ" form:"JZRQSJ"`
295
-	MJZH   string    `gorm:"column:MJZH" json:"MJZH" form:"MJZH"`
296
-	CZBZ   string    `gorm:"column:CZBZ" json:"CZBZ" form:"CZBZ"`
297
-	YSGH   string    `gorm:"column:YSGH" json:"YSGH" form:"YSGH"`
298
-	YSXM   string    `gorm:"column:YSXM" json:"YSXM" form:"YSXM"`
299
-	JLRQSJ string    `gorm:"column:JLRQSJ" json:"JLRQSJ" form:"JLRQSJ"`
300
-	SJSCSJ time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ" form:"SJSCSJ"`
301
-	XGBZ   int64     `gorm:"column:XGBZ" json:"XGBZ" form:"XGBZ"`
302
-}
303
-
304
-func (TB_HIS_MZ_BL_Detail) TableName() string {
305
-	return "TB_EMR_MJGBL"
306
-}
307
-
308
-
309 286
 type TempHdPatient struct {
310 287
 	HospitalId        string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
311 288
 	PatientNk         int64     `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
@@ -536,35 +513,35 @@ type TempHdDoctorsAdvice struct {
536 513
 	HospitalId            string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
537 514
 	DialysisId            string    `gorm:"column:dialysis_id" json:"dialysis_id" form:"dialysis_id"`
538 515
 	OrderType             string    `gorm:"column:order_type" json:"order_type" form:"order_type"`
539
-	RrtType               int64     `gorm:"column:rrt_type" json:"rrt_type" form:"rrt_type"`
516
+	RrtType               string    `gorm:"column:rrt_type" json:"rrt_type" form:"rrt_type"`
540 517
 	RrtTypeName           string    `gorm:"column:rrt_type_name" json:"rrt_type_name" form:"rrt_type_name"`
541 518
 	PatientNk             string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
542 519
 	DialysisDuration      int64     `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
543 520
 	BloodVol              int64     `gorm:"column:blood_vol" json:"blood_vol" form:"blood_vol"`
544 521
 	DryWeight             float64   `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
545 522
 	Txq                   int64     `gorm:"column:txq" json:"txq" form:"txq"`
546
-	FluxLevel             int64     `gorm:"column:flux_level" json:"flux_level" form:"flux_level"`
547
-	ReuseFlag             int64     `gorm:"column:reuse_flag" json:"reuse_flag" form:"reuse_flag"`
548
-	MembraneType          int64     `gorm:"column:membrane_type" json:"membrane_type" form:"membrane_type"`
549
-	MembraneSize          int64     `gorm:"column:membrane_size" json:"membrane_size" form:"membrane_size"`
550
-	Dlflow                int64     `gorm:"column:dlflow" json:"dlflow" form:"dlflow"`
551
-	DlTemperature         int64     `gorm:"column:dl_temperature" json:"dl_temperature" form:"dl_temperature"`
552
-	ReplacementMode       int64     `gorm:"column:replacement_mode" json:"replacement_mode" form:"replacement_mode"`
553
-	RlAmount              int64     `gorm:"column:rl_amount" json:"rl_amount" form:"rl_amount"`
554
-	Anticoagulant         int64     `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
555
-	AnticoagulantQuantity int64     `gorm:"column:anticoagulant_quantity" json:"anticoagulant_quantity" form:"anticoagulant_quantity"`
556
-	InitialAmount         int64     `gorm:"column:initial_amount" json:"initial_amount" form:"initial_amount"`
557
-	DlPotassium           int64     `gorm:"column:dl_potassium" json:"dl_potassium" form:"dl_potassium"`
558
-	DlSodium              int64     `gorm:"column:dl_sodium" json:"dl_sodium" form:"dl_sodium"`
559
-	BicarbonateRadical    int64     `gorm:"column:bicarbonate_radical" json:"bicarbonate_radical" form:"bicarbonate_radical"`
560
-	MaintenanceQuantity   int64     `gorm:"column:maintenance_quantity" json:"maintenance_quantity" form:"maintenance_quantity"`
561
-	Conductivity          int64     `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
562
-	DlCalcium             int64     `gorm:"column:dl_calcium" json:"dl_calcium" form:"dl_calcium"`
523
+	FluxLevel             string    `gorm:"column:flux_level" json:"flux_level" form:"flux_level"`
524
+	ReuseFlag             string    `gorm:"column:reuse_flag" json:"reuse_flag" form:"reuse_flag"`
525
+	MembraneType          string    `gorm:"column:membrane_type" json:"membrane_type" form:"membrane_type"`
526
+	MembraneSize          string    `gorm:"column:membrane_size" json:"membrane_size" form:"membrane_size"`
527
+	Dlflow                string    `gorm:"column:dlflow" json:"dlflow" form:"dlflow"`
528
+	DlTemperature         string    `gorm:"column:dl_temperature" json:"dl_temperature" form:"dl_temperature"`
529
+	ReplacementMode       string    `gorm:"column:replacement_mode" json:"replacement_mode" form:"replacement_mode"`
530
+	RlAmount              string    `gorm:"column:rl_amount" json:"rl_amount" form:"rl_amount"`
531
+	Anticoagulant         string    `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
532
+	AnticoagulantQuantity string    `gorm:"column:anticoagulant_quantity" json:"anticoagulant_quantity" form:"anticoagulant_quantity"`
533
+	InitialAmount         string    `gorm:"column:initial_amount" json:"initial_amount" form:"initial_amount"`
534
+	DlPotassium           string    `gorm:"column:dl_potassium" json:"dl_potassium" form:"dl_potassium"`
535
+	DlSodium              string    `gorm:"column:dl_sodium" json:"dl_sodium" form:"dl_sodium"`
536
+	BicarbonateRadical    string    `gorm:"column:bicarbonate_radical" json:"bicarbonate_radical" form:"bicarbonate_radical"`
537
+	MaintenanceQuantity   string    `gorm:"column:maintenance_quantity" json:"maintenance_quantity" form:"maintenance_quantity"`
538
+	Conductivity          string    `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
539
+	DlCalcium             string    `gorm:"column:dl_calcium" json:"dl_calcium" form:"dl_calcium"`
563 540
 	ExecuteOrder          int64     `gorm:"column:execute_order" json:"execute_order" form:"execute_order"`
564 541
 	CreateTime            time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
565 542
 	Sjscsj                time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
566 543
 	Mj                    string    `gorm:"column:mj" json:"mj" form:"mj"`
567
-	Xgbz                  int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
544
+	Xgbz                  string    `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
568 545
 	Ylyl1                 string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
569 546
 	Ylyl2                 string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
570 547
 }
@@ -574,7 +551,7 @@ func (TempHdDoctorsAdvice) TableName() string {
574 551
 }
575 552
 
576 553
 type TempHdDialysis struct {
577
-	ID                    int64     `gorm:"column:id" json:"id" form:"id"`
554
+	//ID                    int64     `gorm:"column:id" json:"id" form:"id"`
578 555
 	DialysisId            string    `gorm:"column:dialysis_id" json:"dialysis_id" form:"dialysis_id"`
579 556
 	HospitalId            string    `gorm:"column:hospital_id" json:"hospital_id" form:"hospital_id"`
580 557
 	PatientNk             string    `gorm:"column:patient_nk" json:"patient_nk" form:"patient_nk"`
@@ -584,7 +561,6 @@ type TempHdDialysis struct {
584 561
 	DivisionId            string    `gorm:"column:division_id" json:"division_id" form:"division_id"`
585 562
 	EquipmentId           string    `gorm:"column:equipment_id" json:"equipment_id" form:"equipment_id"`
586 563
 	MixDialysis           string    `gorm:"column:mix_dialysis" json:"mix_dialysis" form:"mix_dialysis"`
587
-	ActualufMl            int64     `gorm:"column:actualuf_ml" json:"actualuf_ml" form:"actualuf_ml"`
588 564
 	Ufv                   int64     `gorm:"column:ufv" json:"ufv" form:"ufv"`
589 565
 	TotalReplace          int64     `gorm:"column:total_replace" json:"total_replace" form:"total_replace"`
590 566
 	TotalTreatDuration    int64     `gorm:"column:total_treat_duration" json:"total_treat_duration" form:"total_treat_duration"`
@@ -600,8 +576,8 @@ type TempHdDialysis struct {
600 576
 	AfterWeight           float64   `gorm:"column:after_weight" json:"after_weight" form:"after_weight"`
601 577
 	AccessId              string    `gorm:"column:access_id" json:"access_id" form:"access_id"`
602 578
 	DialyzerId            string    `gorm:"column:dialyzer_id" json:"dialyzer_id" form:"dialyzer_id"`
603
-	Ktv                   float64    `gorm:"column:ktv" json:"ktv" form:"ktv"`
604
-	Urr                   float64    `gorm:"column:urr" json:"urr" form:"urr"`
579
+	Ktv                   float64   `gorm:"column:ktv" json:"ktv" form:"ktv"`
580
+	Urr                   float64   `gorm:"column:urr" json:"urr" form:"urr"`
605 581
 	BeforeBun             float64   `gorm:"column:before_bun" json:"before_bun" form:"before_bun"`
606 582
 	AfterBun              float64   `gorm:"column:after_bun" json:"after_bun" form:"after_bun"`
607 583
 	ChargeDoctorId        string    `gorm:"column:charge_doctor_id" json:"charge_doctor_id" form:"charge_doctor_id"`
@@ -615,7 +591,7 @@ type TempHdDialysis struct {
615 591
 	CreateTime            time.Time `gorm:"column:create_time" json:"create_time" form:"create_time"`
616 592
 	Sjscsj                time.Time `gorm:"column:sjscsj" json:"sjscsj" form:"sjscsj"`
617 593
 	Mj                    string    `gorm:"column:mj" json:"mj" form:"mj"`
618
-	Xgbz                  string     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
594
+	Xgbz                  int64     `gorm:"column:xgbz" json:"xgbz" form:"xgbz"`
619 595
 	Ylyl1                 string    `gorm:"column:ylyl1" json:"ylyl1" form:"ylyl1"`
620 596
 	Ylyl2                 string    `gorm:"column:ylyl2" json:"ylyl2" form:"ylyl2"`
621 597
 }
@@ -1202,6 +1178,8 @@ type TBDICYpdzzd struct {
1202 1178
 	YNYPDM     string    `gorm:"column:YNYPDM" json:"YNYPDM" form:"YNYPDM"`
1203 1179
 	YPMC       string    `gorm:"column:YPMC" json:"YPMC" form:"YPMC"`
1204 1180
 	YPLX       string    `gorm:"column:YPLX" json:"YPLX" form:"YPLX"`
1181
+	YBMLBM     string    `gorm:"column:YBMLBM" json:"YBMLBM" form:"YBMLBM"`
1182
+	YBYPMC     string    `gorm:"column:YBYPMC" json:"YBYPMC" form:"YBYPMC"`
1205 1183
 	YPSPWYBSDM string    `gorm:"column:YPSPWYBSDM" json:"YPSPWYBSDM" form:"YPSPWYBSDM"`
1206 1184
 	YPSPWYBSMC string    `gorm:"column:YPSPWYBSMC" json:"YPSPWYBSMC" form:"YPSPWYBSMC"`
1207 1185
 	SJSHCSJ    time.Time `gorm:"column:SJSHCSJ" json:"SJSHCSJ" form:"SJSHCSJ"`
@@ -1219,6 +1197,8 @@ type TBDICZlxmdzzd struct {
1219 1197
 	YNZLXMMC string    `gorm:"column:YNZLXMMC" json:"YNZLXMMC" form:"YNZLXMMC"`
1220 1198
 	WJSFDM   string    `gorm:"column:WJSFDM" json:"WJSFDM" form:"WJSFDM"`
1221 1199
 	WJSFMC   string    `gorm:"column:WJSFMC" json:"WJSFMC" form:"WJSFMC"`
1200
+	YBSFXMBM string    `gorm:"column:YBSFXMBM" json:"YBSFXMBM" form:"YBSFXMBM"`
1201
+	YBSFXMMC string    `gorm:"column:YBSFXMMC" json:"YBSFXMMC" form:"YBSFXMMC"`
1222 1202
 	SJSHCSJ  time.Time `gorm:"column:SJSHCSJ" json:"SJSHCSJ" form:"SJSHCSJ"`
1223 1203
 	SJSCSJ   time.Time `gorm:"column:SJSCSJ" json:"SJSCSJ" form:"SJSCSJ"`
1224 1204
 	XGBZ     int64     `gorm:"column:XGBZ" json:"XGBZ" form:"XGBZ"`
@@ -1231,6 +1211,7 @@ func (TBDICZlxmdzzd) TableName() string {
1231 1211
 type TM_DICT_BED struct {
1232 1212
 	YLJGDM   string    `gorm:"column:YLJGDM" json:"YLJGDM" form:"YLJGDM"`
1233 1213
 	CWBM     string    `gorm:"column:CWBM" json:"CWBM" form:"CWBM"`
1214
+	YWSJ     string    `gorm:"column:YWSJ" json:"YWSJ" form:"YWSJ"`
1234 1215
 	CH       string    `gorm:"column:CH" json:"CH" form:"CH"`
1235 1216
 	SSKSDM   string    `gorm:"column:SSKSDM" json:"SSKSDM" form:"SSKSDM"`
1236 1217
 	SSKSMC   string    `gorm:"column:SSKSMC" json:"SSKSMC" form:"SSKSMC"`

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 955 - 2255
service/city/auto_create_week_schedules_service.go


+ 12 - 74
service/city_data_uoload_service.go 파일 보기

@@ -141,7 +141,7 @@ func FindOrgHisDoctorAdviceInfo(org_id int64, lastUploadTime int64, nowTime int6
141 141
 }
142 142
 
143 143
 func FindOrgHisDoctorAdviceInfoByPid(org_id int64, pid int64) (patient []*models.HisDoctorAdviceInfo, err error) {
144
-	db := readDb.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? and prescription_id = ?", org_id,pid)
144
+	db := readDb.Model(&models.HisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? and prescription_id = ?", org_id, pid)
145 145
 	err = db.Find(&patient).Error
146 146
 	return
147 147
 }
@@ -402,13 +402,6 @@ func FindOrgInspectionGroupSzblbr(org_id int64, lastUploadTime int64, nowTime in
402 402
 	return
403 403
 }
404 404
 
405
-func FindOrgInspectionGroupSzblpg(org_id int64, lastUploadTime int64, nowTime int64, patient_id int64) (inspection []*models.XtInspection, err error) {
406
-	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? and project_id in (1013804)  and patient_id = ?", org_id, patient_id)
407
-	db = db.Where("created_time >= ? AND created_time <= ?", lastUploadTime, nowTime).Group("inspect_date")
408
-	err = db.Find(&inspection).Error
409
-	return
410
-}
411
-
412 405
 // 传染病查询
413 406
 func FindOrgInspectionGroupSzblTwo(org_id int64, inspect_date int64, patient_id int64) (inspection []*models.XtInspection, err error) {
414 407
 	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? and project_id in (1013800,1013870)  and patient_id = ? and inspect_date = ?", org_id, patient_id, inspect_date)
@@ -423,13 +416,6 @@ func FindOrgInspectionGroupSzblbrTwo(org_id int64, inspect_date int64, patient_i
423 416
 	return
424 417
 }
425 418
 
426
-// 传染病查询
427
-func FindOrgInspectionGroupSzblpgTwo(org_id int64, inspect_date int64, patient_id int64) (inspection []*models.XtInspection, err error) {
428
-	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? and project_id in (1013804) and patient_id = ? and inspect_date = ?", org_id, patient_id, inspect_date)
429
-	err = db.Find(&inspection).Error
430
-	return
431
-}
432
-
433 419
 // 传染病查询
434 420
 func FindOrgInspectionGroupTwo(org_id int64, inspect_date int64, patient_id int64) (inspection []*models.XtInspection, err error) {
435 421
 	db := readDb.Model(&models.XtInspection{}).Where("status = 1 AND org_id = ? and project_id = 14 and patient_id = ? and inspect_date = ?", org_id, patient_id, inspect_date)
@@ -550,10 +536,10 @@ func BatchCreateStaffRecord(staffs []*sz.TempHdStaff, rdb *gorm.DB) (err error)
550 536
 			var id_no int64
551 537
 			id_no = 429001198701091670
552 538
 			for _, info := range staffs {
553
-				thisSQL := "INSERT INTO t_hd_staff (hospital_id,staff_id, id_no,id_type,staff_name,  position,  staff_status, staff_no, permanent_type, in_date ,create_time, sjscsj, xgbz) VALUES "
539
+				thisSQL := "INSERT INTO t_hd_staff (hospital_id,staff_id, id_no,id_type,staff_name,  position,  staff_status, staff_no, permanent_type, in_date ,create_time,update_time, sjscsj, xgbz) VALUES "
554 540
 				insertParams := make([]string, 0)
555 541
 				insertData := make([]interface{}, 0)
556
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?)")
542
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
557 543
 
558 544
 				insertData = append(insertData, info.HospitalId)
559 545
 				insertData = append(insertData, info.StaffId)
@@ -566,6 +552,7 @@ func BatchCreateStaffRecord(staffs []*sz.TempHdStaff, rdb *gorm.DB) (err error)
566 552
 				insertData = append(insertData, info.PermanentType)
567 553
 				insertData = append(insertData, "2019-09-01")
568 554
 				insertData = append(insertData, info.CreateTime)
555
+				insertData = append(insertData, info.UpdateTime)
569 556
 				insertData = append(insertData, info.Sjscsj)
570 557
 				insertData = append(insertData, info.Xgbz)
571 558
 				thisSQL += strings.Join(insertParams, ", ")
@@ -720,10 +707,11 @@ func BatchCreatePsm(psms []*sz.TempHdPsMedicine, rdb *gorm.DB) (err error) {
720 707
 		if len(psms) > 0 {
721 708
 
722 709
 			for _, psm := range psms {
723
-				thisSQL := "INSERT INTO t_hd_ps_medicine (sn,hospital_id, medicine_type_id,medicine_id,create_time,sjscsj,xgbz) VALUES "
710
+				thisSQL := "INSERT INTO t_hd_ps_medicine (sn,prescribe_id,hospital_id, medicine_type_id,medicine_id,create_time,sjscsj,xgbz) VALUES "
724 711
 				insertParams := make([]string, 0)
725 712
 				insertData := make([]interface{}, 0)
726
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?)")
713
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?)")
714
+				insertData = append(insertData, psm.Sn)
727 715
 				insertData = append(insertData, psm.Sn)
728 716
 				insertData = append(insertData, psm.HospitalId)
729 717
 				insertData = append(insertData, psm.MedicineTypeId)
@@ -746,6 +734,11 @@ func BatchCreatePsm(psms []*sz.TempHdPsMedicine, rdb *gorm.DB) (err error) {
746 734
 	return
747 735
 }
748 736
 
737
+func BatchCreateDialysisOne(ps *sz.TempHdDialysis, rdb *gorm.DB) (err error) {
738
+	err = rdb.Create(&ps).Error
739
+	return err
740
+}
741
+
749 742
 func BatchCreateDialysis(psms []*sz.TempHdDialysis, rdb *gorm.DB) (err error) {
750 743
 	if len(psms) > 0 {
751 744
 		utx := rdb
@@ -1214,35 +1207,6 @@ func CreateSickbed(wms []*sz.TempHdSickbed, rdb *gorm.DB) (err error) {
1214 1207
 	return
1215 1208
 }
1216 1209
 
1217
-
1218
-func CreateSickbed2(wms []*sz.TempHdSickbed, rdb *gorm.DB) (err error) {
1219
-	if len(wms) > 0 {
1220
-		utx := rdb
1221
-		if len(wms) > 0 {
1222
-			for _, wm := range wms {
1223
-				thisSQL := "INSERT INTO t_hd_sickbed (sickbed_no,hospital_id,division_id,sickbed_code,sickbed_type,xgbz,create_time,update_time,sjscsj,ylyl1) VALUES "
1224
-				insertParams := make([]string, 0)
1225
-				insertData := make([]interface{}, 0)
1226
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?)")
1227
-				insertData = append(insertData, wm.SickbedNo)
1228
-				insertData = append(insertData, wm.HospitalId)
1229
-				insertData = append(insertData, wm.DivisionId)
1230
-				insertData = append(insertData, wm.SickbedCode)
1231
-				insertData = append(insertData, wm.SickbedType)
1232
-				insertData = append(insertData, wm.Xgbz)
1233
-				insertData = append(insertData, wm.CreateTime)
1234
-				insertData = append(insertData, wm.UpdateTime)
1235
-				insertData = append(insertData, wm.Sjscsj)
1236
-				insertData = append(insertData, wm.Ylyl1)
1237
-
1238
-				thisSQL += strings.Join(insertParams, ", ")
1239
-				utx.Exec(thisSQL, insertData...)
1240
-			}
1241
-		}
1242
-	}
1243
-	return
1244
-}
1245
-
1246 1210
 func CreateDiagnosis(wms []*sz.TempHdDiagnosis, rdb *gorm.DB) (err error) {
1247 1211
 	if len(wms) > 0 {
1248 1212
 		utx := rdb
@@ -1949,29 +1913,3 @@ func BatchCreateTB_STAT_YWL_Report(ps *sz.TB_STAT_YWL_Report, rdb *gorm.DB) (err
1949 1913
 	err = rdb.Create(&ps).Error
1950 1914
 	return err
1951 1915
 }
1952
-
1953
-func FindOrgPatientDataTwo(org_id int64,ids []int64) (patient []*models.Patients, err error) {
1954
-	db := readDb.Model(&models.Patients{}).Where("status = 1 AND user_org_id = ? and id in (?)", org_id,ids)
1955
-	err = db.Find(&patient).Error
1956
-	return
1957
-}
1958
-
1959
-func FindNewOrgHisOrder(org_id int64, lastUploadTime int64, nowTime int64) (patient []*models.HisOrder, err error) {
1960
-	db := readDb.Model(&models.HisOrder{}).Preload("HisPatient", "status = 1").Where("status = 1 AND user_org_id = ? AND med_type = 14", org_id)
1961
-	db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
1962
-	err = db.Find(&patient).Error
1963
-	return
1964
-}
1965
-
1966
-func FindUserRoleData(org_id int64, admin_user_id int64) (role models.UserAdminRole, err error) {
1967
-	db := readUserDb.Model(&models.UserAdminRole{}).Where("status = 1 AND org_id = ? and admin_user_id = ?  ", org_id, admin_user_id)
1968
-	//db = db.Where("ctime >= ? AND ctime <= ?", lastUploadTime, nowTime)
1969
-	err = db.Find(&role).Error
1970
-	return
1971
-}
1972
-
1973
-
1974
-func BatchCreateTB_HIS_MZ_BL_Detail(ps *sz.TB_HIS_MZ_BL_Detail, rdb *gorm.DB) (err error) {
1975
-	err = rdb.Create(&ps).Error
1976
-	return err
1977
-}

+ 3 - 0
service/db.go 파일 보기

@@ -19,6 +19,7 @@ package service
19 19
 import (
20 20
 	"fmt"
21 21
 	"github.com/astaxie/beego"
22
+	"github.com/astaxie/beego/logs"
22 23
 	"github.com/jinzhu/gorm"
23 24
 	_ "github.com/jinzhu/gorm/dialects/mssql"
24 25
 	_ "github.com/jinzhu/gorm/dialects/mysql" // mysql
@@ -47,7 +48,9 @@ func CreateSqlServiceDB(Host string, Port string, User string, Pass string, Name
47 48
 	//rdb := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", User, Pass, Host, Port, Name)
48 49
 	mssqlstring := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;encrypt=disable", Host, Port, Name, User, Pass)
49 50
 	fmt.Println(mssqlstring)
51
+	logs.Alert("第4步:%v", mssqlstring)
50 52
 	mssqlDb, err = gorm.Open("mssql", mssqlstring)
53
+	logs.Alert("第5步:%v", err)
51 54
 	if err != nil {
52 55
 		panic(err)
53 56
 	}