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

controllers/his_api_controller.go

 								var p models.HisPrescriptionProject
 								p.PrescriptionId = tempPrescription.ID
 								p.Ctime = time.Now().Unix()
-								p.Mtime = time.Now().Unix()
+								p.Mtime = p.Ctime
 								p.PatientId = patient_id
 								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
 			return
 		}
 	} else {
+		// 开始主事务
+		db := service.XTWriteDB()
+		tx := db.Begin()
+
+		// 在函数结束时处理事务回滚
+		defer func() {
+			if r := recover(); r != nil {
+				tx.Rollback()
+			}
+		}()
 
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 			hisAdvice, err := service.GetHisDoctorAdvicesById(advice.ID)
 			if err == nil {
 				if hisAdvice.ID > 0 {
-
+					if hisAdvice.YbSyncStatus == 1 {
+						advice.YbSyncStatus = 0
+					}
+					advice.UpdatedTime = time.Now().Unix()
+					advice.CreatedTime = hisAdvice.CreatedTime
 					advice.ExecutionTime = hisAdvice.ExecutionTime
 					advice.ExecutionStaff = hisAdvice.ExecutionStaff
 					advice.ExecutionState = hisAdvice.ExecutionState
 		id := int64(json["id"].(float64))
 		project.ID = id
 		temp_project, _ := service.GetHisPrescriptionProjectByID(id)
-		project.ExecutionStaff = temp_project.ExecutionStaff
-		project.ExecutionState = temp_project.ExecutionState
-		project.ExecutionTime = temp_project.ExecutionTime
-		project.Checker = temp_project.Checker
-		project.CheckState = temp_project.CheckState
-		project.CheckTime = temp_project.CheckTime
-		project.TeamId = temp_project.TeamId
+		if temp_project.ID > 0 {
+			if temp_project.YbSyncStatus == 1 {
+				project.YbSyncStatus = 0
+			}
+			project.ExecutionStaff = temp_project.ExecutionStaff
+			project.ExecutionState = temp_project.ExecutionState
+			project.ExecutionTime = temp_project.ExecutionTime
+			project.Checker = temp_project.Checker
+			project.CheckState = temp_project.CheckState
+			project.CheckTime = temp_project.CheckTime
+			project.TeamId = temp_project.TeamId
+			project.Ctime = temp_project.Ctime
+			project.Mtime = time.Now().Unix()
+
+		}
+
 	}
 	if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
 		types := int64(json["type"].(float64))

models/his_models.go

 	IsMobile              int64                  `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 	IsSelfDrug            int64                  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	DrugWayCount          string                 `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+	YbSyncStatus          int64                  `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
 	HisOrderInfo         HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
 	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	IsOut                int64        `gorm:"column:is_out" json:"is_out" form:"is_out"` //新增字段
-
+	YbSyncStatus         int64        `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
 }
 
 func (HisPrescriptionProject) TableName() string {