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

controllers/sg/his_api_controller.go

@@ -528,19 +528,21 @@ func (c *HisApiController) GetSettleList() {
 		MedinsFillDept: depart.Name,
 		IptMedType:     "2",
 	}
-	if order.SettleType == 1 {
-		t := time.Unix(int64(order.SettleAccountsDate), 0)
-		dateStr := t.Format("2006-01-02")
-		struct4101.SetlBegnDate = dateStr
-		struct4101.SetlEndDate = dateStr
-	} else {
-		t := time.Unix(int64(order.SettleStartTime), 0)
-		t2 := time.Unix(int64(order.SettleEndTime), 0)
-		dateStartStr := t.Format("2006-01-02")
-		dateEndStr := t2.Format("2006-01-02")
-		struct4101.SetlBegnDate = dateStartStr
-		struct4101.SetlEndDate = dateEndStr
-	}
+	struct4101.SetlBegnDate = order.SetlTime
+	struct4101.SetlEndDate = order.SetlTime
+	//if order.SettleType == 1 {
+	//	t := time.Unix(int64(order.SettleAccountsDate), 0)
+	//	dateStr := t.Format("2006-01-02")
+	//	struct4101.SetlBegnDate = dateStr
+	//	struct4101.SetlEndDate = dateStr
+	//} else {
+	//	t := time.Unix(int64(order.SettleStartTime), 0)
+	//	t2 := time.Unix(int64(order.SettleEndTime), 0)
+	//	dateStartStr := t.Format("2006-01-02")
+	//	dateEndStr := t2.Format("2006-01-02")
+	//	struct4101.SetlBegnDate = dateStartStr
+	//	struct4101.SetlEndDate = dateEndStr
+	//}
 
 	var rf []CustomFundPay
 	json.Unmarshal([]byte(order.SetlDetail), &rf)
@@ -1011,6 +1013,9 @@ func (c *HisApiController) GetBatchSettleList() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
 			return
 		}
+		if his.BalanceAccountsType == 2 {
+			continue
+		}
 		struct4101 := service.Struct4101{
 			PsnNo:          order.PsnNo,
 			MdtrtId:        order.MdtrtId,