Merge branch 'master' of http://git.shengws.com/csx/gdyb

models/his_models.go

@@ -286,7 +286,7 @@ type HisPrescriptionInfo struct {
 	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          int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       int64           `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"`