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

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10677 //机构id
+		subscibe.OrgId = 10164 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10677 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10677 //机构id小英9675或4
+		subscibe.OrgId = 10164 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10677 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/his_api_controller.go

 										//fmt.Println("药品名称----------------------", drug.IsUse)
 										//fmt.Println("is_user_total-------------------------", is_user_total)
 										//fmt.Println("no_user_total-------------------------", no_user_total)
+										//fmt.Println("drug.IsUse---------------", drug.IsUse)
+										//fmt.Println("00000000000000000000", s.UserOrgId)
 
 										if is_user_total != no_user_total {
 											//出库
+											//针对御享天源
+											if drug.IsUse == 1 && s.UserOrgId == 10635 {
+
+												creater := adminInfo.AdminUser.Id
+												newadviceInfo := &models.HisDoctorAdviceInfo{
+													ID:                    s.ID,
+													UserOrgId:             s.UserOrgId,
+													PatientId:             s.PatientId,
+													HisPatientId:          s.HisPatientId,
+													AdviceType:            s.AdviceType,
+													AdviceDate:            s.AdviceDate,
+													StartTime:             s.StartTime,
+													AdviceName:            s.AdviceName,
+													AdviceDesc:            s.AdviceDesc,
+													ReminderDate:          s.ReminderDate,
+													SingleDose:            s.SingleDose,
+													SingleDoseUnit:        s.SingleDoseUnit,
+													PrescribingNumber:     s.PrescribingNumber,
+													PrescribingNumberUnit: s.PrescribingNumberUnit,
+													DeliveryWay:           s.DeliveryWay,
+													ExecutionFrequency:    s.ExecutionFrequency,
+													AdviceDoctor:          s.AdviceDoctor,
+													Status:                s.Status,
+													CreatedTime:           s.CreatedTime,
+													UpdatedTime:           s.UpdatedTime,
+													AdviceAffirm:          s.AdviceAffirm,
+													Remark:                s.Remark,
+													StopTime:              s.StopTime,
+													StopReason:            s.StopReason,
+													StopDoctor:            s.StopDoctor,
+													StopState:             s.StopState,
+													ParentId:              s.ParentId,
+													ExecutionTime:         s.ExecutionTime,
+													ExecutionStaff:        s.ExecutionStaff,
+													ExecutionState:        s.ExecutionState,
+													Checker:               s.Checker,
+													RecordDate:            s.RecordDate,
+													DialysisOrderId:       s.DialysisOrderId,
+													CheckTime:             s.CheckTime,
+													CheckState:            s.CheckState,
+													DrugSpec:              s.DrugSpec,
+													DrugSpecUnit:          s.DrugSpecUnit,
+													Groupno:               s.Groupno,
+													RemindType:            s.RemindType,
+													FrequencyType:         s.FrequencyType,
+													DayCount:              s.DayCount,
+													WeekDay:               s.WeekDay,
+													TemplateId:            s.TemplateId,
+													Modifier:              s.Modifier,
+													DrugId:                s.DrugId,
+													Price:                 s.Price,
+													PrescriptionId:        s.PrescriptionId,
+													MedListCodg:           s.MedListCodg,
+													FeedetlSn:             s.FeedetlSn,
+													Day:                   s.DayCount,
+													ChildDoctorAdvice:     nil,
+													Drug:                  models.Drug{},
+													Diagnosis:             s.Diagnosis,
+													Way:                   s.Way,
+													HospApprFlag:          s.HospApprFlag,
+													LmtUsedFlag:           s.LmtUsedFlag,
+													HisOrderInfo:          models.HisOrderInfo{},
+													IsMedicine:            s.IsMedicine,
+													ExecutionFrequencyId:  s.ExecutionFrequencyId,
+													Child:                 nil,
+													IsSettle:              s.IsSettle,
+													IsMobile:              s.IsMobile,
+													IsSelfDrug:            s.IsSelfDrug,
+													DrugWayCount:          s.DrugWayCount,
+												}
+
+												var history_count int64
+												var local_count int64
+												//查找已经开过的医嘱信息
+												adviceHistory, _ := service.GetHistory(s.ID, s.UserOrgId, tx)
+
+												if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+													prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+
+													local_count += prescribingNumberSevenTy * drug.MinNumber
+												}
+
+												if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+													prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													local_count += prescribingNumberSevenTy
+												}
+
+												if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+													prescribingNumberTenty := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													local_count += prescribingNumberSevenTy
+												}
+
+												if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+													prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+
+													history_count += prescribingNumberSevenTy * drug.MinNumber
+												}
+
+												if adviceHistory.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+													prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													history_count += prescribingNumberSevenTy
+												}
+
+												if adviceHistory.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+													prescribingNumberTenty := strconv.FormatFloat(adviceHistory.PrescribingNumber, 'f', -1, 64)
+													prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+													history_count += prescribingNumberSevenTy
+												}
+
+												fmt.Println("local_count---------------", local_count)
+												fmt.Println("history_count---------------", history_count)
+
+												//如果当前出库数量大于历史出库数量则需要出库
+												if local_count > history_count {
+													//按最小单位出库
+													var cha_count = local_count - history_count
+
+													newadviceInfo.PrescribingNumber = float64(cha_count)
+													newadviceInfo.PrescribingNumberUnit = drug.MinUnit
+
+													service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
+												}
+
+												//如果当前出库数量小于历史出库数量则需要退库
+												if local_count < history_count {
+
+													var cha_count = history_count - local_count
+
+													service.NewHisDrugCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+
+													service.NewHisDrugAutoCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+												}
+
+												if local_count == history_count {
+													if is_user_total == 0 {
+														service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
+													}
+
+												}
+											}
+
 											if drug.IsUse == 2 {
+
 												creater := adminInfo.AdminUser.Id
 												newadviceInfo := &models.HisDoctorAdviceInfo{
 													ID:                    s.ID,
 													history_count += prescribingNumberSevenTy
 												}
 
+												fmt.Println("local_count---------------", local_count)
+												fmt.Println("history_count---------------", history_count)
+
 												//如果当前出库数量大于历史出库数量则需要出库
 												if local_count > history_count {
 													//按最小单位出库

controllers/patient_api_controller.go

 		PatientAddress:               patient.PatientAddress,
 		PrintDate:                    patient.PrintDate,
 		FamalityRecord:               patient.FamalityRecord,
+		OrgLogo:                      patient.OrgLogo,
 	}
 	patientsNew.FirstLetter = firstLetter
 
 		PatientAddress:            patient.PatientAddress,
 		PrintDate:                 patient.PrintDate,
 		FamalityRecord:            patient.FamalityRecord,
+		OrgLogo:                   patient.OrgLogo,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
 		patient_type := int64(patientBody["patient_type"].(float64))
 		patient.PatientType = patient_type
 	}
