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

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -691,7 +691,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 					tempPrescription.MedType = med_type
 
 				}
-				service.SaveHisPrescription(tempPrescription)
+				service.SaveHisPrescriptionTwo(tempPrescription)
 
 				//更改患者挂号状态
 				_, err2 := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.Org.Id)
@@ -725,7 +725,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
 								return
 							}
-							service.CreateHisDoctorAdvice(&s)
+							service.CreateHisDoctorAdviceTwo(&s)
 							redis := service.RedisClient()
 							key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 							fmt.Println("key111111111111111111", key)
@@ -741,7 +741,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							tempTime := time.Unix(timestamp, 0)
 							timeFormat := tempTime.Format("20060102150405")
 							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
-							service.CreateHisDoctorAdvice(&s)
+							service.CreateHisDoctorAdviceTwo(&s)
 
 							redis.Set(key, "", time.Second)
 							keyTwo := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
@@ -773,7 +773,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
 								return
 							}
-							service.CreateHisProjectTwo(&p)
+							service.CreateHisProjectThree(&p)
 
 							var randNum int
 							randNum = rand.Intn(10000) + 1000
@@ -781,7 +781,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							tempTime := time.Unix(timestamp, 0)
 							timeFormat := tempTime.Format("20060102150405")
 							p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
-							service.SaveHisProjectTwo(&p)
+							service.CreateHisProjectThree(&p)
 
 							if p.Type == 3 { //处理透前准备耗材数量数据
 								consumables, _ := service.FindHisConsumablesByID(adminInfo.Org.Id, patient_id, recordDateTime, p.ProjectId)

service/his_service.go

@@ -402,9 +402,7 @@ func UpdatePatientCaseHistory(patient_id int64, record_date int64, user_org_id i
 	return err
 }
 
-func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
-	tx := writeDb.Begin()
-
+func SaveHisPrescription(tx *gorm.DB, prescription *models.HisPrescription) (err error) {
 	if err = tx.Model(&models.HisPrescription{}).Save(prescription).Error; err != nil {
 		tx.Rollback()
 		return
@@ -413,6 +411,12 @@ func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
 	return
 }
 
+func SaveHisPrescriptionTwo(prescription *models.HisPrescription) (err error) {
+
+	err = writeDb.Model(&models.HisPrescription{}).Save(prescription).Error
+	return
+}
+
 func DelelteHisPrescription(id int64, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? AND prescription_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
@@ -881,8 +885,17 @@ func GetHisAdminUserDoctors(org_id int64) (doctors []*models.UserAdminRole, err
 	return
 }
 
-func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
+func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
+	if err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
 
+	return
+}
+
+func CreateHisDoctorAdviceTwo(s *models.HisDoctorAdviceInfo) (err error) {
 	tx := writeDb.Begin()
 	if err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error; err != nil {
 		tx.Rollback()
@@ -893,7 +906,17 @@ func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
 	return
 }
 
-func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
+func CreateHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
+	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+
+	return
+}
+
+func CreateHisProjectThree(project *models.HisPrescriptionProject) (err error) {
 	tx := writeDb.Begin()
 	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {
 		tx.Rollback()
@@ -904,8 +927,14 @@ func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
 	return
 }
 
-func SaveHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
-	err = writeDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error
+func SaveHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
+	//err = tx.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error
+	if err = tx.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+
 	return
 }
 
@@ -2593,9 +2622,18 @@ func DeletePrintInfo(id int64) {
 	writeDb.Model(&models.HisLabelPrintInfo{}).Where("p_project_id = ?", id).Updates(map[string]interface{}{"status": 0})
 }
 
-func CreateHisLabelRecord(label *models.HisLabelPrintInfo) error {
-	err := writeDb.Save(&label).Error
-	return err
+func CreateHisLabelRecord(label *models.HisLabelPrintInfo, tx *gorm.DB) (err error) {
+	if err = tx.Save(&label).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+	return
+}
+
+func CreateHisLabelRecordTwo(label *models.HisLabelPrintInfo) (err error) {
+	err = writeDb.Save(&label).Error
+	return
 }
 
 func DeletePsnNCDSRecordById(id int64) (err error) {