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

controllers/sg/his_api_controller.go

@@ -3099,8 +3099,8 @@ func (c *HisApiController) GetSettleListHospital() {
 		HiType:         order.Insutype,
 		Insuplc:        miConfig.InsuplcAdmdvs,
 		MaindiagFlag:   "1",
-		BillCode:       last_order.FaPiaoCode,
-		BillNo:         zero,
+		BillCode:       order.FaPiaoCode,
+		BillNo:         order.FaPiaoCode,
 		BizSn:          order.Number,
 		PsnSelfPay:     order.PsnPartAmt,
 		PsnOwnPay:      order.PsnPartAmt,