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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10138
+org_id = 10088
 
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -3292,7 +3292,7 @@ func (c *HisApiController) GetSettleListHospital() {
 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrder(10106)
+	orders, _ := service.GetAllHisOrder(10088)
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
@@ -4052,7 +4052,7 @@ func (c *HisApiController) GetBatchSettleList() {
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     10106,
+					Stage:     10088,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
@@ -4068,7 +4068,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     10106,
+				Stage:     10088,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

routers/router.go

@@ -1,6 +1,7 @@
 package routers
 
 import (
+	"gdyb/controllers/hb"
 	"gdyb/controllers/js"
 	"gdyb/controllers/sg"
 	//"gdyb/controllers/sz"
@@ -22,7 +23,7 @@ func init() {
 	}))
 	sg.HisManagerApiRegistRouters()
 	sg.GdybRegistRouters()
-	//hb.HbybRegistRouters()
+	hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
 	//zh.ZHHisManagerApiRegistRouters()
 	js.JSybRegistRouters()

service/fj_service.go

@@ -753,7 +753,6 @@ func FJyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 //  医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams) (string, string) {
-	fmt.Println("11222333-----")
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)

service/his_service.go

@@ -1387,7 +1387,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-03-01 00:00:00'", 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 <> ''", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {