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

controllers/sg/his_api_controller.go

@@ -34,6 +34,7 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+	"github.com/go-ole/go-ole"
 )
 
 type HisApiController struct {

models/his_models.go

@@ -239,10 +239,10 @@ type HisDoctorAdviceInfo struct {
 
 	NewGroupno string `gorm:"column:-" json:"new_groupno" form:"new_groupno"`
 	Newfn      string `gorm:"column:-" json:"newfn" form:"newfn"`
-	IsUpload           int64 `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
-	ZeroFlag           int64 `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
+	IsUpload   int64  `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	ZeroFlag   int64  `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
 
-	UploadDate            string   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	UploadDate  string      `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
 	BaseDrugLib BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
@@ -748,7 +748,9 @@ type HisOrder struct {
 	IsUploadSuccess   int64  `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 	SickName          string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 
-	FaPiaoSn string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
+	PackNum     int64  `gorm:"column:pack_num" json:"pack_num" form:"pack_num"`
+	GoodPackNum int64  `gorm:"column:good_pack_num" json:"good_pack_num" form:"good_pack_num"`
+	FaPiaoSn    string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
 }
 
 func (HisOrder) TableName() string {
@@ -1477,8 +1479,7 @@ type HisDoctorAdviceInfoTen struct {
 	BaseDrugLib           BaseDrugLib  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 	HisOrderInfo          HisOrderInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"order_info"`
 	DrugWayCount          string       `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
-	UploadDate            string   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
-
+	UploadDate            string       `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
 }
 
 func (HisDoctorAdviceInfoTen) TableName() string {
@@ -1597,6 +1598,9 @@ type HisChargeSettleOrder struct {
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
 	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+
+	PackNum     int64 `gorm:"column:pack_num" json:"pack_num" form:"pack_num"`
+	GoodPackNum int64 `gorm:"column:good_pack_num" json:"good_pack_num" form:"good_pack_num"`
 }
 
 func (HisChargeSettleOrder) TableName() string {
@@ -1893,6 +1897,9 @@ type NewHisOrder111 struct {
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
 	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+
+	PackNum     int64 `gorm:"column:pack_num" json:"pack_num" form:"pack_num"`
+	GoodPackNum int64 `gorm:"column:good_pack_num" json:"good_pack_num" form:"good_pack_num"`
 }
 
 func (NewHisOrder111) TableName() string {