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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -57,11 +57,11 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "jm_sc_yjyy"
 # gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"
-gdyb_paasid = "zq_prd_yjyy"
+# gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/sg/gdyb_controller.go

@@ -403,12 +403,12 @@ func (c *GdybController) PostTen() {
 	fmt.Println(stmtBegndate)
 	fmt.Println(stmtEnddate)
 	fmt.Println(medfeeSumamt)
-	clrType = "11"
-	//if len(clrType) == 0 {
-	//	clrType = "11"
-	//} else {
-	//	clrType = "9903"
-	//}
+	//clrType = "11"
+	if len(clrType) == 0 {
+		clrType = "11"
+	} else {
+		clrType = "9903"
+	}
 	baseParams := models.BaseParams{
 		SecretKey:      secret_key,
 		FixmedinsCode:  fixmedins_code,

controllers/sg/his_api_controller.go

@@ -4303,6 +4303,7 @@ func (c *HisApiController) GetUploadInfo() {
 							order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
 							order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
 							order.ClrOptins = res.Output.Setlinfo.ClrOptins
+							order.ClrType = res.Output.Setlinfo.ClrType
 							order.ClrWay = res.Output.Setlinfo.ClrWay
 							order.Creator = order.Creator
 							order.Modify = roles.AdminUserId
@@ -6964,15 +6965,7 @@ func (c *HisApiController) GetCheckAccount() {
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_org, clr_type)
-	//orders_two, _ := service.GetOrderByTimeThree(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
 	fixmedins_setl_cnt := int64(len(orders))
-	//
-	////撤销的算2条数据为一笔
-	//for _, item := range orders_two {
-	//	if item.OrderStatus == 3 {
-	//		fixmedins_setl_cnt = fixmedins_setl_cnt + 1
-	//	}
-	//}
 	var medfee_sumamt float64
 	var acct_pay float64
 	var fund_pay_sumamt float64

service/his_service.go

@@ -965,22 +965,15 @@ func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrder
 }
 
 func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_org string, clr_type string) (orders []*models.HisOrder, err error) {
-
+	db := readDb.Model(&models.HisOrder{})
+	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype)
 	if len(clr_org) > 0 {
-		if len(clr_type) > 0 {
-			err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? AND clr_type = ? AND clr_optins = ?", org_id, end_time, start_time, insutype, clr_type, clr_org).Find(&orders).Error
-		} else {
-			err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? AND clr_optins = ?", org_id, end_time, start_time, insutype, clr_org).Find(&orders).Error
-			//err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? ", org_id, end_time, start_time, insutype).Find(&orders).Error
-		}
-	} else {
-		if len(clr_type) > 0 {
-			err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? AND clr_type = ?", org_id, end_time, start_time, insutype, clr_type).Find(&orders).Error
-		} else {
-			err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? ", org_id, end_time, start_time, insutype).Find(&orders).Error
-
-		}
+		db = db.Where("clr_optins = ?", clr_org)
+	}
+	if len(clr_type) > 0 {
+		db = db.Where("clr_type = ?", clr_type)
 	}
+	err = db.Find(&orders).Error
 	return
 }