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

controllers/sg/his_api_controller.go

@@ -148,13 +148,13 @@ func (c *HisApiController) GetSettleList() {
 	json.Unmarshal([]byte(order.SetlDetail), &rf)
 
 	for _, item := range rf {
-		var tempFunPay service.CustomStruct
+		var tempFunPay *service.CustomStruct
 		tempFunPay.FundPayamt = item.FundPayamt
 		tempFunPay.FundPayType = item.FundPayType
-		struct4101.CustomStruct = append(struct4101.CustomStruct, &tempFunPay)
+		struct4101.CustomStruct = append(struct4101.CustomStruct, tempFunPay)
 	}
-	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)
@@ -164,16 +164,16 @@ func (c *HisApiController) GetSettleList() {
 	tempOpspdiseinfo.MaindiagFlag = "1"
 	tempOpspdiseinfo.OprnOprtCode = ""
 	tempOpspdiseinfo.OprnOprtName = ""
-	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, &tempOpspdiseinfo)
+	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, tempOpspdiseinfo)
 
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.CountryCode
 	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
 	tempOpspdiseinfo2.MaindiagFlag = "2"
 	tempOpspdiseinfo2.OprnOprtCode = ""
 	tempOpspdiseinfo2.OprnOprtName = ""
-	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, &tempOpspdiseinfo2)
+	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, tempOpspdiseinfo2)
 
-	var iteminfo service.IteminfoStruct
+	var iteminfo *service.IteminfoStruct
 
 	var bedCostTotal float64 = 0         //床位总费
 	var bedCostSelfTotal float64 = 0     //床位自费
@@ -439,7 +439,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = bed_claa_sunmfee
 		iteminfo.ClabAmt = bed_clab_amt
 		iteminfo.OthAmt = bed_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 	}
 
 	if checkCostTotal != 0 {
@@ -449,7 +449,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = check_claa_sunmfee
 		iteminfo.ClabAmt = check_clab_amt
 		iteminfo.OthAmt = check_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
 	}
 
@@ -460,7 +460,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = laboratory_claa_sunmfee
 		iteminfo.ClabAmt = laboratory_clab_amt
 		iteminfo.OthAmt = laboratory_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
 	}
 
@@ -471,7 +471,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = treat_claa_sunmfee
 		iteminfo.ClabAmt = treat_clab_amt
 		iteminfo.OthAmt = treat_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
 	}
 
@@ -482,7 +482,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = operation_claa_sunmfee
 		iteminfo.ClabAmt = operation_clab_amt
 		iteminfo.OthAmt = operation_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
 	}
 
@@ -493,7 +493,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = material_claa_sunmfee
 		iteminfo.ClabAmt = material_clab_amt
 		iteminfo.OthAmt = material_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 	}
 	if westernMedicineCostTotal != 0 {
 		iteminfo.MedChrgitm = "09"
@@ -502,7 +502,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
 		iteminfo.ClabAmt = westernMedicine_clab_amt
 		iteminfo.OthAmt = westernMedicine_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 	}
 	if chineseTraditionalMedicineCostTotal != 0 {
 		iteminfo.MedChrgitm = "11"
@@ -511,7 +511,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
 		iteminfo.ClabAmt = westernMedicine_clab_amt
 		iteminfo.OthAmt = westernMedicine_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 	}
 	if otherCostTotal != 0 {
 		iteminfo.MedChrgitm = "14"
@@ -520,7 +520,7 @@ func (c *HisApiController) GetSettleList() {
 		iteminfo.ClaaSumfee = other_claa_sunmfee
 		iteminfo.ClabAmt = other_clab_amt
 		iteminfo.OthAmt = other_other_amt
-		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, &iteminfo)
+		struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 	}
 	struct4101.Ntly = "中国"
 	struct4101.AdmCaty = "A03.06"