Kaynağa Gözat

医保对接

csx 4 yıl önce
ebeveyn
işleme
db953e0cea

+ 2 - 4
controllers/gdyb_controller.go Dosyayı Görüntüle

@@ -70,17 +70,15 @@ func (c *GdybController) PostOne() {
70 70
 	org_name := c.GetString("org_name")
71 71
 	doctor := c.GetString("doctor")
72 72
 	fixmedins_code := c.GetString("fixmedins_code")
73
-
74 73
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
75 74
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
76
-
77 75
 	secret_key := c.GetString("secret_key")
78
-
79 76
 	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key)
80
-
81 77
 	var dat map[string]interface{}
82 78
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
79
+
83 80
 	} else {
81
+
84 82
 	}
85 83
 
86 84
 	c.ServeSuccessJSON(map[string]interface{}{

+ 39 - 35
models/his_models.go Dosyayı Görüntüle

@@ -1,6 +1,9 @@
1 1
 package models
2 2
 
3
-import "time"
3
+import (
4
+	"gdyb/models"
5
+	"time"
6
+)
4 7
 
5 8
 type XtHisProject struct {
6 9
 	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
@@ -572,40 +575,41 @@ func (XtHisProjectList) TableName() string {
572 575
 }
573 576
 
574 577
 type XtHisPatient struct {
575
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
576
-	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
577
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
578
-	Name                   string  `gorm:"column:name" json:"name" form:"name"`
579
-	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
580
-	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
581
-	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
582
-	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
583
-	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
584
-	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
585
-	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
586
-	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
587
-	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
588
-	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
589
-	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
590
-	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
591
-	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
592
-	TreatmentCost          float64 `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
593
-	CostOfProduction       float64 `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
594
-	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
595
-	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
596
-	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
597
-	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
598
-	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
599
-	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
600
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
601
-	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
602
-	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
603
-	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
604
-	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
605
-	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
606
-	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
607
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
608
-	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
578
+	ID                     int64           `gorm:"column:id" json:"id" form:"id"`
579
+	BalanceAccountsType    int64           `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
580
+	MedicalInsuranceNumber string          `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
581
+	Name                   string          `gorm:"column:name" json:"name" form:"name"`
582
+	Gender                 int64           `gorm:"column:gender" json:"gender" form:"gender"`
583
+	IdType                 int64           `gorm:"column:id_type" json:"id_type" form:"id_type"`
584
+	MedicalTreatmentType   int64           `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
585
+	Birthday               int64           `gorm:"column:birthday" json:"birthday" form:"birthday"`
586
+	RecordDate             int64           `gorm:"column:record_date" json:"record_date" form:"record_date"`
587
+	Age                    int64           `gorm:"column:age" json:"age" form:"age"`
588
+	PhoneNumber            string          `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
589
+	IdCardNo               string          `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
590
+	RegisterType           int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
591
+	AdminUserId            int64           `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
592
+	Departments            int64           `gorm:"column:departments" json:"departments" form:"departments"`
593
+	IsNeedCostOfProduction int64           `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
594
+	RegisterCost           float64         `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
595
+	TreatmentCost          float64         `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
596
+	CostOfProduction       float64         `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
597
+	Total                  float64         `gorm:"column:total" json:"total" form:"total"`
598
+	UserOrgId              int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
599
+	Status                 int64           `gorm:"column:status" json:"status" form:"status"`
600
+	Ctime                  int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
601
+	Mtime                  int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
602
+	PatientId              int64           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
603
+	Number                 string          `gorm:"column:number" json:"number" form:"number"`
604
+	Doctor                 int64           `gorm:"column:doctor" json:"doctor" form:"doctor"`
605
+	IsReturn               int64           `gorm:"column:is_return" json:"is_return" form:"is_return"`
606
+	Phone                  string          `gorm:"column:phone" json:"phone" form:"phone"`
607
+	SocialType             int64           `gorm:"column:social_type" json:"social_type" form:"social_type"`
608
+	IdCardType             int64           `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
609
+	PType                  string          `gorm:"column:p_type" json:"p_type" form:"p_type"`
610
+	Diagnosis              int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
611
+	SickType               int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
612
+	HisOrder               models.HisOrder `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,SettleAccountsDate" json:"order"`
609 613
 }
610 614
 
611 615
 func (XtHisPatient) TableName() string {

+ 1 - 0
service/his_project_service.go Dosyayı Görüntüle

@@ -304,6 +304,7 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
304 304
 	if orgid > 0 {
305 305
 		db = db.Where("x.user_org_id = ?", orgid)
306 306
 	}
307
+	db = db.Preload("HisOrder", "status = 1 AND user_org_id = ?", orgid)
307 308
 	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.is_return,x.doctor,x.ctime,x.social_type,x.phone").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
308 309
 	return hisPatient, total, err
309 310
 }