医保对接

controllers/his_api_controller.go

@@ -2692,34 +2692,42 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 }
 
 func (c *HisApiController) GetAllOrderDetail() {
-	order_id, _ := c.GetInt64("order_id", 0)
+	order_id, _ := c.GetInt64("id", 0)
 	order, _ := service.GetHisOrderByID(order_id)
 	if order.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
 		return
 	}
-	order_info, _ := service.GetHisOrderInfoByNumber(order.Number)
-
+	org_id := c.GetAdminUserInfo().CurrentOrgId
+	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
+	patient, _ := service.GetPatientByID(org_id, order.PatientId)
+	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"order":      order,
 		"order_info": order_info,
+		"patient":    patient,
+		"admin_info": adminInfo,
 	})
 	return
 
 }
 
 func (c *HisApiController) GetAllOrderDetailCollect() {
-	order_id, _ := c.GetInt64("order_id", 0)
+	order_id, _ := c.GetInt64("id", 0)
 	order, _ := service.GetHisOrderByID(order_id)
 	if order.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
 		return
 	}
-	order_info, _ := service.GetHisOrderInfoByNumber(order.Number)
-
+	org_id := c.GetAdminUserInfo().CurrentOrgId
+	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
+	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
+	patient, _ := service.GetPatientByID(org_id, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"order":      order,
 		"order_info": order_info,
+		"patient":    patient,
+		"admin_info": adminInfo,
 	})
 	return
 }

models/his_models.go

@@ -683,6 +683,7 @@ type HisOrder struct {
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
 	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
 	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
 
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`

service/his_service.go

@@ -101,6 +101,7 @@ type VMHisOrder struct {
 	FoundPrice            float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
 	MedicalInsurancePrice float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
 	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
 }
 
 func (VMHisOrder) TableName() string {
@@ -1125,6 +1126,20 @@ func (VMHisProject) TableName() string {
 	return "xt_his_project"
 }
 
+type VMHisPrescriptionTwo struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Type      int64 `gorm:"column:type" json:"type" form:"type"`
+}
+
+func (VMHisPrescriptionTwo) TableName() string {
+	return "his_prescription"
+}
+
 func GetAllProjectTeamList(orgid int64) (project []*VMHisProjectTeam, err error) {
 	err = XTReadDB().Model(&VMHisProjectTeam{}).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
 	for _, item := range project {
@@ -1156,8 +1171,12 @@ type HisDoctorAdviceInfo struct {
 	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
 	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
-	Drug                  Drug    `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+
+	Price                float64              `gorm:"column:price" json:"price" form:"price"`
+	DrugId               int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Drug                 Drug                 `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	VMHisPrescriptionTwo VMHisPrescriptionTwo `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"prescription"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -1165,27 +1184,28 @@ func (HisDoctorAdviceInfo) TableName() string {
 }
 
 type HisPrescriptionProject struct {
-	ID                 int64        `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64      `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status             int64        `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId          int64        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64        `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string       `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string       `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string       `gorm:"column:day" json:"day" form:"day"`
-	VMHisProject       VMHisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	Remark             string       `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string       `gorm:"column:unit" json:"unit" form:"unit"`
+	ID                   int64                `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64                `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price                float64              `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId            int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64                `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId         int64                `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate           int64                `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId       int64                `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count                int64                `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn            string               `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg          string               `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose           string               `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay          string               `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency   string               `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                  string               `gorm:"column:day" json:"day" form:"day"`
+	VMHisProject         VMHisProject         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	Remark               string               `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string               `gorm:"column:unit" json:"unit" form:"unit"`
+	VMHisPrescriptionTwo VMHisPrescriptionTwo `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"prescription"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -1219,11 +1239,9 @@ func (HisOrderInfo) TableName() string {
 
 func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisOrderInfo, err error) {
 	err = readDb.Model(&HisOrderInfo{}).Where("order_number = ? AND status = 1", order_number).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ?", org_id).
-			Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id)
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisPrescriptionTwo", "status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id)
 	}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ?", org_id).
-			Preload("Drug", "status = 1 AND user_org_id = ?", org_id)
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisPrescriptionTwo", "status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status = 1 AND org_id = ?", org_id)
 	}).Find(&order).Error
 	return
 }