Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gdyb_controller.go

@@ -70,17 +70,15 @@ func (c *GdybController) PostOne() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 	fixmedins_code := c.GetString("fixmedins_code")
-
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-
 	secret_key := c.GetString("secret_key")
-
 	result := service.Gdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key)
-
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
 	} else {
+
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

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

@@ -1,6 +1,9 @@
 package models
 
-import "time"
+import (
+	"gdyb/models"
+	"time"
+)
 
 type XtHisProject struct {
 	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
@@ -572,40 +575,41 @@ func (XtHisProjectList) TableName() string {
 }
 
 type XtHisPatient struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	Name                   string  `gorm:"column:name" json:"name" form:"name"`
-	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
-	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
-	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
-	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
-	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
-	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
-	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
-	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
-	TreatmentCost          float64 `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
-	CostOfProduction       float64 `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
-	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
-	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"`
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
-	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
-	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
-	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
-	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	ID                     int64           `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64           `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string          `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string          `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64           `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64           `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	MedicalTreatmentType   int64           `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	Birthday               int64           `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	RecordDate             int64           `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Age                    int64           `gorm:"column:age" json:"age" form:"age"`
+	PhoneNumber            string          `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdCardNo               string          `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	RegisterType           int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	AdminUserId            int64           `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments            int64           `gorm:"column:departments" json:"departments" form:"departments"`
+	IsNeedCostOfProduction int64           `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
+	RegisterCost           float64         `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
+	TreatmentCost          float64         `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
+	CostOfProduction       float64         `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
+	Total                  float64         `gorm:"column:total" json:"total" form:"total"`
+	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"`
+	Number                 string          `gorm:"column:number" json:"number" form:"number"`
+	Doctor                 int64           `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	IsReturn               int64           `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	Phone                  string          `gorm:"column:phone" json:"phone" form:"phone"`
+	SocialType             int64           `gorm:"column:social_type" json:"social_type" form:"social_type"`
+	IdCardType             int64           `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	PType                  string          `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	HisOrder               models.HisOrder `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,SettleAccountsDate" json:"order"`
 }
 
 func (XtHisPatient) TableName() string {
@@ -683,6 +687,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_project_service.go

@@ -304,6 +304,7 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
+	db = db.Preload("HisOrder", "status = 1 AND user_org_id = ?", orgid)
 	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
 	return hisPatient, total, err
 }

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
 }