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

conf/app.conf

 
 
 [prod]
-org_id = 10088
+org_id = 10138
 
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 #gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #test
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
-#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-#gdyb_paasid = "sz_prd_yjyy"
+gdyb_paasid = "sz_prd_yjyy"
 #肇庆
 #gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"

controllers/sg/his_api_controller.go

 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrder(10088)
+	orders, _ := service.GetAllHisOrder(10138)
 	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, 2273)
+		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2185)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     10088,
+					Stage:     10138,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     10088,
+					Stage:     10138,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     10088,
+				Stage:     10138,
 			}
 			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 <> ''", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND id > 76368  AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' AND med_type = '14'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {