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

controllers/sg/his_api_controller.go

@@ -144,19 +144,19 @@ func (c *HisApiController) GetSettleList() {
 		struct4101.SetlEndDate = dateEndStr
 	}
 
-	var rf []*CustomFundPay
+	var rf []CustomFundPay
 	json.Unmarshal([]byte(order.SetlDetail), &rf)
 
-	var tempFunPays []*service.CustomStruct
+	var tempFunPays []service.CustomStruct
 	for _, item := range rf {
 		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 tempOpspdiseinfos []service.OpspdiseinfoStruct
 	var tempOpspdiseinfo service.OpspdiseinfoStruct
 	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
 	sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
@@ -166,13 +166,13 @@ 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
@@ -434,7 +434,7 @@ func (c *HisApiController) GetSettleList() {
 
 	}
 
-	var iteminfoStructs []*service.IteminfoStruct
+	var iteminfoStructs []service.IteminfoStruct
 
 	if bedCostTotal != 0 {
 		iteminfo.MedChrgitm = "01"
@@ -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

service/gdyb_service.go

@@ -2152,9 +2152,9 @@ type Struct4101 struct {
 	MedinsFillPsn      string
 	IptMedType         string
 	Age                int64
-	CustomStruct       []*CustomStruct
-	OpspdiseinfoStruct []*OpspdiseinfoStruct
-	IteminfoStruct     []*IteminfoStruct
+	CustomStruct       []CustomStruct
+	OpspdiseinfoStruct []OpspdiseinfoStruct
+	IteminfoStruct     []IteminfoStruct
 }
 
 //