+
+	if patientBody["org_logo"] != nil && reflect.TypeOf(patientBody["org_logo"]).String() == "string" {
+		org_logo := patientBody["org_logo"].(string)
+		patient.OrgLogo = org_logo
+	}
 	return
 
 }

controllers/stock_in_api_controller.go

 			"list": "list",
 		})
 	}
+	return
 }
 
 func (this *StockManagerApiController) ReturnCheckWarehouseInfo() {

models/patient_models.go

 	PrintDate                int64   `gorm:"column:print_date" json:"print_date" form:"print_date"`
 	FamalityRecord           string  `gorm:"column:famality_record" json:"famality_record" form:"famality_record"`
 	InsuplcAdmdvs            string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	OrgLogo                  string  `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
 }
 
 func (Patients) TableName() string {
 	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	PrintDate                    int64   `gorm:"column:print_date" json:"print_date" form:"print_date"`
 	FamalityRecord               string  `gorm:"column:famality_record" json:"famality_record" form:"famality_record"`
+	OrgLogo                      string  `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
 }
 
 func (XtPatientsNew) TableName() string {

service/new_stock_service.go

 func GetNewGoodStockCount(user_org_id int64, storehouse_id int64, good_id int64, tx *gorm.DB) (*models.XtGoodStockCount, error) {
 
 	goodStock := models.XtGoodStockCount{}
-	var err error
-	err = tx.Where("user_org_id = ? and storehouse_id = ? and good_id = ?", user_org_id, storehouse_id, good_id).Find(&goodStock).Error
-	if err == gorm.ErrRecordNotFound {
+	err := tx.Where("user_org_id = ? and storehouse_id = ? and good_id = ?", user_org_id, storehouse_id, good_id).Find(&goodStock).Error
+	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()
 			return nil, err
 		}
 
 	}
-	if err != nil {
-		return nil, err
-	}
 	return &goodStock, nil
 }
 
 	err = tx.Where("org_id = ? and storehouse_id = ? and good_id = ? and status =1  and is_check = 1", orgid, storehouse_id, good_id).Find(&info).Error
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
+			tx.Rollback()
 			return info, err
 		}
 	}

service/patient_service.go

 
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
-	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime, "patient_end_time": patientsNew.PatientEndTime, "infectious_remark": patientsNew.InfectiousRemark, "allergic_history": patientsNew.AllergicHistory, "patient_address": patientsNew.PatientAddress, "print_date": patientsNew.PrintDate, "patient_type:": patientsNew.PatientType}).Error
+	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime, "patient_end_time": patientsNew.PatientEndTime, "infectious_remark": patientsNew.InfectiousRemark, "allergic_history": patientsNew.AllergicHistory, "patient_address": patientsNew.PatientAddress, "print_date": patientsNew.PrintDate, "org_logo": patientsNew.OrgLogo, "patient_type": patientsNew.PatientType}).Error
 	return err
 }
 

service/stock_service.go

 func UpdateNewGoodInfoAddSumCount(goodid int64, sum_count int64, orgid int64, sum_in_count int64, tx *gorm.DB) error {
 
 	err := tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
 
 	err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
 

service/warhouse_service.go

 	err := tx.Where("id=? and status = 1", id).Find(&out).Error
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
+			tx.Rollback()
 			return out, err
 		}
 	}