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

controllers/sg/his_api_controller.go

@@ -147,31 +147,33 @@ func (c *HisApiController) GetSettleList() {
 	var rf []*CustomFundPay
 	json.Unmarshal([]byte(order.SetlDetail), &rf)
 
+	var tempFunPays []*service.CustomStruct
 	for _, item := range rf {
 		var tempFunPay *service.CustomStruct
 		tempFunPay.FundPayamt = item.FundPayamt
 		tempFunPay.FundPayType = item.FundPayType
-		struct4101.CustomStruct = append(struct4101.CustomStruct, tempFunPay)
+		tempFunPays = append(tempFunPays, tempFunPay)
 	}
+	struct4101.CustomStruct = tempFunPays
+
+	var tempOpspdiseinfos []*service.OpspdiseinfoStruct
 	var tempOpspdiseinfo *service.OpspdiseinfoStruct
 	var tempOpspdiseinfo2 *service.OpspdiseinfoStruct
-
 	sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 	sickConfigTwo, _ := service.FindSickById(his.SickType)
-
 	tempOpspdiseinfo.DiagCode = sickConfig.CountryCode
 	tempOpspdiseinfo.DiagName = sickConfig.CountryContentName
 	tempOpspdiseinfo.MaindiagFlag = "1"
 	tempOpspdiseinfo.OprnOprtCode = ""
 	tempOpspdiseinfo.OprnOprtName = ""
-	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, tempOpspdiseinfo)
-
+	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.CountryCode
 	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
 	tempOpspdiseinfo2.MaindiagFlag = "2"
 	tempOpspdiseinfo2.OprnOprtCode = ""
 	tempOpspdiseinfo2.OprnOprtName = ""
-	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct, tempOpspdiseinfo2)
+	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+	struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
 
 	var iteminfo *service.IteminfoStruct
 
@@ -432,6 +434,8 @@ func (c *HisApiController) GetSettleList() {
 
 	}
 
+	var iteminfoStructs []*service.IteminfoStruct
+
 	if bedCostTotal != 0 {
 		iteminfo.MedChrgitm = "01"
 		iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
@@ -439,7 +443,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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
 	}
 
 	if checkCostTotal != 0 {
@@ -449,7 +453,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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
 
 	}
 
@@ -460,7 +464,9 @@ 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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
+
+		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
 	}
 
@@ -471,7 +477,11 @@ 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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
+
+		// (struct4101.IteminfoStruct, iteminfo)
+
+		//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
 
 	}
 
@@ -482,7 +492,8 @@ 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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
 
 	}
 
@@ -493,7 +504,9 @@ 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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
+
 	}
 	if westernMedicineCostTotal != 0 {
 		iteminfo.MedChrgitm = "09"
@@ -502,7 +515,9 @@ 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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
+
 	}
 	if chineseTraditionalMedicineCostTotal != 0 {
 		iteminfo.MedChrgitm = "11"
@@ -511,7 +526,9 @@ 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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
+
 	}
 	if otherCostTotal != 0 {
 		iteminfo.MedChrgitm = "14"
@@ -520,8 +537,11 @@ 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)
+		iteminfoStructs = append(iteminfoStructs, iteminfo)
+
 	}
+	struct4101.IteminfoStruct = iteminfoStructs
 	struct4101.Ntly = "中国"
 	struct4101.AdmCaty = "A03.06"
 	result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)