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

controllers/sg/his_api_controller.go

@@ -2019,6 +2019,7 @@ func (c *HisApiController) GetUploadInfo() {
 				Modify:                roles.AdminUserId,
 				FaPiaoNumber:          fapiao_number,
 				FaPiaoCode:            fapiao_code,
+				PType:                 2,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {

controllers/zh/zh_his_api_controller.go

@@ -1089,8 +1089,8 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				SettleEndTime:       end_time,
 				Creator:             roles.AdminUserId,
 				Modify:              roles.AdminUserId,
-
-				MedfeeSumamt: totals,
+				PType:               1,
+				MedfeeSumamt:        totals,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {

models/his_models.go

@@ -687,6 +687,8 @@ type HisOrder struct {
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          HisPatient          `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
+
+	PType int64 `gorm:"column:p_type" json:"p_type" form:"p_type"`
 }
 
 func (HisOrder) TableName() string {

routers/router.go

@@ -4,6 +4,7 @@ import (
 	//"gdyb/controllers/sz"
 
 	"gdyb/controllers/sg"
+	"gdyb/controllers/sz"
 	"gdyb/controllers/zh"
 
 	//"gdyb/controllers/sz"
@@ -26,7 +27,7 @@ func init() {
 
 	sg.HisManagerApiRegistRouters()
 	sg.GdybRegistRouters()
-	//sz.SZHisManagerApiRegistRouters()
+	sz.SZHisManagerApiRegistRouters()
 	zh.ZHHisManagerApiRegistRouters()
 
 }