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

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

controllers/dialysis_api_controller.go

@@ -2149,6 +2149,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.AccumulatedBloodVolume = data.AccumulatedBloodVolume
 	assessment.TransfusionVolume = data.TransfusionVolume
 	assessment.Condenser = data.Condenser
+	assessment.LastAfterWeight = data.LastAfterWeight
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {

controllers/doctor_schedule_api_controller.go

@@ -38,6 +38,8 @@ func DoctorScheduleRouters() {
 	beego.Router("/api/schedule/changeoption", &DoctorScheduleApiController{}, "Get:ChangeOption")
 	beego.Router("/api/schedule/getchartlist", &DoctorScheduleApiController{}, "Get:GetChartlist")
 
+	beego.Router("/api/deletestaffschedulebyid", &DoctorScheduleApiController{}, "Get:DeleteStaffScheduleById")
+
 }
 
 func (this *DoctorScheduleApiController) SaveDoctorSchedules() {
@@ -335,9 +337,7 @@ func (this *DoctorScheduleApiController) AddSchedule() {
 func (this *DoctorScheduleApiController) GetStaffScheduleList() {
 
 	start_time, _ := this.GetInt64("start_time")
-	fmt.Println("start_time", start_time)
 	end_time, _ := this.GetInt64("end_time")
-	fmt.Println("end_time", end_time)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
 	if err != nil {
@@ -656,3 +656,13 @@ func (this *DoctorScheduleApiController) GetChartlist() {
 		"workDaylist": workDaylist,
 	})
 }
+
+func (this *DoctorScheduleApiController) DeleteStaffScheduleById() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	service.DeleteStaffScheduleById(id, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

controllers/his_api_controller.go

@@ -1941,11 +1941,16 @@ 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 {
@@ -2403,7 +2408,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)
@@ -9184,7 +9189,7 @@ func (c *HisApiController) GetFaPiaoData() {
 		"name":                                order.PsnName,            //姓名
 		"gender":                              patient.Gender,           //性别
 		"psn_cash_money":                      order.PsnCashPay,         //个人支付
-		"pay_way":                             "门诊",                     //结算方式
+		"pay_way":                             "门诊",                   //结算方式
 		"medfee_sumamt":                       order.MedfeeSumamt,       //总费用
 		"admin_user_name":                     admin.UserName,           //收款员
 		"order":                               order,
@@ -10889,12 +10894,25 @@ 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,
@@ -10906,10 +10924,37 @@ 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/inspection_api_controller.go

@@ -152,17 +152,17 @@ func (c *InspectionApiController) PatientInspectionReference() {
 	referenceMap := make(map[string]*models.InspectionReferenceMap, 0)
 
 	for _, reference := range references {
-		if _, exist := referenceMap[reference.Project]; !exist {
-			referenceMap[reference.Project] = new(models.InspectionReferenceMap)
-			referenceMap[reference.Project].Project = reference.Project
-			referenceMap[reference.Project].ProjectId = reference.ProjectId
-			referenceMap[reference.Project].ProjectName = reference.ProjectName
+		if _, exist := referenceMap[reference.ProjectName]; !exist {
+			referenceMap[reference.ProjectName] = new(models.InspectionReferenceMap)
+			referenceMap[reference.ProjectName].Project = reference.Project
+			referenceMap[reference.ProjectName].ProjectId = reference.ProjectId
+			referenceMap[reference.ProjectName].ProjectName = reference.ProjectName
 			if _, cexit := countsMap[reference.ProjectId]; cexit {
-				referenceMap[reference.Project].Count = countsMap[reference.ProjectId]
+				referenceMap[reference.ProjectName].Count = countsMap[reference.ProjectId]
 			}
-			referenceMap[reference.Project].InspectionReference = make([]models.InspectionReference, 0)
+			referenceMap[reference.ProjectName].InspectionReference = make([]models.InspectionReference, 0)
 		}
-		referenceMap[reference.Project].InspectionReference = append(referenceMap[reference.Project].InspectionReference, *reference)
+		referenceMap[reference.ProjectName].InspectionReference = append(referenceMap[reference.ProjectName].InspectionReference, *reference)
 
 	}
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -545,8 +545,21 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
 					newprescribe.Remark = lastDialysisPrescription.Remark
 				}
-				err := service.AddSigleRecord(&newprescribe)
-
+				//err := service.AddSigleRecord(&newprescribe)
+				var err error
+				if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10599 {
+					prescriptionTwenty, _ := service.GetLastDialysisPrescriptionTwenty(newprescribe.PatientId, newprescribe.RecordDate, newprescribe.UserOrgId)
+					if prescriptionTwenty.ID == 0 {
+						//插入透析处方
+						service.AddSigleRecord(&newprescribe)
+					} else {
+						//插入透析处方
+						service.UpdateAddSigleRecord(prescriptionTwenty.ID, newprescribe.TargetUltrafiltration)
+					}
+				} else {
+					//插入透析处方
+					err = service.AddSigleRecord(&newprescribe)
+				}
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
@@ -1193,23 +1206,25 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	// 获取当前或者下次排班信息
 	var sc map[string]interface{}
 	sc = make(map[string]interface{})
+	var mode_id int64
 	if dialysistype == 1 {
 		daySchedule, _ := service.GetPatientScheduleFormDay(adminUserInfo.Org.Id, startTime, endTime, id)
+		println(daySchedule[0].Schedule.ModeId)
 		if len(daySchedule) <= 0 {
 			sc["code"] = 1
 			sc["msg"] = "抱歉，您今天没有排版！"
-			sc["mode"] = 0
+			mode_id = 0
 			sc["data"] = daySchedule
 		} else {
 			if daySchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				sc["mode"] = daySchedule[0].Schedule.ModeId
+				mode_id = daySchedule[0].Schedule.ModeId
 				sc["data"] = daySchedule
 			} else {
 				sc["code"] = 1
 				sc["msg"] = "抱歉，您今天没有排版！"
-				sc["mode"] = 0
+				mode_id = 0
 				sc["data"] = daySchedule
 			}
 		}
@@ -1226,62 +1241,81 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		if len(nextSchedule) <= 0 {
 			sc["code"] = 1
 			sc["msg"] = "抱歉，您后续没有排版！"
-			sc["mode"] = 0
+			mode_id = 0
 			sc["data"] = nextSchedule
 		} else {
 			if nextSchedule[0].Schedule.ID > 0 {
 				sc["code"] = 0
 				sc["msg"] = ""
-				sc["mode"] = nextSchedule[0].Schedule.ModeId
+				mode_id = nextSchedule[0].Schedule.ModeId
 				sc["data"] = nextSchedule
 			} else {
 				sc["code"] = 1
 				sc["msg"] = "抱歉，您后续没有排版！"
-				sc["mode"] = 0
+				mode_id = 0
 				sc["data"] = nextSchedule
 			}
 		}
 	}
 
-	switch sc["mode"] {
+	switch mode_id {
 	case 1:
 		sc["mode"] = "HD"
+		break
 	case 2:
 		sc["mode"] = "HDF"
+		break
 	case 3:
 		sc["mode"] = "HD+HP"
+		break
 	case 4:
 		sc["mode"] = "HP"
+		break
 	case 5:
 		sc["mode"] = "HF"
+		break
 	case 6:
 		sc["mode"] = "SCUF"
+		break
 	case 7:
 		sc["mode"] = "IUF"
+		break
 	case 8:
 		sc["mode"] = "HFHD"
+		break
 	case 9:
 		sc["mode"] = "HFHD+HP"
+		break
 	case 10:
 		sc["mode"] = "PHF"
+		break
 	case 11:
 		sc["mode"] = "HFR"
+		break
 	case 12:
 		sc["mode"] = "HDF+HP"
+		break
 	case 13:
 		sc["mode"] = "CRRT"
+		break
 	case 14:
 		sc["mode"] = "腹水回输"
+		break
 	case 15:
 		sc["mode"] = "HD前置换"
+		break
 	case 16:
 		sc["mode"] = "HD后置换"
+		break
 	case 17:
 		sc["mode"] = "HDF前置换"
+		break
 	case 18:
 		sc["mode"] = "HDF后置换"
+		break
 	default:
 		sc["mode"] = "HD"
+		break
 	}
 
 	// 获取患者透前干体重或者获取患者透前体重

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -602,6 +602,10 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	lastDialysisPrescription, _ := service.GetLastDialysisPrescription(patientID, adminInfo.Org.Id)
+
+	lastAssesmentBeforDialysis, _ := service.GetLastAssessmentBeforDialysis(patientID, adminInfo.Org.Id)
+
+	dryWeightList, _ := service.GetPatientDryList(patientID, adminInfo.Org.Id)
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -637,6 +641,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"lastOrder":                      lastOrder,
 		"remind_lists":                   remind_lists,
 		"lastDialysisPrescription":       lastDialysisPrescription,
+		"lastAssesmentBeforDialysis":     lastAssesmentBeforDialysis,
+		"dryWeightList":                  dryWeightList,
 	}
 
 	this.ServeSuccessJSON(returnData)
@@ -1390,7 +1396,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	pip_coagulation := c.GetString("pip_coagulation")
 	accumulated_blood_volume := c.GetString("accumulated_blood_volume")
 	transfusion_volume := c.GetString("transfusion_volume")
-
+	last_after_weight := c.GetString("last_after_weight")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1499,6 +1505,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		PipCoagulation:               pip_coagulation,
 		AccumulatedBloodVolume:       accumulated_blood_volume,
 		TransfusionVolume:            transfusion_volume,
+		LastAfterWeight:              last_after_weight,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -8300,7 +8307,7 @@ func (c *DialysisAPIController) GetPatientDialysisRecordList() {
 	//	})
 	//	return
 	//}
-	if org_id == 9538 || org_id == 10101 {
+	if org_id == 9538 || org_id == 10101 || org_id == 10353 {
 		list, _ := service.GetPatientDialysisRecordList(id, startdateunix, enddateunix)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list": list,
@@ -10473,3 +10480,12 @@ func (c *DialysisAPIController) GetAdviceListNoExecution() {
 	})
 
 }
+
+func (c *DialysisAPIController) GetLastAcceptRecrods() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	recrods, _ := service.GetLastAcceptRecrods(patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"recrods": recrods,
+	})
+}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -684,7 +684,7 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 			}
 
 			service.CreateScheduleLog(scheduleLog)
-
+			service.UpdateRepeatSchStatus(adminUserInfo.Org.Id, scheduleDate.Unix())
 			redis := service.RedisClient()
 			timeStr := time.Now().Format("2006-01-02")
 			key := "scheduals_" + timeStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
@@ -763,9 +763,9 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 						AdminUserId: adminUserInfo.AdminUser.Id,
 					}
 					service.CreateScheduleLog(scheduleLog)
+					service.UpdateRepeatSchStatus(adminUserInfo.Org.Id, scheduleDate.Unix())
 
 					redis := service.RedisClient()
-
 					timeStr := time.Now().Format("2006-01-02")
 					key := "scheduals_" + timeStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 					redis.Set(key, "", time.Second)

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -206,4 +206,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/getadvicelistnoexecution", &DialysisAPIController{}, "Get:GetAdviceListNoExecution")
 
+	beego.Router("/m/api/getlastacceptrecrods", &DialysisAPIController{}, "Get:GetLastAcceptRecrods")
+
 }

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -932,6 +932,7 @@ func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
 
 	redis := service.RedisClient()
 	err = service.CreateScheduleTwo(&schedule)
+	service.UpdateRepeatSchStatus(adminUserInfo.Org.Id, schedule.ScheduleDate)
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 	redis.Set(key, "", time.Second)
 	defer redis.Close()
@@ -1205,7 +1206,7 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 			Module:      4,
 			AdminUserId: c.GetMobileAdminUserInfo().AdminUser.Id,
 		}
