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

conf/app.conf

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

controllers/sg/his_api_controller.go

@@ -2420,7 +2420,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg + "解析失败",
 				Status:    1,
 				PatientId: order_id,
-				Stage:     120,
+				Stage:     1000,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
@@ -2435,7 +2435,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     200,
+				Stage:     1000,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue
@@ -8343,7 +8343,7 @@ func (c *HisApiController) GetSettleAccounts() {
 			laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
 
-		if item.MedChrgitmType == "05" { //治疗费
+		if item.MedChrgitmType == "05" || item.MedChrgitmType == "05" || item.MedChrgitmType == "05" { //治疗费
 			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()

service/gdyb_service.go

@@ -2842,7 +2842,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	if org_id == 10106 || org_id == 10215 {
+	if org_id == 10106 || org_id == 10215 || org_id == 10138 {
 		inputMessage["infno"] = "4101A" // 交易编码
 
 	} else {

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 <> '' ", 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-08-15 00:00:00' AND setl_time <= '2022-03-30 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {