csx 4 лет назад
Родитель
Сommit
098cdd534f
2 измененных файлов: 8 добавлений и 0 удалений
  1. 7 0
      controllers/his_api_controller.go
  2. 1 0
      models/his_models.go

+ 7 - 0
controllers/his_api_controller.go Просмотреть файл

640
 			RefdSetlFlag    string  `json:"refd_setl_flag"`
640
 			RefdSetlFlag    string  `json:"refd_setl_flag"`
641
 			SetlTime        string  `json:"setl_time"`
641
 			SetlTime        string  `json:"setl_time"`
642
 			MedType         string  `json:"med_type"`
642
 			MedType         string  `json:"med_type"`
643
+			HospLv          string  `json:"hosp_lv"`
643
 		} `json:"setlinfo"`
644
 		} `json:"setlinfo"`
644
 	} `json:"output"`
645
 	} `json:"output"`
645
 	RefmsgTime  string      `json:"refmsg_time"`
646
 	RefmsgTime  string      `json:"refmsg_time"`
2227
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
2228
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
2228
 			return
2229
 			return
2229
 		}
2230
 		}
2231
+
2232
+		printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
2233
+		charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
2234
+
2230
 		if res.Infcode == 0 {
2235
 		if res.Infcode == 0 {
2231
 			c.ServeSuccessJSON(map[string]interface{}{
2236
 			c.ServeSuccessJSON(map[string]interface{}{
2237
+				"charge_admin":                                charge_admin,
2238
+				"printor_admin":                               printor_admin,
2232
 				"info":                                        res.Output.Setlinfo,
2239
 				"info":                                        res.Output.Setlinfo,
2233
 				"bedCostTotal":                                bedCostTotal,
2240
 				"bedCostTotal":                                bedCostTotal,
2234
 				"bedCostSelfTotal":                            bedCostSelfTotal,
2241
 				"bedCostSelfTotal":                            bedCostSelfTotal,

+ 1 - 0
models/his_models.go Просмотреть файл

648
 	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
648
 	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
649
 	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
649
 	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
650
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
650
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
651
+	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
651
 
652
 
652
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
653
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
653
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
654
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`