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

controllers/sg/his_api_controller.go

@@ -1069,12 +1069,20 @@ func (c *HisApiController) GetBatchSettleList() {
 		json.Unmarshal([]byte(order.SetlDetail), &rf)
 
 		var tempFunPays []service.CustomStruct
+		var tempFunPay610100 service.CustomStruct
+
 		for _, item := range rf {
-			var tempFunPay service.CustomStruct
-			tempFunPay.FundPayamt = item.FundPayamt
-			tempFunPay.FundPayType = item.FundPayType
-			tempFunPays = append(tempFunPays, tempFunPay)
+			if item.FundPayType == "610100" {
+				tempFunPay610100.FundPayamt = tempFunPay610100.FundPayamt + item.FundPayamt
+				tempFunPay610100.FundPayType = item.FundPayType
+			} else {
+				var tempFunPay service.CustomStruct
+				tempFunPay.FundPayamt = item.FundPayamt
+				tempFunPay.FundPayType = item.FundPayType
+				tempFunPays = append(tempFunPays, tempFunPay)
+			}
 		}
+		tempFunPays = append(tempFunPays, tempFunPay610100)
 		struct4101.CustomStruct = tempFunPays
 
 		var tempOpspdiseinfos []service.OpspdiseinfoStruct