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

controllers/drug_pharmacy_management_controller.go

 				RecordDate:        item.AdviceDate,
 				OrdreNumber:       warehousing_out_order,
 				Creater:           admin_user_id,
+				UserOrgId:       item.UserOrgId,
+				PatientId:       item.PatientId,
+				HisAdviceInfoId: 0,
+				XtAdviceId:      item.ID,
+				HisOrXt:         1,
+				Ctime:           time.Now().Unix(),
+				Mtime:           0,
+				Status:          1,
+				HisAdviceId:     0,
+				DrugId:          item.DrugId,
+				RecordDate:      item.AdviceDate,
+				OrdreNumber:     warehousing_out_order,
+				Creater:         creater,
 			}
 
 			service.CreatePharmacy(pharmacy)
 				RecordDate:        item.AdviceDate,
 				OrdreNumber:       warehousing_out_order,
 				Creater:           admin_user_id,
+				UserOrgId:       item.UserOrgId,
+				PatientId:       item.PatientId,
+				HisAdviceInfoId: 0,
+				XtAdviceId:      0,
+				HisOrXt:         2,
+				Ctime:           time.Now().Unix(),
+				Mtime:           0,
+				Status:          1,
+				HisAdviceId:     item.ID,
+				DrugId:          item.DrugId,
+				RecordDate:      item.AdviceDate,
+				OrdreNumber:     warehousing_out_order,
+				Creater:         creater,
 			}
 
 			service.CreatePharmacy(pharmacy)

models/drug_pharmacy_management_models.go

 }
 
 type Pharmacy 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"`
-	HisPrescriptionId int64  `gorm:"column:his_prescription_id" json:"his_prescription_id" form:"his_prescription_id"`
-	XtAdviceId        int64  `gorm:"column:xt_advice_id" json:"xt_advice_id" form:"xt_advice_id"`
-	HisOrXt           int64  `gorm:"column:his_or_xt" json:"his_or_xt" form:"his_or_xt"`
-	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status            int64  `gorm:"column:status" json:"status" form:"status"`
-	HisAdviceId       int64  `gorm:"column:his_advice_id" json:"his_advice_id" form:"his_advice_id"`
-	DrugId            int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	OrdreNumber       string `gorm:"column:ordre_number" json:"ordre_number" form:"ordre_number"`
-	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	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"`
+	HisAdviceInfoId int64  `gorm:"column:his_advice_info_id" json:"his_advice_info_id" form:"his_advice_info_id"`
+	XtAdviceId      int64  `gorm:"column:xt_advice_id" json:"xt_advice_id" form:"xt_advice_id"`
+	HisOrXt         int64  `gorm:"column:his_or_xt" json:"his_or_xt" form:"his_or_xt"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	HisAdviceId     int64  `gorm:"column:his_advice_id" json:"his_advice_id" form:"his_advice_id"`
+	DrugId          int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	RecordDate      int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	OrdreNumber     string `gorm:"column:ordre_number" json:"ordre_number" form:"ordre_number"`
+	Creater         int64  `gorm:"column:creater" json:"creater" form:"creater"`
 }
 
 func (Pharmacy) TableName() string {