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 = 10215
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -58,10 +58,10 @@ gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/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 = "zq_prd_yjyy"
+gdyb_paasid = "zq_prd_yjyy"
 
 
 

controllers/sg/his_api_controller.go

@@ -1734,14 +1734,14 @@ func (c *HisApiController) GetSettleListHospital() {
 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrder(10106)
+	orders, _ := service.GetAllHisOrder(9504)
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 		admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
-		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2495)
+		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2100)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
@@ -2460,7 +2460,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     2000,
+				Stage:     9504,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

service/his_service.go

@@ -1378,7 +1378,7 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 }
 
 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 >= '2022-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 >= '2021-02-28 20:02:34'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {

service/jsyb_service.go

@@ -930,7 +930,7 @@ func Jsyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float6
 	inputData["fund_pay_sumamt"] = fund_pay_sumamt       //基金支付总额
 	inputData["acct_pay"] = acct_pay                     //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = fixmedins_setl_cnt //定点医药机构结算笔数
-	inputData["refd_setl_flag"] = 0                      // 就诊 ID（来自2201接口返回）
+	inputData["refd_setl_flag"] = 0                      //
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入