-
+		service.UpdateRepeatSchStatus(org_id, schedule_date)
 		service.CreateScheduleLog(scheduleLog)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -1246,6 +1247,7 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 		}
 		var err error
 		err = service.CreateSchedule(&xtSchedule, id)
+		service.UpdateRepeatSchStatus(org_id, schedule_date)
 		//记录日志
 		byterequest, _ := json.Marshal(schedule)
 		scheduleLog := models.XtScheduleLog{

controllers/self_drug_api_congtroller.go

@@ -115,6 +115,13 @@ func SelfDrugRouters() {
 	beego.Router("/api/stock/getdrugovercount", &SelfDrugApiController{}, "Get:GetDrugOverCount")
 
 	beego.Router("/api/stock/getdruginfolist", &SelfDrugApiController{}, "Get:GetDrugInventoryWarehouseInfoList")
+
+	beego.Router("/api/drug/getdrugflowdetailbyid", &SelfDrugApiController{}, "Get:GetDrugFlowDetailById")
+
+	//康允新版本
+	beego.Router("/api/stock/getpurchaseDrugQueryList", &SelfDrugApiController{}, "Get:GetPurchaseDrugQueryList")
+
+	beego.Router("/api/stock/getpurchasestockquerylist", &SelfDrugApiController{}, "Get:GetPurchaseStockQueryList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -4091,3 +4098,280 @@ func (this *SelfDrugApiController) GetInventoryDetailPrintList() {
 		"inventoryList": inventoryList,
 	})
 }
