2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9478 //机构id
+		subscibe.OrgId = 10164 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9478 //机构id小英9675或4
+		subscibe.OrgId = 10164 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18470 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -12065,7 +12065,7 @@ func (c *DialysisAPIController) SaveLongMobileAdvice() {
 		StopTime:              0,
 		StopReason:            "",
 		StopDoctor:            0,
-		StopState:             0,
+		StopState:             2,
 		ParentId:              0,
 		ExecutionTime:         0,
 		ExecutionStaff:        0,

models/stock_models.go

@@ -123,6 +123,7 @@ type StWarehousingInfoOne struct {
 	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	OrgId            int64   `gorm:"column:org_id" json:"org_id"`
 	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	PackingPrice     float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 }
 
 func (StWarehousingInfoOne) TableName() string {

service/export_data_service.go

@@ -224,8 +224,8 @@ func GetHisOrderBy10726Detail(start_time string, end_time string) ([]Results, er
 		psn_cash_pay AS 现金支付
 	`).Where("user_org_id = ?", 10726).
 		Where("order_status = ?", 2).
-		Where("setl_time >= ?", start_time).
-		Where("setl_time <= ?", end_time).
+		Where("setl_time >= ?", start_time+" 00:00:00").
+		Where("setl_time <= ?", end_time+" 23:59:59").
 		Where("is_medicine_insurance = ?", 1).
 		Where("status = ?", 1).
 		Scan(&result)
@@ -255,7 +255,7 @@ func GetHisOrderBy10726Summary(start_time string, end_time string) ([]SummaryRes
 			SUM(psn_cash_pay) AS 现金支付
 		`).
 		Where("user_org_id = ? AND order_status = ? AND setl_time >= ? AND setl_time <= ? AND is_medicine_insurance = ? AND status = ?",
-			10726, 2, start_time, end_time, 1, 1).
+			10726, 2, start_time+" 00:00:00", end_time+" 23:59:59", 1, 1).
 		Group("insutype").
 		Scan(&result).Error
 	return result, err