Ver código fonte

医保对接

csx 2 anos atrás
pai
commit
76402d8175
2 arquivos alterados com 5 adições e 1 exclusões
  1. 3 1
      controllers/his_api_controller.go
  2. 2 0
      service/his_service.go

+ 3 - 1
controllers/his_api_controller.go Ver arquivo

6170
 
6170
 
6171
 	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
6171
 	his_hospital_record, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
6172
 
6172
 
6173
+	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
6174
+
6173
 	//prescriptions, _ := service.GetHisPrescriptionThree(adminUser.CurrentOrgId, patient_id, order.Number)
6175
 	//prescriptions, _ := service.GetHisPrescriptionThree(adminUser.CurrentOrgId, patient_id, order.Number)
6174
 
6176
 
6175
 	var bedCostTotal float64 = 0         //床位总费
6177
 	var bedCostTotal float64 = 0         //床位总费
6505
 		"number":                              his.Number,               //门诊号
6507
 		"number":                              his.Number,               //门诊号
6506
 		"date":                                order.SettleAccountsDate, //结算日期
6508
 		"date":                                order.SettleAccountsDate, //结算日期
6507
 		"name":                                order.PsnName,            //姓名
6509
 		"name":                                order.PsnName,            //姓名
6508
-		"gender":                              order.Gend,               //性别
6510
+		"gender":                              patient.Gender,           //性别
6509
 		"psn_cash_money":                      order.PsnCashPay,         //个人支付
6511
 		"psn_cash_money":                      order.PsnCashPay,         //个人支付
6510
 		"pay_way":                             "门诊",                     //结算方式
6512
 		"pay_way":                             "门诊",                     //结算方式
6511
 		"medfee_sumamt":                       order.MedfeeSumamt,       //总费用
6513
 		"medfee_sumamt":                       order.MedfeeSumamt,       //总费用

+ 2 - 0
service/his_service.go Ver arquivo

125
 	Status       int64  `gorm:"column:status" json:"status" form:"status"`
125
 	Status       int64  `gorm:"column:status" json:"status" form:"status"`
126
 	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
126
 	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
127
 	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
127
 	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
128
+	Phone        int64  `gorm:"column:phone" json:"phone" form:"phone"`
129
+	Gender       int64  `gorm:"column:gender" json:"gender" form:"gender"`
128
 
130
 
129
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
131
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
130
 	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
132
 	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`