+
+func (this *SelfDrugApiController) GetDrugFlowDetailById() {
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	list, _ := service.GetDrugFlowDetailById(drug_id)
+
+	drugMedical, _ := service.GetBaseDrugMedical(drug_id)
+
+	for index, _ := range list {
+		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 list[index].MaxUnit == drugMedical.MaxUnit && list[index].MaxUnit != list[index].MinUnit {
+				list[index].Count = list[index].Count * drugMedical.MinNumber
+			}
+
+			if index == 0 {
+				count = list[index].FlushOverCount - list[index].Count
+				service.UpdateDrugOverCount(list[index+1].ID, count)
+			}
+
+			if index >= 1 {
+				lastStockFlow, _ := service.GetLastDrugOverCount(list[index-1].ID)
+				count = lastStockFlow.FlushOverCount - list[index].Count
+				service.UpdateDrugOverCount(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 list[index].MaxUnit == drugMedical.MaxUnit && list[index].MaxUnit != list[index].MinUnit {
+				list[index].Count = list[index].Count * drugMedical.MinNumber
+			}
+			if index == 0 {
+				var count int64
+				count = list[index].OverCount + list[index].Count
+				service.UpdateDrugOverCount(list[index+1].ID, count)
+			}
+
+			if index >= 1 {
+				var count int64
+				lastStockFlow, _ := service.GetLastDrugOverCount(list[index-1].ID)
+				count = lastStockFlow.FlushOverCount + list[index].Count
+				service.UpdateDrugOverCount(list[index].ID, count)
+			}
+
+		}
+
+	}
+}
+
+func (this *SelfDrugApiController) GetPurchaseDrugQueryList() {
+
+	good_type, _ := this.GetInt64("good_type")
+
+	keyword := this.GetString("keyword")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTime int64
+
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	var ids []int64
+	var infoIds []int64
+
+	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	for _, it := range manufacturers {
+		ids = append(ids, it.ID)
+	}
+	infoList, _ := service.GetDrugWarehouseInfoByOrgIdTwo(orgId)
+	for _, it := range infoList {
+		infoIds = append(infoIds, it.DrugId)
+	}
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	list, total, err := service.GetDrugNewPurchaseStockQueryList(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
+
+	for _, item := range list {
+
+		//获取期初结余
+		flow, _ := service.GetDrugStartFlow(item.ID, orgId, startTime)
+
+		item.DrugStatFlow = flow
+
+		//获取期末结余
+		endFlow, _ := service.GetDrugEndFlow(item.ID, orgId, endTime)
+
+		item.DrugEndFlow = endFlow
+		//获取期初结余入库数量
+
+		//期中增加
+		drugWarehouse, _ := service.GetDrugWarehouseStartEnd(item.ID, orgId, startTime, endTime)
+		for _, it := range drugWarehouse {
+			item.DrugWarehouseInfoStartEnd = append(item.DrugWarehouseInfoStartEnd, it)
+		}
+
+		//期中减少
+		outInfo, _ := service.FindeDrugWarehouseOutInfo(item.ID, item.OrgId, startTime, endTime)
+		for _, it := range outInfo {
+			item.DrugWarehouseOutInfoStartEnd = append(item.DrugWarehouseOutInfoStartEnd, it)
+		}
+
+		//期中退库
+		cancelstartInfo, _ := service.FindStartEndDrugWarehouseOutInfo(item.ID, item.OrgId, startTime, endTime)
+		for _, it := range cancelstartInfo {
+			item.WareStartEndStockCancelInfo = append(item.WareStartEndStockCancelInfo, it)
+		}
+
+		//获取期中盘盈
+		profit, _ := service.GetDrugFlowStartEndProfit(item.ID, orgId, startTime, endTime)
+		for _, it := range profit {
+			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+		}
+
+		//获取期中盘亏
+		endLosses, _ := service.GetDrugFlowStartEndLosses(item.ID, orgId, startTime, endTime)
+		for _, it := range endLosses {
+			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+		}
+	}
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+		"drugTypeList":     drugTypeList,
+	})
+}
+
+func (this *SelfDrugApiController) GetPurchaseStockQueryList() {
+
+	good_type, _ := this.GetInt64("good_type")
+
+	keyword := this.GetString("keyword")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	var ids []int64
+	var goodIds []int64
+	infoList, _ := service.GetGoodWarehouseInfoByOrgIdTwo(orgId)
+	for _, it := range infoList {
+		goodIds = append(goodIds, it.GoodId)
+	}
+
+	manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
+	for _, it := range manufacturers {
+		ids = append(ids, it.ID)
+	}
+	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
+
+	list, total, err := service.GetPurchaseStockQueryList(good_type, keyword, page, limit, orgId, ids, goodIds)
+	storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	for _, item := range list {
+
+		//获取期初结余
+		low, _ := service.GetStartLastFLow(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
+
+		item.GoodStartFlowInfo = low
+
+		//获取期末结余
+		flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime, storeConfig.StorehouseOutInfo)
+
+		item.GoodEndFlowInfo = flow
+
+		//获取期间增加
+		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
+		for _, it := range goodWarehouseInfoList {
+			item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
+		}
+
+		//获取本期增加
+		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
+		for _, it := range WarehouseInfoFlowList {
+			item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
+		}
+		//获取本期减少
+		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+		for _, it := range reduceWarehouseInfoList {
+			item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
+		}
+
+		//获取期中减少退库
+		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+		for _, it := range lowInfo {
+			item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+		}
+		//
+		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
+		for _, it := range outInfo {
+			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+		}
+
+		//期中盘盈
+		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+		for _, it := range profit {
+			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+		}
+		//期中盘亏
+		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+		for _, it := range losses {
+			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+		}
+	}
+
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"total":            total,
+	})
+
+}

