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

controllers/sg/his_api_controller.go

@@ -1216,7 +1216,7 @@ func (c *HisApiController) GetSettleListHospital() {
 		PsnName:        order.PsnName,
 		Gend:           order.Gend,
 		Brdy:           his.Brdy,
-		Age:            order.Age,
+		Age:            int64(order.Age),
 		Naty:           order.Naty,
 		PatnCertType:   "01",
 		Certno:         order.Certno,