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

models/his_models.go

@@ -249,28 +249,26 @@ func (HisPatientCaseHistory) TableName() string {
 }
 
 type HisPrescriptionInfo 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"`
-	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	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"`
-	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"`
-	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	RegisterType       string `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments        int64  `gorm:"column:departments" json:"departments" form:"departments"`
-	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
-	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
-	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	DepartmentId       int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
-
-	XtHisDepartment XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
+	ID                 int64           `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate         int64           `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	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"`
+	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"`
+	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       string          `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory        string          `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	PrescriptionNumber string          `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	PrescriptionStatus int64           `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	BatchNumber        string          `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -296,9 +294,9 @@ type HisPrescription struct {
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
-	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"advices"`
-	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"project"`
-	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,ID;AssociationForeignKey:PatientId,RecordDate,PrescriptionId" json:"addition"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
+	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"addition"`
 }
 
 func (HisPrescription) TableName() string {