历史排班

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10579 //机构id 10344
+		subscibe.OrgId = 10612 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 16919 //4
+		adminUserInfo.CurrentOrgId = 10612 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17282 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10579 //机构id小英10344或4
+		subscibe.OrgId = 10612 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,8 +336,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10579 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 16919 //4
+		adminUserInfo.CurrentOrgId = 10612 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17282 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -370,6 +370,7 @@ func (c *DialysisApiController) PostPrescription() {
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
+	dialyzate := c.GetString("dialyzate")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -492,6 +493,7 @@ func (c *DialysisApiController) PostPrescription() {
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
+		Dialyzate:                  dialyzate,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -1021,6 +1023,7 @@ func (c *DialysisApiController) PostSoulution() {
 	washing_time := c.GetString("washing_time")
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
+	dialyzate := c.GetString("dialyzate")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1193,6 +1196,7 @@ func (c *DialysisApiController) PostSoulution() {
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
+		Dialyzate:                  dialyzate,
 	}
 
 	if prescription.Anticoagulant == 0 {
@@ -1403,6 +1407,7 @@ func (c *DialysisApiController) PostSoulution() {
 		WashingTime:                washing_time,
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
+		Dialyzate:                  dialyzate,
 	}
 
 	if solution.Anticoagulant == 0 {
@@ -2143,6 +2148,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.PipCoagulation = data.PipCoagulation
 	assessment.AccumulatedBloodVolume = data.AccumulatedBloodVolume
 	assessment.TransfusionVolume = data.TransfusionVolume
+	assessment.Condenser = data.Condenser
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {

controllers/dialysis_record_api_controller.go

@@ -900,6 +900,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
 	catheter_operation := this.GetString("catheter_operation")
+	blood_flow_volume := this.GetString("blood_flow_volume")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1140,6 +1141,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
 		CatheterOperation:      catheter_operation,
+		BloodFlowVolume:        blood_flow_volume,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -1427,6 +1429,8 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	catheter := this.GetString("catheter")
 	cruor := this.GetString("cruor")
 	mission := this.GetString("mission")
+	condenser := this.GetString("condenser")
+
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1779,7 +1783,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	}
 
 	//执行下机
-	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
+	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission, condenser)
 	finish := models.XtDialysisFinish{
 		IsFinish:   1,
 		UserOrgId:  adminUserInfo.CurrentOrgId,
@@ -1848,6 +1852,8 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
 	catheter_operation := this.GetString("catheter_operation")
+	blood_flow_volume := this.GetString("blood_flow_volume")
+
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2014,6 +2020,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
 		CatheterOperation:      catheter_operation,
+		BloodFlowVolume:        blood_flow_volume,
 	}
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
@@ -2121,6 +2128,7 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	catheter := c.GetString("catheter")
 	cruor := c.GetString("cruor")
 	mission := c.GetString("mission")
+	condenser := c.GetString("condenser")
 	if record_id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2168,6 +2176,7 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 		Catheter:                   catheter,
 		Cruor:                      cruor,
 		Mission:                    mission,
+		Condenser:                  condenser,
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)

controllers/his_api_controller.go

@@ -1845,16 +1845,11 @@ func (c *HisApiController) CreateHisPrescription() {
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
 
-								fmt.Println("wooooooooooooo", advicelist.ID)
-								fmt.Println("prescribingNumberUnit", prescribingNumberUnit)
-								fmt.Println("prescribingNumberUnit", drug.MinUnit)
-								fmt.Println("prescribingNumberUnit", drug.MaxUnit)
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
 									if prescribingNumberUnit == drug.MinUnit {
-										fmt.Println("prescribing_number", prescribing_number)
-										fmt.Println("all_count", all_count)
+
 										if drug.IsUse != 1 {
 											if drug.IsProject == 0 || drug.IsProject == 2 {
 												if all_count == 0 {
@@ -2312,7 +2307,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															var sum_in_count int64
 															warehouseInfo, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
 															sum_in_count = warehouseInfo.StockMaxNumber*drug.MinNumber + warehouseInfo.StockMinNumber
-															fmt.Println("sum_in_count", sum_in_count)
+
 															//如果修改的数量大于有库存的第一个批次
 															if number_count > sum_in_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(warehouseInfo.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(warehouseInfo.StockMinNumber, 10) + drug.MinUnit)
@@ -10798,25 +10793,12 @@ func (c *HisApiController) GetHisMonthChargePatientInfo() {
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 
-	month_p_info, _ := service.FindPatientPrescriptionInfoTen(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
-
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 
-	var dia string
-	for _, item := range month_p_info {
-		if len(dia) == 0 {
-			dia = item.Diagnosis
-		} else {
-			dia = dia + "," + item.Diagnosis
-		}
-	}
-
-	dia_arr := removeDuplicates(strings.Split(dia, ","))
-	dia_arr = removeEmptyStrings(dia_arr)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":            his_patient_info,
 		"xt_info":             xt_patient_info,
@@ -10828,37 +10810,10 @@ func (c *HisApiController) GetHisMonthChargePatientInfo() {
 		"doctors":             doctors,
 		"department":          department,
 		"settle_total":        settle_total,
-		"dia_arr":             dia_arr,
 	})
 	return
 }
 
-func removeEmptyStrings(input []string) []string {
-	var output []string
-
-	for _, s := range input {
-		if s != "" {
-			output = append(output, s)
-		}
-	}
-
-	return output
-}
-
-func removeDuplicates(input []string) []string {
-	seen := make(map[string]bool)
-	output := []string{}
-
-	for _, s := range input {
-		if _, exists := seen[s]; !exists {
-			seen[s] = true
-			output = append(output, s)
-		}
-	}
-
-	return output
-}
-
 func (c *HisApiController) GetHisMonthPatientInfo() {
 	patient_id, _ := c.GetInt64("patient_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1816,7 +1816,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
-
+	dialyzate := c.GetString("dialyzate")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1981,6 +1981,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
+		Dialyzate:                  dialyzate,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2421,6 +2422,7 @@ func (c *DialysisAPIController) Finish() {
 	catheter := c.GetString("catheter")
 	cruor := c.GetString("cruor")
 	mission := c.GetString("mission")
+	condenser := c.GetString("condenser")
 	if id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2830,7 +2832,7 @@ func (c *DialysisAPIController) Finish() {
 	}
 
 	if dialysisOrder.Stage == 1 {
-		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
+		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission, condenser)
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.Org.Id,
@@ -2860,7 +2862,7 @@ func (c *DialysisAPIController) Finish() {
 
 		//下机完自动消毒,针对长沙南雅
 		if dialysisOrder.Stage == 1 {
-			if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9538 || adminUserInfo.Org.Id == 10121 {
+			if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9538 || adminUserInfo.Org.Id == 10121 || adminUserInfo.Org.Id == 10612 {
 				//根据床位号获取设备型号
 				unitType, _ := service.GetUnitType(dialysisOrder.BedID, dialysisOrder.UserOrgId)
 				//查询使用消毒最后一条消毒记录
@@ -3059,7 +3061,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
 	catheter_operation := this.GetString("catheter_operation")
-
+	blood_flow_volume := this.GetString("blood_flow_volume")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -3279,6 +3281,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
 		CatheterOperation:      catheter_operation,
+		BloodFlowVolume:        blood_flow_volume,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -3713,6 +3716,7 @@ func (c *DialysisAPIController) PostSolution() {
 	warsh_count := c.GetString("warsh_count")
 	blood_access_part_id := c.GetString("blood_access_part_id")
 	anticoagulant_weichi_hour := c.GetString("anticoagulant_weichi_hour")
+	dialyzate := c.GetString("dialyzate")
 	if mode_id > 0 {
 
 		var str string
@@ -3875,6 +3879,7 @@ func (c *DialysisAPIController) PostSolution() {
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
+		Dialyzate:                  dialyzate,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -4003,6 +4008,7 @@ func (c *DialysisAPIController) PostSolution() {
 		WarshCount:                 warsh_count,
 		BloodAccessPartId:          blood_access_part_id,
 		AnticoagulantWeichiHour:    anticoagulant_weichi_hour,
+		Dialyzate:                  dialyzate,
 	}
 
 	//针对河间咸的
@@ -4557,6 +4563,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	order_remark := this.GetString("order_remark")
 	schedule_remark := this.GetString("schedule_remark")
 	catheter_operation := this.GetString("catheter_operation")
+	blood_flow_volume := this.GetString("blood_flow_volume")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4722,6 +4729,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		OrderRemark:            order_remark,
 		ScheduleRemark:         schedule_remark,
 		CatheterOperation:      catheter_operation,
+		BloodFlowVolume:        blood_flow_volume,
 	}
 
 	//修改床位号需要重新消毒
@@ -4846,6 +4854,7 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 	catheter := c.GetString("catheter")
 	cruor := c.GetString("cruor")
 	mission := c.GetString("mission")
+	condenser := c.GetString("condenser")
 	if record_id <= 0 || nurseID <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -4917,6 +4926,7 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 		Catheter:                   catheter,
 		Cruor:                      cruor,
 		Mission:                    mission,
+		Condenser:                  condenser,
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -510,7 +510,7 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 		service.CreateScheduleLog(xtScheduleLog)
 
 		//针对凤凰医院
-		if org_id == 10579 || org_id == 10344 {
+		if org_id == 10579 || org_id == 10344 || org_id == 10206 {
 			advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, org_id)
 			if len(advice) > 0 {
 				service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)

controllers/pharmacy_controller.go

@@ -417,7 +417,7 @@ func (this *PharmacyController) DispensingMedicine() {
 		}
 	}
 
-	if orgid != 10480 {
+	if orgid != 10480 && orgid != 10188 {
 		//发药
 		err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
 		if err != nil {
@@ -432,7 +432,7 @@ func (this *PharmacyController) DispensingMedicine() {
 		return
 	}
 
-	if orgid == 10480 {
+	if orgid == 10480 || orgid == 10188 {
 		//发药逻辑
 
 		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)

controllers/schedule_api_controller.go

@@ -1969,7 +1969,7 @@ func (c *ScheduleApiController) DeleteSchedule() {
 	service.CreateScheduleLog(scheduleLog)
 
 	//针对凤凰医院
-	if adminINfo.CurrentOrgId == 10579 || adminINfo.CurrentOrgId == 10344 {
+	if adminINfo.CurrentOrgId == 10579 || adminINfo.CurrentOrgId == 10344 || adminINfo.CurrentOrgId == 10206 {
 		advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 		if len(advice) > 0 {
 			service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)

controllers/self_drug_api_congtroller.go

@@ -3917,7 +3917,7 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 
 		//获取期末结余
 		endFlow, _ := service.GetDrugEndFlow(item.ID, orgId, endTime)
-		fmt.Println("endFlow2222222222222222", endFlow)
+
 		item.DrugEndFlow = endFlow
 		//获取期初结余入库数量
 		//startDrugInfo, _ := service.GetDrugWarehouseInfoStart(item.ID, orgId, startTime)

controllers/sign_api_controller.go

@@ -665,7 +665,7 @@ func (this *SignApiController) GetEnterPriseDetail() {
 
 func (this *SignApiController) UploadPrintOrder() {
 
-	list, _ := service.GetAllPatientNew(10587)
+	list, _ := service.GetAllPatientNew(10579)
 	for _, item := range list {
 
 		hans := item.Name // 要转换的汉字字符串
@@ -692,7 +692,7 @@ func (this *SignApiController) UploadPrintOrder() {
 		//fmt.Println("First Letter:", firstLetter)
 	}
 
-	//baseList, _ := service.GeteAllBaseList(10567)
+	//baseList, _ := service.GeteAllBaseList(10587)
 	//for _, item := range baseList {
 	//	hans := item.DrugName // 要转换的汉字字符串
 	//	// 创建一个拼音转换器

controllers/stock_in_api_controller.go

@@ -7962,45 +7962,33 @@ func (this *StockManagerApiController) GetStockFlowOrderList() {
 	good_id, _ := this.GetInt64("good_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, _ := service.GetStockFlowOrderList(good_id, orgId)
-	fmt.Println("listowowowow", list)
 	for index, _ := range list {
-		fmt.Println("index", index)
 		if list[index].ConsumableType == 3 || list[index].ConsumableType == 2 || list[index].ConsumableType == 11 || list[index].ConsumableType == 12 || list[index].ConsumableType == 15 {
 			var count int64
+
 			if index == 0 {
 				count = list[index].OverCount - list[index].Count
-				fmt.Println("id", list[index].ID)
-				fmt.Println("woowowow", list[index].OverCount)
-				fmt.Println("wowoowowowoww", list[index].Count)
 				service.UpdateOverCount(list[index+1].ID, count)
 			}
 
 			if index >= 1 {
-				count = list[index-1].OverCount - list[index].Count
-				fmt.Println("id", list[index].ID)
-				fmt.Println("over_count", list[index-1].OverCount)
-				fmt.Println("wowoowowowoww", list[index].Count)
+				lastStockFlow, _ := service.GetLastOverCount(list[index-1].ID)
+				count = lastStockFlow.OverCount - list[index].Count
 				service.UpdateOverCount(list[index].ID, count)
 			}
 
 		}
 		if list[index].ConsumableType == 7 || list[index].ConsumableType == 4 || list[index].ConsumableType == 1 || list[index].ConsumableType == 10 || list[index].ConsumableType == 13 {
-
 			if index == 0 {
 				var count int64
 				count = list[index].OverCount + list[index].Count
-				fmt.Println("id=", list[index].ID)
-				fmt.Println("over_count", list[index].OverCount)
-				fmt.Println("count", list[index].Count)
 				service.UpdateOverCount(list[index+1].ID, count)
 			}
 
 			if index >= 1 {
 				var count int64
-				count = list[index-1].OverCount + list[index].Count
-				fmt.Println("id=", list[index].ID)
-				fmt.Println("over_count", list[index-1].OverCount)
-				fmt.Println("count", list[index].Count)
+				lastStockFlow, _ := service.GetLastOverCount(list[index-1].ID)
+				count = lastStockFlow.OverCount + list[index].Count
 				service.UpdateOverCount(list[index].ID, count)
 			}
 

models/dialysis.go

@@ -656,6 +656,7 @@ type AssessmentAfterDislysis struct {
 	PipCoagulation                  string  `gorm:"column:pip_coagulation" json:"pip_coagulation" form:"pip_coagulation"`
 	AccumulatedBloodVolume          string  `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
 	TransfusionVolume               string  `gorm:"column:transfusion_volume" json:"transfusion_volume" form:"transfusion_volume"`
+	Condenser                       string  `gorm:"column:condenser" json:"condenser" form:"condenser"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
@@ -865,6 +866,8 @@ type DialysisOrder struct {
 	OrderRemark                string        `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
 	DialysisTotal              int64         `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
 	CatheterOperation          string        `gorm:"column:catheter_operation" json:"catheter_operation" form:"catheter_operation"`
+	BloodFlowVolume            string        `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	Condenser                  string        `gorm:"column:condenser" json:"condenser" form:"condenser"`
 }
 
 func (DialysisOrder) TableName() string {

models/patient_models.go

@@ -381,6 +381,7 @@ type DialysisPrescription struct {
 	WashingTime                string        `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 	BloodAccessPartId          string        `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 	AnticoagulantWeichiHour    string        `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
+	Dialyzate                  string        `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -620,6 +621,7 @@ type DialysisSolution struct {
 	WashingTime                string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
 	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
 	AnticoagulantWeichiHour    string  `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
+	Dialyzate                  string  `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
 }
 
 func (DialysisSolution) TableName() string {

service/dialysis_service.go

@@ -559,8 +559,8 @@ func CreateDialysisRecord(id int64, orgId int64, record *models.DialysisOrder) e
 	return nil
 }
 
-func ModifyDialysisRecord(id int64, finishNurse int64, end_time int64, admin_user_id int64, puncture_point_haematoma int64, internal_fistula string, catheter string, cruor string, mission string) error {
-	err := writeDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1 ", id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "stage": 2, "finish_nurse": finishNurse, "end_time": end_time, "finish_creator": admin_user_id, "finish_modifier": admin_user_id, "puncture_point_haematoma": puncture_point_haematoma, "blood_access_internal_fistula": internal_fistula, "catheter": catheter, "cruor": cruor, "mission": mission}).Error
+func ModifyDialysisRecord(id int64, finishNurse int64, end_time int64, admin_user_id int64, puncture_point_haematoma int64, internal_fistula string, catheter string, cruor string, mission string, condenser string) error {
+	err := writeDb.Model(&models.DialysisOrder{}).Where("id = ? AND status = 1 ", id).Updates(map[string]interface{}{"updated_time": time.Now().Unix(), "stage": 2, "finish_nurse": finishNurse, "end_time": end_time, "finish_creator": admin_user_id, "finish_modifier": admin_user_id, "puncture_point_haematoma": puncture_point_haematoma, "blood_access_internal_fistula": internal_fistula, "catheter": catheter, "cruor": cruor, "mission": mission, "condenser": condenser}).Error
 	return err
 
 }

service/mobile_dialysis_service.go

@@ -2241,7 +2241,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation, "blood_flow_volume": order.BloodFlowVolume}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -2253,7 +2253,7 @@ func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 func ModifyFinishDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"finish_nurse": order.FinishNurse, "updated_time": updateTime, "end_time": order.EndTime, "finish_modifier": order.FinishModifier, "puncture_point_haematoma": order.PuncturePointHaematoma, "blood_access_internal_fistula": order.BloodAccessInternalFistula, "catheter": order.Catheter, "cruor": order.Cruor, "mission": order.Mission}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"finish_nurse": order.FinishNurse, "updated_time": updateTime, "end_time": order.EndTime, "finish_modifier": order.FinishModifier, "puncture_point_haematoma": order.PuncturePointHaematoma, "blood_access_internal_fistula": order.BloodAccessInternalFistula, "catheter": order.Catheter, "cruor": order.Cruor, "mission": order.Mission, "condenser": order.Condenser}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/new_warehouse_service.go

@@ -1287,6 +1287,18 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 // 药品自动出库 递归方式
 func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64, unit string) (err error) {
 
+	fmt.Println("出库拉22222222222222222222222222222222222222222222222222222222222222222222")
+	fmt.Println("剩余库存2哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦哦噢噢噢噢", prescribingNumber)
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
 	drugError := models.XtDrugError{
 		UserOrgId:             orgID,
 		DrugId:                advice.DrugId,
@@ -1320,10 +1332,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		deliver_number = count
 
 	}
-
-	fmt.Println("总数量", countone)
-	fmt.Println("单位1", unit)
-	fmt.Println("单位2", drup.MaxUnit)
 	if unit == drup.MaxUnit {
 		deliver_number_one = countone * drup.MinNumber
 
@@ -1407,6 +1415,9 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
+	fmt.Println("药品名称", drup.DrugName)
+	fmt.Println("库存数量我哦我我", stock_number)
+	fmt.Println("出库数量", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -1449,10 +1460,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		warehouse.Mtime = time.Now().Unix()
 
-		//fmt.Println("stockmin", warehouse.StockMinNumber)
-		//fmt.Println("minnubmerr", minNumber)
 		if warehouse.StockMinNumber < minNumber {
-			//fmt.Println("金4")
+
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
@@ -1461,7 +1470,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			}
 		} else {
-			//fmt.Println("金5")
+
 			if minNumber > 0 {
 				if (warehouse.StockMinNumber - minNumber) >= 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
@@ -1470,7 +1479,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			}
 
 			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
-				//fmt.Println("6")
+
 				if warehouse.StockMinNumber > 0 {
 					if warehouse.StockMinNumber-deliver_number >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
@@ -1484,7 +1493,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) >= 0 {
-				//fmt.Println("金7")
+
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}
 
@@ -2060,8 +2069,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			OverCount:               sum_count,
 			AdviceId:                advice.ID,
 		}
-		//查询是否存在出库数据
-		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
+		//查询该药品是否存在出库数据
+		_, errCode := GetSigleDrugWarehouseOutInfoTwo(advice.PatientId, advice.AdviceDate, orgID, advice.DrugId)
 		if errCode == gorm.ErrRecordNotFound {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -2084,7 +2093,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 		if errCode == nil {
 
-			lastDrugOutInfo, _ := GetSigleDrugWarehouseOutInfoOne(advice.PatientId, advice.AdviceDate, orgID)
+			lastDrugOutInfo, _ := GetSigleDrugWarehouseOutInfoTwo(advice.PatientId, advice.AdviceDate, orgID, advice.DrugId)
 			var his_count int64
 			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
 				his_count = lastDrugOutInfo.Count * drup.MinNumber
@@ -2455,6 +2464,20 @@ func GetSigleDrugWarehouseOutInfo(patient_id int64, advice_date int64, orgid int
 	return &info, nil
 }
 
+func GetSigleDrugWarehouseOutInfoTwo(patient_id int64, advice_date int64, orgid int64, drug_id int64) (*models.XtDrugWarehouseOutInfo, error) {
+
+	info := models.XtDrugWarehouseOutInfo{}
+	var err error
+	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and org_id = ? and status = 1 and drug_id = ?", patient_id, advice_date, orgid, drug_id).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
 func GetSigleDrugWarehouseOutInfoOne(patient_id int64, advice_date int64, orgid int64) (models.XtDrugWarehouseOutInfo, error) {
 
 	info := models.XtDrugWarehouseOutInfo{}

service/pharmacy_service.go

@@ -798,6 +798,7 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 	//发药
 	if len(adviceList) > 0 {
 		for _, item := range adviceList {
+
 			//扣减库存
 			err = HisDrugsDelivery(orgid, creater, item)
 			if err != nil {

service/secondary_service.go

@@ -1161,3 +1161,12 @@ func UpdateOverCount(id int64, count int64) (err error) {
 	err = XTWriteDB().Model(models.VmStockFlow{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"over_count": count}).Error
 	return err
 }
+
+func GetLastOverCount(id int64) (models.VmStockFlow, error) {
+
+	stockFlow := models.VmStockFlow{}
+
+	err := XTReadDB().Where("id=? and status=1", id).Find(&stockFlow).Error
+
+	return stockFlow, err
+}

service/self_drug_service.go

@@ -2364,7 +2364,7 @@ func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, end
 	if startime > 0 {
 		db = db.Where("ctime >=?", startime)
 	}
-	if endtime < 0 {
+	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
 	if storehouse_id > 0 {
@@ -2386,7 +2386,7 @@ func FindeEndStokInventoryProfitTwenty(good_id int64, orgid int64, startime int6
 	if startime > 0 {
 		db = db.Where("ctime >=?", startime)
 	}
-	if endtime < 0 {
+	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
 
@@ -2405,7 +2405,7 @@ func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, en
 	if startime > 0 {
 		db = db.Where("ctime >=?", startime)
 	}
-	if endtime < 0 {
+	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
 	if storehouse_id > 0 {
@@ -2426,7 +2426,7 @@ func FindeEndStockInventoryLossesTwenty(good_id int64, orgid int64, startime int
 	if startime > 0 {
 		db = db.Where("ctime >=?", startime)
 	}
-	if endtime < 0 {
+	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
 

service/sign_service.go

@@ -2065,13 +2065,13 @@ func UpdatePatientNew(id int64, firstleterr string) error {
 
 func GeteAllBaseList(user_org_id int64) (list []*models.BaseDrugLib, err error) {
 
-	err = XTWriteDB().Model(&list).Where("user_org_id = ? and status =1", user_org_id).Find(&list).Error
+	err = XTWriteDB().Model(&list).Where("org_id = ? and status =1", user_org_id).Find(&list).Error
 	return list, err
 }
 
 func UpdateBaseList(id int64, firstleterr string) error {
 
-	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status =1", id, firstleterr).Updates(map[string]interface{}{"first_letter": firstleterr}).Error
+	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"first_letter": firstleterr}).Error
 	return err
 }
 

service/warhouse_service.go

@@ -621,22 +621,21 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 
 			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit)
 
-			//查询今日出库的数据
-			if orgID == 10188 || orgID == 10217 || orgID == 10344 {
-				//查询这个患者今日用过的总数量
-				listDrugFlow, _ := GetDrugFlowByWatch(advice.PatientId, advice.DrugId, advice.AdviceDate, advice.UserOrgId)
-				fmt.Println("000000000000000000000000000000000000000", listDrugFlow)
-				for _, item := range listDrugFlow {
-
-					outInfor, _ := GetDrugWarehouseOutInfor(item.WarehouseOutDetailId, item.UserOrgId)
-					if item.MaxUnit == outInfor.CountUnit {
-						if item.Count != outInfor.Count {
-							UpdateDrugWarehouseOutInfoById(outInfor.ID, item.Count)
-						}
-					}
-
-				}
-			}
+			////查询今日出库的数据
+			//if orgID == 10188 || orgID == 10217 || orgID == 10344 {
+			//	//查询这个患者今日用过的总数量
+			//	listDrugFlow, _ := GetDrugFlowByWatch(advice.PatientId, advice.DrugId, advice.AdviceDate, advice.UserOrgId)
+			//	for _, item := range listDrugFlow {
+			//
+			//		outInfor, _ := GetDrugWarehouseOutInfor(item.WarehouseOutDetailId, item.UserOrgId)
+			//		if item.MaxUnit == outInfor.CountUnit {
+			//			if item.Count != outInfor.Count {
+			//				UpdateDrugWarehouseOutInfoById(outInfor.ID, item.Count)
+			//			}
+			//		}
+			//
+			//	}
+			//}
 
 		} else {
 			return errors.New("药品信息不存在")