models/dialysis.go

@@ -657,6 +657,7 @@ type AssessmentAfterDislysis struct {
 	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"`
+	LastAfterWeight                 string  `gorm:"column:last_after_weight" json:"last_after_weight" form:"last_after_weight"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

models/drug_stock.go

@@ -455,6 +455,8 @@ type DrugFlow struct {
 	RetailPrice               float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	XtDrugWarehouseOutInfo    XtDrugWarehouseOutInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId"json:"xt_drug_warehouse_out_info" `
 	OrderId                   int64                  `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	FlushOverCount            int64                  `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
+	Remark                    string                 `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (DrugFlow) TableName() string {

models/new_stock_models.go

@@ -402,6 +402,7 @@ type VmBaseDrugTwenty struct {
 	RetailPrice                      float64           `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	MinPrice                         float64           `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	LastPrice                        float64           `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugAlias                        string            `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
 	Manufacturer                     int64             `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Dealer                           int64             `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	Status                           int64             `gorm:"column:status" json:"status" form:"status"`

models/stock_models.go

@@ -678,6 +678,7 @@ type VmStockFlow struct {
 	IsCheck                   int64           `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	OverCount                 int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	OrderId                   int64           `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	Remark                    string          `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (VmStockFlow) TableName() string {

service/dialysis_parameter_service.go

@@ -332,6 +332,12 @@ func GetLastAssessmentBeforDialysis(patientid int64, orgid int64) (models.Predia
 	return evaluation, err
 }
 
+func GetPatientDryList(patientid int64, orgid int64) (dryweight []*models.SgjPatientDryweight, err error) {
+
+	err = XTReadDB().Where("patient_id =? and user_org_id =? and status=1", patientid, orgid).Order("ctime desc").Limit(6).Find(&dryweight).Error
+	return dryweight, err
+}
+
 func GetDialysisPrescriptionList(patientid int64, orgid int64, startime int64) (models.DialysisPrescriptionParameter, error) {
 	prescription := models.DialysisPrescriptionParameter{}
 	err := XTReadDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientid, orgid, startime).Find(&prescription).Error

service/dialysis_service.go

@@ -224,7 +224,7 @@ func AddSigleRecord(prescription *models.DialysisPrescription) (err error) {
 
 func UpdateAddSigleRecord(id int64, target_ultrafiltration float64) error {
 
-	err := XTWriteDB().Model(&models.DialysisPrescription{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"target_ultrafiltration": target_ultrafiltration}).Error
+	err := XTWriteDB().Model(&models.DialysisPrescription{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"target_ultrafiltration": target_ultrafiltration, "prescription_water": target_ultrafiltration}).Error
 	return err
 }
 

service/doctor_schedule_service.go

@@ -818,3 +818,11 @@ func GetMobileScheduleListByScheduleDate(org_id int64, schedule_date int64) (sch
 
 	return schedule, err
 }
+
+func DeleteStaffScheduleById(id int64, user_org_id int64) (err error) {
+
+	schedule := models.StaffSchedule{}
+
+	err = XTWriteDB().Model(&schedule).Where("id = ? and user_org_id =? and status=1", id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/patient_service.go

@@ -3397,3 +3397,10 @@ func GetDialysisOrderCountTenEight(patient_id int64, recordDate int64) (models.V
 	err := XTReadDB().Where("patient_id = ? and dialysis_date = ? and status = 1", patient_id, recordDate).Last(&order).Error
 	return order, err
 }
+
+func GetLastAcceptRecrods(patient_id int64) (models.ReceiveTreatmentAsses, error) {
+
+	treatmentAsses := models.ReceiveTreatmentAsses{}
+	err := XTReadDB().Where("patient_id = ? and status= 1 and admission_number!=''", patient_id).Last(&treatmentAsses).Error
+	return treatmentAsses, err
+}

service/pharmacy_service.go

@@ -839,36 +839,38 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 	}
 
 	advice, err := GetDocAdviceList(orgid, patient_id, stime, etime)
-
-	if len(advice) > 0 {
-		for _, item := range advice {
-			err = DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-			//查询默认仓库
-			storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
-			//查询默认仓库剩余多少库存
-			var sum_count int64
-			stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, item.DrugId)
-			for _, its := range stockInfo {
-				baseDrug, _ := GetBaseDrugMedical(its.DrugId)
-				if its.MaxUnit == baseDrug.MaxUnit {
-					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+	//响水不走这里
+	if orgid != 10188 {
+		if len(advice) > 0 {
+			for _, item := range advice {
+				err = DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+				//查询默认仓库
+				storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
+				//查询默认仓库剩余多少库存
+				var sum_count int64
+				stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, item.DrugId)
+				for _, its := range stockInfo {
+					baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+					if its.MaxUnit == baseDrug.MaxUnit {
+						its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+					}
+					sum_count += its.StockMaxNumber + its.StockMinNumber
 				}
-				sum_count += its.StockMaxNumber + its.StockMinNumber
-			}
-			UpdateBaseDrugSumTwo(item.DrugId, sum_count, orgid)
-			//扣减库存
-			UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				UpdateBaseDrugSumTwo(item.DrugId, sum_count, orgid)
+				//扣减库存
+				UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 
-			over, _ := FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
-			UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
-			}
-			err = UpdateIsAdvice(item.ID)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
+				over, _ := FindOverCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut)
+				UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
+				err = UpdateIsAdvice(item.ID)
+				if err != nil {
+					err = fmt.Errorf("!:%v", err)
+					return
+				}
 			}
 		}
 	}
@@ -889,7 +891,7 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 
 func GetHisPatientNoMedical(user_org_id int64, patient_id int64, startime int64, end_time int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
-	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0", user_org_id, patient_id, startime, end_time).Find(&advice).Error
+	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0 and status=1", user_org_id, patient_id, startime, end_time).Find(&advice).Error
 	return advice, err
 }
 
@@ -907,7 +909,7 @@ func UpdateHisPrescription(id int64) (err error) {
 
 func GetDocAdviceList(user_org_id int64, patient_id int64, startime int64, end_time int64) (advice []*models.DoctorAdvice, err error) {
 
-	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0", user_org_id, patient_id, startime, end_time).Find(&advice).Error
+	err = XTReadDB().Where("user_org_id =? and patient_id = ? and advice_date>=? and advice_date<=? and is_medicine =0 and status=1", user_org_id, patient_id, startime, end_time).Find(&advice).Error
 	return advice, err
 
 }

service/secondary_service.go

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

service/self_drug_service.go

@@ -2881,6 +2881,30 @@ func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	return druginfo, total, err
 }
 
+func GetDrugNewPurchaseStockQueryList(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
+
+	db := XTReadDB().Model(&druginfo).Where("status = 1")
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	if good_type > 0 {
+		db = db.Where("drug_type = ?", good_type)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+	if len(infos) > 0 {
+		db = db.Where("id in(?)", infos)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("drug_alias desc").Find(&druginfo).Error
+
+	return druginfo, total, err
+}
+
 func GetDrugStartFlow(drug_id int64, user_org_id int64, startime int64) (models.DrugFlowTwenty, error) {
 
 	flow := models.DrugFlowTwenty{}
@@ -2965,3 +2989,26 @@ func UpdateDrugStockInCountOne(drugId int64, storehouseId int64, over_count int6
 	err := XTWriteDB().Model(&models.XtDrugStockCount{}).Where("drug_id =? and storehouse_id =? and status=1 and user_org_id =?", drugId, storehouseId, user_org_id).Update(map[string]interface{}{"sum_act_out_count": over_count}).Error
 	return err
 }
+
+func GetPurchaseStockQueryList(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
+
+	db := XTReadDB().Model(&goodinfo).Where("status = 1")
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	if good_type > 0 {
+		db = db.Where("good_type_id = ?", good_type)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", goodIds)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("good_number desc").Find(&goodinfo).Error
+
+	return goodinfo, total, err
+}

service/user_service.go

@@ -214,3 +214,10 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 	err = UserReadDB().Where("org_id = ?  AND status = 1 AND  (user_type = ? OR user_type = ?) ", orgid, 2, 1).Find(&appRole).Error
 	return appRole, err
 }
+
+func GetDrugFlowDetailById(drug_id int64) (flow []*models.DrugFlow, err error) {
+
+	err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =10402", drug_id).Order("id asc").Find(&flow).Error
+
+	return flow, err
+}

service/warhouse_service.go

@@ -5586,6 +5586,7 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			IsCheck:                 1,
 			OverCount:               sum_count,
 			RegisterNumber:          goods.RegisterNumber,
+			Remark:                  goods.Remark,
 		}
 		//创建出库流水
 		errflow := CreateStockFlowOne(stockFlow)
@@ -5734,6 +5735,7 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			IsCheck:                 1,
 			OverCount:               sum_count,
 			RegisterNumber:          goods.RegisterNumber,
+			Remark:                  goods.Remark,
 		}
 		//创建出库流水
 		errflow := CreateStockFlowOne(stockFlow)
@@ -6011,6 +6013,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			WarehousingId:           warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
 			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
 		}
 		if warehouse.RetailPrice == 0 {
 			drugflow.Price = advice.Price
@@ -6081,6 +6084,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			WarehousingDetailId:     warehouse.ID,
 			SystemTime:              advice.SysRecordTime,
 			PatientId:               advice.PatientId,
+			Remark:                  advice.Remark,
 		}
 
 		CreateDrugFlowOne(drugflow)