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

controllers/sg/his_api_controller.go

@@ -149,16 +149,16 @@ func (c *HisApiController) GetSettleList() {
 
 	var tempFunPays []*service.CustomStruct
 	for _, item := range rf {
-		var tempFunPay *service.CustomStruct
+		var tempFunPay service.CustomStruct
 		tempFunPay.FundPayamt = item.FundPayamt
 		tempFunPay.FundPayType = item.FundPayType
-		tempFunPays = append(tempFunPays, tempFunPay)
+		tempFunPays = append(tempFunPays, &tempFunPay)
 	}
 	struct4101.CustomStruct = tempFunPays
 
 	var tempOpspdiseinfos []*service.OpspdiseinfoStruct
-	var tempOpspdiseinfo *service.OpspdiseinfoStruct
-	var tempOpspdiseinfo2 *service.OpspdiseinfoStruct
+	var tempOpspdiseinfo service.OpspdiseinfoStruct
+	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
 	sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
 	tempOpspdiseinfo.DiagCode = sickConfig.CountryCode
@@ -166,16 +166,16 @@ func (c *HisApiController) GetSettleList() {
 	tempOpspdiseinfo.MaindiagFlag = "1"
 	tempOpspdiseinfo.OprnOprtCode = ""
 	tempOpspdiseinfo.OprnOprtName = ""
-	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
+	tempOpspdiseinfos = append(tempOpspdiseinfos, &tempOpspdiseinfo)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.CountryCode
 	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
 	tempOpspdiseinfo2.MaindiagFlag = "2"
 	tempOpspdiseinfo2.OprnOprtCode = ""
 	tempOpspdiseinfo2.OprnOprtName = ""
-	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+	tempOpspdiseinfos = append(tempOpspdiseinfos, &tempOpspdiseinfo2)
 	struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
 
-	var iteminfo *service.IteminfoStruct
+	var iteminfo service.IteminfoStruct
 
 	var bedCostTotal float64 = 0         //床位总费
 	var bedCostSelfTotal float64 = 0     //床位自费
@@ -443,7 +443,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = bed_claa_sunmfee
 		iteminfo.ClabAmt = bed_clab_amt
 		iteminfo.OthAmt = bed_other_amt
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 	}
 
 	if checkCostTotal != 0 {
@@ -453,7 +453,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = check_claa_sunmfee
 		iteminfo.ClabAmt = check_clab_amt
 		iteminfo.OthAmt = check_other_amt
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 	}
 
@@ -464,7 +464,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = laboratory_claa_sunmfee
 		iteminfo.ClabAmt = laboratory_clab_amt
 		iteminfo.OthAmt = laboratory_other_amt
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
@@ -477,7 +477,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = treat_claa_sunmfee
 		iteminfo.ClabAmt = treat_clab_amt
 		iteminfo.OthAmt = treat_other_amt
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 		// (struct4101.IteminfoStruct, iteminfo)
 
@@ -493,7 +493,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClabAmt = operation_clab_amt
 		iteminfo.OthAmt = operation_other_amt
 		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 	}
 
@@ -505,7 +505,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClabAmt = material_clab_amt
 		iteminfo.OthAmt = material_other_amt
 		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 	}
 	if westernMedicineCostTotal != 0 {
@@ -516,7 +516,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClabAmt = westernMedicine_clab_amt
 		iteminfo.OthAmt = westernMedicine_other_amt
 		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 	}
 	if chineseTraditionalMedicineCostTotal != 0 {
@@ -527,7 +527,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClabAmt = westernMedicine_clab_amt
 		iteminfo.OthAmt = westernMedicine_other_amt
 		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 	}
 	if otherCostTotal != 0 {
@@ -538,7 +538,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClabAmt = other_clab_amt
 		iteminfo.OthAmt = other_other_amt
 		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
-		iteminfoStructs = append(iteminfoStructs, iteminfo)
+		iteminfoStructs = append(iteminfoStructs, &iteminfo)
 
 	}
 	struct4101.IteminfoStruct = iteminfoStructs