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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9532
+httpport = 9533
 runmode = prod
 
 
@@ -34,7 +34,7 @@ sms_token = ea475ed8d3de6c54c2b3f9d78db76d1e
 sms_baseUrl = https://open.ucpaas.com/ol/sms/
 ip_max_send_count = 20
 moblie_max_send_count = 5
-sms_verification_code_templateid = 358429
+sms_verification_code_templateid = 358429pu
 
 
 appid = "wx43ad410d9eef426e"
@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10088
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -3580,14 +3580,14 @@ func (c *HisApiController) GetSettleListHospital() {
 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrder(10138)
+	orders, _ := service.GetAllHisOrder(10106)
 	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, 2185)
+		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2495)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
@@ -4312,7 +4312,7 @@ func (c *HisApiController) GetBatchSettleList() {
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     10138,
+					Stage:     10088,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
@@ -4340,7 +4340,7 @@ func (c *HisApiController) GetBatchSettleList() {
 					ErrMsg:    res.ErrMsg + "解析失败",
 					Status:    1,
 					PatientId: order_id,
-					Stage:     10138,
+					Stage:     10106,
 				}
 				service.CreateErrMsgLog(errlog)
 				continue
@@ -4356,7 +4356,7 @@ func (c *HisApiController) GetBatchSettleList() {
 				ErrMsg:    res.ErrMsg,
 				Status:    1,
 				PatientId: order_id,
-				Stage:     10138,
+				Stage:     10106,
 			}
 			service.CreateErrMsgLog(errlog)
 			continue

service/his_service.go

@@ -1399,7 +1399,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 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
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  fa_piao_code <> '' AND med_type = '14' AND setl_time >= '2022-06-01 00:00:00' AND setl_time <= '2022-07-31 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) {