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

conf/app.conf

 
 
 [prod]
-org_id = 9504
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-# 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://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 = "jm_sc_yjyy"
+gdyb_paasid = "jm_sc_yjyy"
 # gdyb_paasid="zh_prd_yrojyy"
-gdyb_paasid = "sz_prd_yjyy"
+# gdyb_paasid = "sz_prd_yjyy"
 # gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/sg/his_api_controller.go

 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrderErr(9504, 9505)
+	orders, _ := service.GetAllHisOrder(10106)
 	for _, item := range orders {
-		order_id := item.PatientId
+		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 				ErrMsg:    res.ErrMsg + "解析失败",
 				Status:    1,
 				PatientId: order_id,
-				Stage:     2000,
+				Stage:     10106,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     9505,
+				Stage:     10106,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

service/his_service.go

 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' AND setl_time >= '2021-02-28 20:02:34'", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' AND setl_time >= '2022-03-01 00:00:00'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {