Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_charge_api_controller.go

@@ -453,7 +453,6 @@ func (c *HisChargeApiController) GetPrescriptionStatisticsDetail() {
 
 	date1, _ := time.Parse("2006-01-02", start_time)
 	date2, _ := time.Parse("2006-01-02", end_time)
-
 	// 计算日期间隔
 	duration := date2.Sub(date1)
 
@@ -461,12 +460,10 @@ func (c *HisChargeApiController) GetPrescriptionStatisticsDetail() {
 	oneMonthDuration := 30 * 24 * time.Hour
 
 	if duration <= oneMonthDuration {
-
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorTimeCodeParamWrong)
 		return
 	}
-
 	adminUser := c.GetAdminUserInfo()
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")

controllers/statistics_api_controller.go

@@ -327,25 +327,30 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 			weeks := groupByWeek(dates)
 			//var uniqueFields []map[string]interface{}
 			var uniqueFields []map[string]interface{}
-
+			// 加载中国标准时间（UTC+8）
+			chinaLoc, err := time.LoadLocation("Asia/Shanghai")
+			if err != nil {
+				fmt.Println("加载中国时区出错:", err)
+				return
+			}
 			for _, week := range weeks {
-				// 解析字符串时显式指定时区为 UTC
-				t, err := time.Parse("2006-01-02 15:04:05 -0700 MST", week[0].String())
+				// 解析时间字符串并转换为中国标准时间
+				t, err := time.ParseInLocation("2006-01-02 15:04:05 -0700 MST", week[0].String(), chinaLoc)
 				if err != nil {
 					fmt.Println("解析时间出错:", err)
 					return
 				}
-				// 解析字符串时显式指定时区为 UTC
-				t2, err := time.Parse("2006-01-02 15:04:05 -0700 MST", week[len(week)-1].String())
+
+				t2, err := time.ParseInLocation("2006-01-02 15:04:05 -0700 MST", week[len(week)-1].String(), chinaLoc)
 				if err != nil {
 					fmt.Println("解析时间出错:", err)
 					return
 				}
-				//dynamicFields := make([]map[string]interface{}, 0)
+
+				// 获取数据
 				list, _ := service.GetDialysisStats(t.Unix(), t2.Unix(), mode, c.GetAdminUserInfo().CurrentOrgId, time_way)
-				//fmt.Println(aa)
+
 				var dynamicFields []map[string]interface{}
-				//var uniqueFields []map[string]interface{}
 				for _, result := range list {
 					nb := result["日期"].([]byte)
 					name := string(nb)
@@ -408,10 +413,6 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 					if _, ok := seen[value]; !ok {
 						seen[value] = struct{}{}
 						uniqueFields = append(uniqueFields, field)
-
-						//// 对字段进行排序，有值的排在前面
-						//sortedField := sortFieldsByValue(field)
-						//uniqueFields = append(uniqueFields, sortedField)
 					}
 				}
 			}

models/his_charge_models.go

@@ -94,6 +94,17 @@ func (SettlePatient) TableName() string {
 	return "xt_patients"
 }
 
+type OrderHisPatient struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number    string `gorm:"column:number" json:"number" form:"number"`
+	SickType  int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+}
+
+func (OrderHisPatient) TableName() string {
+	return "his_patient"
+}
+
 type HisChargeOrder struct {
 	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
@@ -196,6 +207,10 @@ type HisChargeSettleOrder struct {
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
 	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+
+	SickName string `gorm:"sick_name" json:"sick_name" form:"sick_name"`
+
+	//OrderHisPatient OrderHisPatient `gorm:"ForeignKey:Number;AssociationForeignKey:MdtrtId" json:"his"`
 }
 
 func (HisChargeSettleOrder) TableName() string {

service/his_deposit_service.go

@@ -445,6 +445,60 @@ func SpendDeposit(orgid, his_user_id, create_id int64, code string, deposit inte
 	return
 }
 
+func SpendDepositTwo(orgid, his_user_id, create_id int64, code string, deposit interface{}, ctime int64) (err error) {
+	tmp_deposit := decimal.Decimal{} //本次患者使用的押金
+	tmp_deposit, err = ToDecimal(deposit)
+	if err != nil {
+		return
+	}
+	////开事务
+	//tx := XTWriteDB().Begin()
+	//defer func() {
+	//	if err != nil {
+	//		utils.ErrorLog("事务失败,原因为: %v", err.Error())
+	//		tx.Rollback()
+	//	} else {
+	//		tx.Commit()
+	//	}
+	//}()
+	//查询患者押金
+	tmp := models.Deposit{}
+	err = readDb.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_user_id, orgid).Find(&tmp).Error
+	if err != nil {
+		err = fmt.Errorf("押金余额不足")
+		return
+	}
+	//判断能否扣除
+	if tmp.Deposit.Cmp(tmp_deposit) == -1 {
+		err = fmt.Errorf("押金余额不足")
+		return
+	}
+	//扣除患者押金
+	err = readDb.Model(&models.Deposit{}).Where("id = ? and status = 1", tmp.ID).Updates(map[string]interface{}{
+		"mtime":   time.Now().Unix(),
+		"deposit": tmp.Deposit.Sub(tmp_deposit),
+	}).Error
+	if err != nil {
+		return
+	}
+	//生成一条历史记录
+	dehistory := models.DepositHistory{
+		UserOrgId:      orgid,
+		HisPatientId:   his_user_id,
+		DepositCode:    code,
+		Deposit:        tmp_deposit,
+		SurplusDeposit: tmp.Deposit.Sub(tmp_deposit),
+		DepositStatus:  2,
+		Status:         1,
+		CreateId:       create_id,
+		Ctime:          ctime,
+		Mtime:          time.Now().Unix(),
+		TrialStatus:    1,
+	}
+	err = readDb.Create(&dehistory).Error
+	return
+}
+
 // 新增一条退款申请
 func RefundApplication(orgid, his_patient_id, trial_status, createid int64, code string, deposit decimal.Decimal) (err error) {
 	//开事务