11月9日库存管理

controllers/dialysis_api_controller.go

@@ -3203,7 +3203,7 @@ func (c *DialysisApiController) GetLongAdviceOne() {
 
 		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.CurrentOrgId, patient_id, theTime.Unix())
 		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.CurrentOrgId, patient_id, theTime.Unix())
-		fmt.Println("advice23323232233232233223232332232323322323wodee", theTime.Unix())
+
 		for _, advice := range advices {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
@@ -3296,7 +3296,7 @@ func (c *DialysisApiController) GetLongAdviceTwo() {
 		//groupNo := service.GetMaxLongAdviceGroupID(adminUserInfo.Org.Id, patient_id)
 		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.CurrentOrgId, patient_id, schedule_date)
 		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.CurrentOrgId, patient_id, schedule_date)
-		fmt.Println("advice23323232233232233223232332232323322323wodee", schedule_date)
+
 		for _, advice := range advices {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
@@ -3821,7 +3821,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -3849,7 +3849,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

controllers/dialysis_record_api_controller.go

@@ -1085,7 +1085,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				}
 
 				//针对肇庆三鹤血液透析中心
-				if adminUserInfo.CurrentOrgId == 10215 || template.TemplateId == 43 {
+				if adminUserInfo.CurrentOrgId == 10215 || template.TemplateId == 43 || adminUserInfo.CurrentOrgId == 10441 || adminUserInfo.CurrentOrgId == 10445 {
 
 					if evaluation.ID > 0 {
 						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60)
@@ -1412,7 +1412,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 {
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 {
 
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {

controllers/drug_stock_api_contorller.go

@@ -1403,7 +1403,7 @@ func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 	}
 
 	warehouseOutList, total, err := service.FindAllDrugWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, way_type, check_type)
-	fmt.Println("warehouseOutList232332323232323", warehouseOutList)
+
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	fmt.Println(err)
 	if err == nil {

controllers/gobal_config_api_controller.go

@@ -119,6 +119,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changedrugopenconfig", &GobalConfigApiController{}, "Get:ChangeDrugOpenConfig")
 
 	beego.Router("/api/changesettleopenconfig", &GobalConfigApiController{}, "Get:ChangeSettleOpenConfig")
+
+	beego.Router("/api/changegoodoutopen", &GobalConfigApiController{}, "Get:ChangeGoodOutOpen")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -164,6 +166,10 @@ func (c *GobalConfigApiController) PostStockConfig() {
 
 	}
 
+	if is_open == 1 {
+		service.UpdateGobalConfig(org_id)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open": is_open,
 	})
@@ -1574,6 +1580,8 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	drugOutConfig, _ := service.FindDrugOutConfigById(adminUserInfo.CurrentOrgId)
 
 	drugSettleConfig, _ := service.FindeDrugSettleConfigById(adminUserInfo.CurrentOrgId)
+
+	goodOutConfig, _ := service.FindGoodOutConfigById(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
@@ -1582,6 +1590,7 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 		"is_prescription_advice": prescriptionConfig.IsOpen,
 		"is_open":                drugOutConfig.IsOpen,
 		"is_seetle_open":         drugSettleConfig.IsOpen,
+		"is_out_open":            goodOutConfig.IsOpen,
 	})
 
 }
@@ -2387,7 +2396,7 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 	stock_type, _ := c.GetInt64("stock_type")
 
 	list, total, _ := service.GetDrugFlow(drug_id, orgId, limit, page, startTime, endTime, stock_type)
-	fmt.Println("listwowoowowowowowo", list)
+
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	medical, _ := service.GetBaseDrugMedical(drug_id)
@@ -2548,6 +2557,8 @@ func (this *GobalConfigApiController) ChangeSettleOpenConfig() {
 		service.UpdateDrugOutConfig(orgId, 2)
 		service.UpdateDrugStockAutomaticReduceRecordOne(orgId, 2)
 		service.UpdatePharyConfig(orgId, 2)
+		service.UpdateGoodAutoConfig(orgId)
+		service.UpdateGoodOutConfig(orgId)
 	}
 	openConfig, errcode := service.GetSettleOpenConfig(orgId)
 	if errcode == gorm.ErrRecordNotFound {
@@ -2559,3 +2570,35 @@ func (this *GobalConfigApiController) ChangeSettleOpenConfig() {
 		"msg": 1,
 	})
 }
+
+func (this *GobalConfigApiController) ChangeGoodOutOpen() {
+
+	good_open, _ := this.GetInt64("good_open")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	config, errcode := service.GetGoodOutOpenConfig(orgId)
+
+	outConfig := models.XtGoodOutConfig{
+		UserOrgId: orgId,
+		IsOpen:    good_open,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	if good_open == 1 {
+		service.UpdateGoodAutoConfig(orgId)
+		service.UpdateSettleOpenConfigTwo(orgId, 2)
+	}
+
+	if errcode == gorm.ErrRecordNotFound {
+		service.CreateGoodOutOpenConfig(outConfig)
+	} else if errcode == nil {
+		service.UpdateGoodOutOpenConfig(config.ID, outConfig)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": 1,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 {
 		dewater_amount = dewater_amount * 1000
 	}
 
@@ -730,7 +730,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk
 		}
 
-		if adminUserInfo.Org.Id == 10307 {
+		if adminUserInfo.Org.Id == 10307 || adminUserInfo.Org.Id == 10445 {
 			afterevaluation.ActualUltrafiltration = weight_loss * 1000 //中能建的计量单位是毫升（ml）
 		}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1847,7 +1847,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10223 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2402,7 +2402,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			//针对肇庆三鹤血液透析中心
 
-			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 {
+			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			}
 
@@ -2435,7 +2435,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 
@@ -3074,7 +3074,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -3103,7 +3103,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -5573,6 +5573,11 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 	project, _ := service.GetHisPrescriptionProject(adminUser.Org.Id, patient_id, date.Unix())
 
 	_, config := service.FindXTHisRecordByOrgId(adminUser.Org.Id)
+
+	outConfig, _ := service.FindGoodOutConfigById(adminUser.Org.Id)
+
+	settleConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.Org.Id)
+
 	//获取当天该病人的透析处方
 	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
 	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
@@ -5597,6 +5602,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 			"good_info":        good_info,
 			"warehouseOutList": warehouseOutList,
 			"config":           config,
+			"outConfig":        outConfig,
+			"settleConfig":     settleConfig,
 		})
 		return
 
@@ -5624,6 +5631,8 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				"project":          project,
 				"warehouseOutList": warehouseOutList,
 				"config":           config,
+				"outConfig":        outConfig,
+				"settleConfig":     settleConfig,
 			})
 			return
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1225,8 +1225,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 						}
 					}
-
-					//if config.IsOpen == 1 && item.UserOrgId == 10028 {
+					//
+					//if config.IsOpen == 1 && item.UserOrgId == 10088 {
 					//
 					//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 					//	//更新字典里面的库存

controllers/secondary_order_api_contorller.go

@@ -1023,6 +1023,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 				return
 			}
 		}
+
 	}
 	err := service.UpdateStoreOrderByArray(idArray, orgId, creater)
 	//如果审核成功
@@ -1204,6 +1205,44 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 					service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 				}
 
+				//查询该药品该仓库是否有数据
+				drug, _ := service.GetDrugStockCout(item.ProjectId, item.StorehouseInId, item.UserOrgId)
+				var sum_out_count int64
+				baseDrug, _ := service.GetBaseDrugMedical(item.ProjectId)
+				if item.SencondUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+					sum_out_count = item.Count * baseDrug.MinNumber
+				}
+				if item.SencondUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+					sum_out_count = item.Count
+				}
+
+				if item.SencondUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
+					sum_out_count = item.Count
+				}
+				if drug.ID == 0 {
+					drugstock := models.XtDrugStockCount{
+						UserOrgId:      orgId,
+						StorehouseId:   item.StorehouseInId,
+						SumInCount:     sum_out_count,
+						SumOutCount:    0,
+						SumCancelCount: 0,
+						DrugId:         item.ProjectId,
+						Ctime:          time.Now().Unix(),
+						Mtime:          0,
+						Status:         1,
+						FlushCount:     sum_out_count,
+						SumActOutCount: 0,
+					}
+					service.CreateDrugStockCount(drugstock)
+				}
+
+				if drug.ID > 0 {
+
+					service.AddDrugStockCount(item.StorehouseInId, item.ProjectId, item.UserOrgId, sum_out_count)
+				}
+
+				//更新出库数据
+				service.ReduceDrugStockCountSix(item.StorehouseOutId, item.ProjectId, item.UserOrgId, sum_out_count)
 			}
 
 			//耗材
@@ -1328,117 +1367,147 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 				}
 				//基础库插入数据
 				service.UpdateGoodInfoSumCountSix(item.ProjectId, total_count, orgId)
-			}
-		}
-	}
 
-	//获取所有的入库仓库
-	druglist, _ := service.GetDrugWarehouseInfoStorehouseList(orgId)
-	for _, item := range druglist {
-		//查询该药品该仓库是否有数据
-		drug, _ := service.GetDrugStockCout(item.DrugId, item.StorehouseId, item.OrgId)
-
-		//查询该仓库该药品的入库数量
-		medical, _ := service.GetBaseDrugMedical(item.DrugId)
-
-		var sum_in_count int64
-		var flush_count int64
-		var sum_out_count int64
-		var cancel_out_count int64
-		//查询入库数量和剩余库存
-		infolist, _ := service.GetDrugWarehouseInfoByStorehouseId(item.StorehouseId, item.DrugId, item.OrgId)
-		for _, it := range infolist {
-			if it.MaxUnit == medical.MaxUnit {
-				it.WarehousingCount = it.WarehousingCount * medical.MinNumber
-				it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
-			}
-			sum_in_count += it.WarehousingCount
-			flush_count += it.StockMaxNumber + it.StockMinNumber
-		}
+				//查询是否有数据
+				_, errcodes := service.GetStockFlush(item.StorehouseInId, item.ProjectId, item.UserOrgId)
+				if errcodes == gorm.ErrRecordNotFound {
+					good := models.XtGoodStockCount{
+						UserOrgId:        item.UserOrgId,
+						GoodId:           item.ProjectId,
+						StorehouseId:     item.StorehouseInId,
+						Status:           1,
+						Ctime:            time.Now().Unix(),
+						Mtime:            0,
+						StockInCount:     item.Count,
+						StockOutCount:    0,
+						StockCancelCount: 0,
+						FlushCount:       item.Count,
+						StockActOutCount: 0,
+					}
+					service.CreateGoodCountSix(good)
+				} else if errcodes == nil {
 
-		//获取出库数量
-		outinfolist, _ := service.GetDrugFlowStockOutCount(item.StorehouseId, item.DrugId, item.OrgId)
-		for _, it := range outinfolist {
-			if it.MaxUnit == medical.MaxUnit {
-				it.Count = it.Count * medical.MinNumber
-			}
-			sum_out_count += it.Count
-		}
+					service.AddGoodStockCount(item.StorehouseInId, item.ProjectId, item.UserOrgId, item.Count)
+				}
 
-		//获取退库数量
-		cancelinfolist, _ := service.GetDrugFlowStockCancelCount(item.StorehouseId, item.DrugId, item.OrgId)
-		for _, it := range cancelinfolist {
-			if it.MaxUnit == medical.MaxUnit {
-				it.Count = it.Count * medical.MinNumber
-			}
-			cancel_out_count += it.Count
-		}
+				//更新出库数据
+				service.ReduceStockCount(item.StorehouseOutId, item.ProjectId, item.UserOrgId, item.Count)
 
-		//新增
-		if drug.ID == 0 {
-			drugstock := models.XtDrugStockCount{
-				UserOrgId:      orgId,
-				StorehouseId:   item.StorehouseId,
-				SumInCount:     sum_in_count,
-				SumOutCount:    sum_out_count - cancel_out_count,
-				SumCancelCount: cancel_out_count,
-				DrugId:         item.DrugId,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Status:         1,
-				FlushCount:     flush_count,
-				SumActOutCount: sum_out_count,
 			}
-			service.CreateDrugStockCount(drugstock)
 		}
 	}
 
-	//获取入库数据
-	goodlist, _ := service.GetSendGoodInformation(orgId)
-	for _, it := range goodlist {
-		//查询是否有数据
-		_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
-		//获取总退库数量
-		var cancel_count int64
-		var out_count int64
-		var act_count int64
-		//退库总数量
-		cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range cancellist {
-			cancel_count += item.Count
-		}
-		//出库总数量
-		outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range outlist {
-			out_count += item.Count
-		}
-
-		//实际出库总数量
-		actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range actlist {
-			act_count += item.Count
-		}
-
-		if errcode == gorm.ErrRecordNotFound {
-			good := models.XtGoodStockCount{
-				UserOrgId:        it.OrgId,
-				GoodId:           it.GoodId,
-				StorehouseId:     it.StorehouseId,
-				Status:           1,
-				Ctime:            time.Now().Unix(),
-				Mtime:            0,
-				StockInCount:     it.WarehousingCount,
-				StockOutCount:    out_count - cancel_count,
-				StockCancelCount: cancel_count,
-				FlushCount:       it.StockCount,
-				StockActOutCount: act_count,
-			}
-			service.CreateGoodCountSix(good)
-		}
-		if errcode == nil {
-			service.UpdateGoodCount(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
-		}
-	}
+	//获取所有的入库仓库
+	//druglist, _ := service.GetDrugWarehouseInfoStorehouseList(orgId)
+	//for _, item := range druglist {
+	//	//查询该药品该仓库是否有数据
+	//	drug, _ := service.GetDrugStockCout(item.DrugId, item.StorehouseId, item.OrgId)
+	//
+	//	//查询该仓库该药品的入库数量
+	//	medical, _ := service.GetBaseDrugMedical(item.DrugId)
+	//
+	//	var sum_in_count int64
+	//	var flush_count int64
+	//	var sum_out_count int64
+	//	var cancel_out_count int64
+	//	//查询入库数量和剩余库存
+	//	infolist, _ := service.GetDrugWarehouseInfoByStorehouseId(item.StorehouseId, item.DrugId, item.OrgId)
+	//	for _, it := range infolist {
+	//		if it.MaxUnit == medical.MaxUnit {
+	//			it.WarehousingCount = it.WarehousingCount * medical.MinNumber
+	//			it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
+	//		}
+	//		sum_in_count += it.WarehousingCount
+	//		flush_count += it.StockMaxNumber + it.StockMinNumber
+	//	}
+	//
+	//	//获取出库数量
+	//	outinfolist, _ := service.GetDrugFlowStockOutCount(item.StorehouseId, item.DrugId, item.OrgId)
+	//	for _, it := range outinfolist {
+	//		if it.MaxUnit == medical.MaxUnit {
+	//			it.Count = it.Count * medical.MinNumber
+	//		}
+	//		sum_out_count += it.Count
+	//	}
+	//
+	//	//获取退库数量
+	//	cancelinfolist, _ := service.GetDrugFlowStockCancelCount(item.StorehouseId, item.DrugId, item.OrgId)
+	//	for _, it := range cancelinfolist {
+	//		if it.MaxUnit == medical.MaxUnit {
+	//			it.Count = it.Count * medical.MinNumber
+	//		}
+	//		cancel_out_count += it.Count
+	//	}
+	//
+	//	//新增
+	//	if drug.ID == 0 {
+	//		drugstock := models.XtDrugStockCount{
+	//			UserOrgId:      orgId,
+	//			StorehouseId:   item.StorehouseId,
+	//			SumInCount:     sum_in_count,
+	//			SumOutCount:    sum_out_count - cancel_out_count,
+	//			SumCancelCount: cancel_out_count,
+	//			DrugId:         item.DrugId,
+	//			Ctime:          time.Now().Unix(),
+	//			Mtime:          0,
+	//			Status:         1,
+	//			FlushCount:     flush_count,
+	//			SumActOutCount: sum_out_count,
+	//		}
+	//		service.CreateDrugStockCount(drugstock)
+	//	}
+	//}
+	//
+	////获取入库数量
+	//
+	//
+	//
+	//////获取入库数据
+	//goodlist, _ := service.GetSendGoodInformation(orgId)
+	//for _, it := range goodlist {
+	//	//查询是否有数据
+	//	_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
+	//	//获取总退库数量
+	//	var cancel_count int64
+	//	var out_count int64
+	//	var act_count int64
+	//	//退库总数量
+	//	cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range cancellist {
+	//		cancel_count += item.Count
+	//	}
+	//	//出库总数量
+	//	outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range outlist {
+	//		out_count += item.Count
+	//	}
+	//
+	//	//实际出库总数量
+	//	actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range actlist {
+	//		act_count += item.Count
+	//	}
+	//
+	//	if errcode == gorm.ErrRecordNotFound {
+	//		good := models.XtGoodStockCount{
+	//			UserOrgId:        it.OrgId,
+	//			GoodId:           it.GoodId,
+	//			StorehouseId:     it.StorehouseId,
+	//			Status:           1,
+	//			Ctime:            time.Now().Unix(),
+	//			Mtime:            0,
+	//			StockInCount:     it.WarehousingCount,
+	//			StockOutCount:    out_count - cancel_count,
+	//			StockCancelCount: cancel_count,
+	//			FlushCount:       it.StockCount,
+	//			StockActOutCount: act_count,
+	//		}
+	//		service.CreateGoodCountSix(good)
+	//	}
+	//	if errcode == nil {
+	//		service.UpdateGoodCountSend(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
+	//	}
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": 1,
@@ -1616,6 +1685,24 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 				sum_count += its.StockMaxNumber + its.StockMinNumber
 			}
 			service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
+
+			var sum_out_count int64
+			baseDrug, _ := service.GetBaseDrugMedical(item.ProjectId)
+			if item.SencondUnit == baseDrug.MaxUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+				sum_out_count = item.Count * baseDrug.MinNumber
+			}
+			if item.SencondUnit == baseDrug.MinUnit && baseDrug.MaxUnit != baseDrug.MinUnit {
+				sum_out_count = item.Count
+			}
+
+			if item.SencondUnit == baseDrug.MaxUnit && baseDrug.MaxUnit == baseDrug.MinUnit {
+				sum_out_count = item.Count
+			}
+			//入库仓库减少
+			service.ReduceDrugStockCountSeven(item.StorehouseInId, item.ProjectId, item.UserOrgId, sum_out_count)
+
+			//出库仓库增加
+			service.AddDrugStockCount(item.StorehouseOutId, item.ProjectId, item.UserOrgId, sum_out_count)
 		}
 
 		//耗材
@@ -1656,116 +1743,121 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 			//基础库插入数据
 			service.UpdateGoodInfoSumCount(item.ProjectId, total_count, orgId)
 
-		}
-	}
+			//入库仓库减少
+			service.ReduceStockCountTwo(item.StorehouseInId, item.ProjectId, item.UserOrgId, item.Count)
 
-	//获取所有的入库仓库
-	druglist, _ := service.GetDrugWarehouseInfoStorehouseList(orgId)
-	for _, item := range druglist {
-		//查询该药品该仓库是否有数据
-		drug, _ := service.GetDrugStockCout(item.DrugId, item.StorehouseId, item.OrgId)
-
-		//查询该仓库该药品的入库数量
-		medical, _ := service.GetBaseDrugMedical(item.DrugId)
-
-		var sum_in_count int64
-		var flush_count int64
-		var sum_out_count int64
-		var cancel_out_count int64
-		//查询入库数量和剩余库存
-		infolist, _ := service.GetDrugWarehouseInfoByStorehouseId(item.StorehouseId, item.DrugId, item.OrgId)
-		for _, it := range infolist {
-			if it.MaxUnit == medical.MaxUnit {
-				it.WarehousingCount = it.WarehousingCount * medical.MinNumber
-				it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
-			}
-			sum_in_count += it.WarehousingCount
-			flush_count += it.StockMaxNumber + it.StockMinNumber
-		}
-
-		//获取出库数量
-		outinfolist, _ := service.GetDrugFlowStockOutCount(item.StorehouseId, item.DrugId, item.OrgId)
-		for _, it := range outinfolist {
-			if it.MaxUnit == medical.MaxUnit {
-				it.Count = it.Count * medical.MinNumber
-			}
-			sum_out_count += it.Count
-		}
-
-		//获取退库数量
-		cancelinfolist, _ := service.GetDrugFlowStockCancelCount(item.StorehouseId, item.DrugId, item.OrgId)
-		for _, it := range cancelinfolist {
-			if it.MaxUnit == medical.MaxUnit {
-				it.Count = it.Count * medical.MinNumber
-			}
-			cancel_out_count += it.Count
-		}
-
-		//新增
-		if drug.ID == 0 {
-			drugstock := models.XtDrugStockCount{
-				UserOrgId:      orgId,
-				StorehouseId:   item.StorehouseId,
-				SumInCount:     sum_in_count,
-				SumOutCount:    sum_out_count - cancel_out_count,
-				SumCancelCount: cancel_out_count,
-				DrugId:         item.DrugId,
-				Ctime:          time.Now().Unix(),
-				Mtime:          0,
-				Status:         1,
-				FlushCount:     flush_count,
-				SumActOutCount: sum_out_count,
-			}
-			service.CreateDrugStockCount(drugstock)
+			//出库仓库增加
+			service.AddGoodStockCount(item.StorehouseOutId, item.ProjectId, item.UserOrgId, item.Count)
 		}
 	}
 
-	//获取入库数据
-	goodlist, _ := service.GetSendGoodInformation(orgId)
-	for _, it := range goodlist {
-		//查询是否有数据
-		_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
-		//获取总退库数量
-		var cancel_count int64
-		var out_count int64
-		var act_count int64
-		//退库总数量
-		cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range cancellist {
-			cancel_count += item.Count
-		}
-		//出库总数量
-		outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range outlist {
-			out_count += item.Count
-		}
-
-		//实际出库总数量
-		actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-		for _, item := range actlist {
-			act_count += item.Count
-		}
-
-		if errcode == gorm.ErrRecordNotFound {
-			good := models.XtGoodStockCount{
-				UserOrgId:        it.OrgId,
-				GoodId:           it.GoodId,
-				StorehouseId:     it.StorehouseId,
-				Status:           1,
-				Ctime:            time.Now().Unix(),
-				Mtime:            0,
-				StockInCount:     it.WarehousingCount,
-				StockOutCount:    out_count - cancel_count,
-				StockCancelCount: cancel_count,
-				FlushCount:       it.StockCount,
-				StockActOutCount: act_count,
-			}
-			service.CreateGoodCountSix(good)
-		}
-		if errcode == nil {
-			service.UpdateGoodCount(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
-		}
-	}
+	////获取所有的入库仓库
+	//druglist, _ := service.GetDrugWarehouseInfoStorehouseList(orgId)
+	//for _, item := range druglist {
+	//	//查询该药品该仓库是否有数据
+	//	drug, _ := service.GetDrugStockCout(item.DrugId, item.StorehouseId, item.OrgId)
+	//
+	//	//查询该仓库该药品的入库数量
+	//	medical, _ := service.GetBaseDrugMedical(item.DrugId)
+	//
+	//	var sum_in_count int64
+	//	var flush_count int64
+	//	var sum_out_count int64
+	//	var cancel_out_count int64
+	//	//查询入库数量和剩余库存
+	//	infolist, _ := service.GetDrugWarehouseInfoByStorehouseId(item.StorehouseId, item.DrugId, item.OrgId)
+	//	for _, it := range infolist {
+	//		if it.MaxUnit == medical.MaxUnit {
+	//			it.WarehousingCount = it.WarehousingCount * medical.MinNumber
+	//			it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
+	//		}
+	//		sum_in_count += it.WarehousingCount
+	//		flush_count += it.StockMaxNumber + it.StockMinNumber
+	//	}
+	//
+	//	//获取出库数量
+	//	outinfolist, _ := service.GetDrugFlowStockOutCount(item.StorehouseId, item.DrugId, item.OrgId)
+	//	for _, it := range outinfolist {
+	//		if it.MaxUnit == medical.MaxUnit {
+	//			it.Count = it.Count * medical.MinNumber
+	//		}
+	//		sum_out_count += it.Count
+	//	}
+	//
+	//	//获取退库数量
+	//	cancelinfolist, _ := service.GetDrugFlowStockCancelCount(item.StorehouseId, item.DrugId, item.OrgId)
+	//	for _, it := range cancelinfolist {
+	//		if it.MaxUnit == medical.MaxUnit {
+	//			it.Count = it.Count * medical.MinNumber
+	//		}
+	//		cancel_out_count += it.Count
+	//	}
+	//
+	//	//新增
+	//	if drug.ID == 0 {
+	//		drugstock := models.XtDrugStockCount{
+	//			UserOrgId:      orgId,
+	//			StorehouseId:   item.StorehouseId,
+	//			SumInCount:     sum_in_count,
+	//			SumOutCount:    sum_out_count - cancel_out_count,
+	//			SumCancelCount: cancel_out_count,
+	//			DrugId:         item.DrugId,
+	//			Ctime:          time.Now().Unix(),
+	//			Mtime:          0,
+	//			Status:         1,
+	//			FlushCount:     flush_count,
+	//			SumActOutCount: sum_out_count,
+	//		}
+	//		service.CreateDrugStockCount(drugstock)
+	//	}
+	//}
+
+	////获取入库数据
+	//goodlist, _ := service.GetSendGoodInformation(orgId)
+	//for _, it := range goodlist {
+	//	//查询是否有数据
+	//	_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
+	//	//获取总退库数量
+	//	var cancel_count int64
+	//	var out_count int64
+	//	var act_count int64
+	//	//退库总数量
+	//	cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range cancellist {
+	//		cancel_count += item.Count
+	//	}
+	//	//出库总数量
+	//	outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range outlist {
+	//		out_count += item.Count
+	//	}
+	//
+	//	//实际出库总数量
+	//	actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
+	//	for _, item := range actlist {
+	//		act_count += item.Count
+	//	}
+	//
+	//	if errcode == gorm.ErrRecordNotFound {
+	//		good := models.XtGoodStockCount{
+	//			UserOrgId:        it.OrgId,
+	//			GoodId:           it.GoodId,
+	//			StorehouseId:     it.StorehouseId,
+	//			Status:           1,
+	//			Ctime:            time.Now().Unix(),
+	//			Mtime:            0,
+	//			StockInCount:     it.WarehousingCount,
+	//			StockOutCount:    out_count - cancel_count,
+	//			StockCancelCount: cancel_count,
+	//			FlushCount:       it.StockCount,
+	//			StockActOutCount: act_count,
+	//		}
+	//		service.CreateGoodCountSix(good)
+	//	}
+	//	if errcode == nil {
+	//		service.UpdateGoodCount(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
+	//	}
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "1",

controllers/stock_in_api_controller.go

@@ -3774,6 +3774,7 @@ func (this *StockManagerApiController) AddGoodInformation() {
 				IsUser:                      2,
 				PackingUnit:                 item.PackingUnit,
 				PackingPrice:                item.RetailPrice,
+				IsWarehouse:                 1,
 			}
 
 			//查询同种耗材名称同种类型同种规格的耗材是否存在

models/dialysis.go

@@ -1095,6 +1095,7 @@ type DialysisBeforePrepareGoods struct {
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	ProjectId         int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 type NewDialysisBeforePrepareGoods struct {
@@ -1109,6 +1110,7 @@ type NewDialysisBeforePrepareGoods struct {
 	RecordDate                         int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	UserOrgId                          int64                            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	ChildNewDialysisBeforePrepareGoods []*NewDialysisBeforePrepareGoods `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"child"`
+	PatientId                          int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 type OldDialysisBeforePrepareGoods struct {

models/drug_stock.go

@@ -128,6 +128,7 @@ type DrugWarehouseOut struct {
 	StorehouseId            int64         `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseId       int64         `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 	IsCheck                 int64         `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OrderId                 int64         `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 func (DrugWarehouseOut) TableName() string {
@@ -176,6 +177,7 @@ type DrugWarehouseOutInfo struct {
 	IsCheck                 int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 	OverCount               int64       `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64       `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -249,6 +251,7 @@ type DrugCancelStock struct {
 	DrugCancelStockInfo []*DrugCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"drugCancelStockInfo"`
 	StorehouseId        int64                  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsCheck             int64                  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OrderId             int64                  `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 func (DrugCancelStock) TableName() string {
@@ -284,6 +287,7 @@ type DrugCancelStockInfo struct {
 	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	DrugWarehouseInfo []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId"json:"drug_warehouse_info" `
+	OrderId           int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 func (DrugCancelStockInfo) TableName() string {
@@ -435,6 +439,7 @@ type DrugFlow struct {
 	OverCount                 int64                  `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	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"`
 }
 
 func (DrugFlow) TableName() string {

models/his_models.go

@@ -2442,3 +2442,58 @@ type HisSettleStockConfig struct {
 func (HisSettleStockConfig) TableName() string {
 	return "his_settle_stock_config"
 }
+
+type XtGoodOutConfig struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtGoodOutConfig) TableName() string {
+	return "xt_good_out_config"
+}
+
+type GoodHisPrescriptionProject struct {
+	ID                   int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price                float64 `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId            int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId         int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate           int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId       int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count                string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn            string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg          string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose           string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay          string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency   string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                  string  `gorm:"column:day" json:"day" form:"day"`
+	Remark               string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string  `gorm:"column:unit" json:"unit" form:"unit"`
+	Type                 int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime        int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime            int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime            int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId               int64   `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType        int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ExecutionFrequencyId int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsOut                int64   `gorm:"column:is_out" json:"is_out" form:"is_out"`
+}
+
+func (GoodHisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}

models/patient_models.go

@@ -24,6 +24,7 @@ type MSchedualPatientList struct {
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (MSchedualPatientList) TableName() string {
@@ -48,6 +49,7 @@ type MDialysisOrderForList struct {
 	EndTime            int64                 `gorm:"column:end_time" json:"end_time" form:"end_time"`
 	DialysisIrrigation string                `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	DialysisDialyszers string                `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	ScheduleRemark     string                `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (MDialysisOrderForList) TableName() string {

models/stock_models.go

@@ -219,6 +219,7 @@ type WarehouseOut struct {
 	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseId       int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OrderId                 int64        `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 func (WarehouseOut) TableName() string {
@@ -269,6 +270,7 @@ type WarehouseOutInfo struct {
 	WarehousingInfo         WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
 	VmStockFlow             VmStockFlow     `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
 	OverCount               int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64           `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -655,6 +657,7 @@ type VmStockFlow struct {
 	IsRead                    int64           `gorm:"column:is_read" json:"is_read" form:"is_read"`
 	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"`
 }
 
 func (VmStockFlow) TableName() string {
@@ -1568,3 +1571,41 @@ type StartDrugWarehouseInfo struct {
 func (StartDrugWarehouseInfo) TableName() string {
 	return "xt_drug_warehouse_info"
 }
+
+type GoodWarehousingInfo struct {
+	ID                        int64   `gorm:"column:id" json:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId                    int64   `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId                int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	Number                    string  `gorm:"column:number" json:"number"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit           string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price                     float64 `gorm:"column:price" json:"price"`
+	TotalPrice                float64 `gorm:"column:total_price" json:"total_price"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark                    string  `gorm:"column:remark" json:"remark"`
+	Ctime                     int64   `gorm:"column:ctime" json:"ctime"`
+	Mtime                     int64   `gorm:"column:mtime" json:"mtime"`
+	Status                    int64   `gorm:"column:status" json:"status"`
+	OrgId                     int64   `gorm:"column:org_id" json:"org_id"`
+	IsReturn                  int64   `gorm:"column:is_return" json:"is_return"`
+	StockCount                int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order"`
+	Type                      int64   `gorm:"column:type" json:"type"`
+	LicenseNumber             string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId           int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice              float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+}
+
+func (GoodWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}

service/gobal_config_service.go

@@ -31,6 +31,13 @@ func UpdateAutomaticReduceRecord(config *models.GobalConfig) (err error) {
 	return
 }
 
+func UpdateGobalConfig(user_org_id int64) error {
+
+	config := models.GobalConfig{}
+	err := XTWriteDB().Model(&config).Where("org_id = ? and status = 1").Updates(map[string]interface{}{"is_open": 2}).Error
+	return err
+}
+
 func UpdateDrugStockAutomaticReduceRecord(config *models.DrugStockConfig) (err error) {
 	err = writeDb.Save(config).Error
 	return

service/his_service.go

@@ -2655,3 +2655,10 @@ func GetStockGoodList(good_id int64, org_id int64) (models.XtGoodStockCount, err
 	err = XTReadDB().Where("good_id = ? and user_org_id = ? and status= 1", good_id, org_id).Find(&stockCount).Error
 	return stockCount, err
 }
+
+func GetLastOrderTX(user_org_id int64) (models.HisOrder, error) {
+
+	order := models.HisOrder{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Last(&order).Error
+	return order, err
+}

service/manage_center_service.go

@@ -584,14 +584,24 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				}
 				sum_count += its.StockMaxNumber + its.StockMinNumber
 			}
+			var count_one int64
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
 			flow := models.DrugFlow{
 				WarehousingId:           info.WarehouseInfoId,
 				DrugId:                  info.DrugId,
 				Number:                  "",
 				BatchNumber:             info.BatchNumber,
-				Count:                   prescribingNumber,
+				Count:                   count_one,
 				UserOrgId:               advice.UserOrgId,
-				PatientId:               0,
+				PatientId:               advice.PatientId,
 				SystemTime:              info.SysRecordTime,
 				ConsumableType:          7,
 				IsSys:                   0,
@@ -614,7 +624,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				CancelOutDetailId:       0,
 				ExpireDate:              info.ExpiryDate,
 				ProductDate:             info.ProductDate,
-				MaxUnit:                 advice.PrescribingNumberUnit,
+				MaxUnit:                 drug.MinUnit,
 				MinUnit:                 "",
 				AdviceId:                info.AdviceId,
 				StorehouseId:            storeHouseConfig.DrugStorehouseOut,
@@ -694,14 +704,25 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				sum_count += its.StockMaxNumber + its.StockMinNumber
 			}
 
+			var count_one int64
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				count_one = prescribingNumber
+			}
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				count_one = prescribingNumber * drug.MinNumber
+			}
+
 			flow := models.DrugFlow{
 				WarehousingId:           info.WarehouseInfoId,
 				DrugId:                  info.DrugId,
 				Number:                  "",
 				BatchNumber:             info.BatchNumber,
-				Count:                   prescribingNumber,
+				Count:                   count_one,
 				UserOrgId:               advice.UserOrgId,
-				PatientId:               0,
+				PatientId:               advice.PatientId,
 				SystemTime:              info.SysRecordTime,
 				ConsumableType:          7,
 				IsSys:                   0,
@@ -724,7 +745,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				CancelOutDetailId:       0,
 				ExpireDate:              info.ExpiryDate,
 				ProductDate:             info.ProductDate,
-				MaxUnit:                 advice.PrescribingNumberUnit,
+				MaxUnit:                 drug.MinUnit,
 				MinUnit:                 "",
 				AdviceId:                info.AdviceId,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
@@ -871,7 +892,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater int64) error {
 
 	//查询已经出库数量
-	info, _ := GetWareOutInfo(good.GoodId, good.RecordDate, good.UserOrgId)
+	info, _ := GetWareOutInfo(good.GoodId, good.RecordDate, good.UserOrgId, good.PatientId)
 	if len(info) > 0 {
 		houseConfig, _ := GetAllStoreHouseConfig(good.UserOrgId)
 
@@ -974,14 +995,21 @@ func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater i
 
 			//回退库存
 			UpDateWarehouseInfoByStockDelete(item.WarehouseInfotId, item.Count, item.PatientId, item.SysRecordTime, item.GoodId)
+
 			//退库数量增加
 			UpdateSumAddCancelCount(good.UserOrgId, good.GoodId, houseConfig.StorehouseOutInfo, good.Count)
 			//出库数量减少
 			UpdateSumCount(good.UserOrgId, houseConfig.StorehouseOutInfo, good.GoodId, good.Count)
 			//删除出库表
 			DeleteAutoRedeceDetailTen(good.UserOrgId, item.PatientId, item.SysRecordTime, item.GoodId)
+
+			goodListOne, _ := GetSumGoodList(item.OrgId, houseConfig.StorehouseOutInfo, item.GoodId)
+			var flush_count int64
+			for _, it := range goodListOne {
+				flush_count += it.StockCount
+			}
 			//更新剩余库存
-			UpdateSumGood(good.UserOrgId, houseConfig.StorehouseOutInfo, item.GoodId, over_count)
+			UpdateSumGood(good.UserOrgId, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
 		}
 	}
 	return err

service/mobile_dialysis_service.go

@@ -171,6 +171,7 @@ type MSchedualPatientVMList struct {
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (MSchedualPatientVMList) TableName() string {
@@ -300,6 +301,7 @@ type MDialysisOrderVMList struct {
 	NucleinDate        int64            `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
 	DialysisIrrigation string           `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	DialysisDialyszers string           `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	ScheduleRemark     string           `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (MDialysisOrderVMList) TableName() string {
@@ -626,7 +628,7 @@ func MobileGetReceiverTreatmentAccessRecord(orgID int64, patientID int64, record
 
 // 透前评估
 func MobileGetPredialysisEvaluationOne(orgID int64, patientID int64, recordDate int64) (*models.PredialysisEvaluation, error) {
-	fmt.Println("recordDate", recordDate)
+
 	var record models.PredialysisEvaluation
 	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
 	if err != nil {

service/new_stock_service.go

@@ -124,7 +124,7 @@ func GetSumGoodList(orgid int64, storehouse_id int64, good_id int64) (info []*mo
 
 func UpdateSumGood(orgid int64, storehouse_id int64, good_id int64, flush_count int64) error {
 	db := writeDb.Begin()
-	err := db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", orgid, storehouse_id, good_id).Update(map[string]interface{}{"flush_count": flush_count}).Error
+	err := db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", orgid, storehouse_id, good_id).Updates(map[string]interface{}{"flush_count": flush_count}).Error
 	if err != nil {
 		db.Rollback()
 		return err
@@ -181,6 +181,16 @@ func UpdateGoodCount(warehousingCount int64, stock_count int64, out_count int64,
 	return err
 }
 
+func UpdateGoodCountSend(warehousingCount int64, stock_count int64, out_count int64, storehouse_id int64, good_id int64, orgid int64, cancel_count int64, act_count int64) error {
+
+	err := XTWriteDB().Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and good_id = ? and status =1 and user_org_id = ?", storehouse_id, good_id, orgid).Updates(map[string]interface{}{"stock_in_count": warehousingCount}).Error
+	err = XTWriteDB().Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and good_id = ? and status =1 and user_org_id = ?", storehouse_id, good_id, orgid).Update(map[string]interface{}{"stock_out_count": out_count}).Error
+	err = XTWriteDB().Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and good_id = ? and status =1 and user_org_id = ?", storehouse_id, good_id, orgid).Update(map[string]interface{}{"flush_count": stock_count}).Error
+	err = XTWriteDB().Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and good_id = ? and status =1 and user_org_id = ?", storehouse_id, good_id, orgid).Update(map[string]interface{}{"stock_cancel_count": cancel_count}).Error
+	err = XTWriteDB().Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and good_id = ? and status =1 and user_org_id = ?", storehouse_id, good_id, orgid).Update(map[string]interface{}{"stock_act_out_count": act_count}).Error
+	return err
+}
+
 func GetAllCancelCount(storehouse_id int64, good_id int64, org_id int64) (flow []*models.VmStockFlow, err error) {
 
 	err = XTReadDB().Where("storehouse_id = ? and good_id = ? and user_org_id = ? and (consumable_type = 4 or consumable_type= 7) and status = 1", storehouse_id, good_id, org_id).Find(&flow).Error
@@ -189,7 +199,7 @@ func GetAllCancelCount(storehouse_id int64, good_id int64, org_id int64) (flow [
 
 func GetAllStockOutCount(storehouse_id int64, good_id int64, org_id int64) (flow []*models.VmStockFlow, err error) {
 
-	err = XTReadDB().Where("storehouse_id = ? and good_id = ? and user_org_id = ? and (consumable_type = 2 or consumable_type= 3) and is_read = 0", storehouse_id, good_id, org_id).Find(&flow).Error
+	err = XTReadDB().Where("storehouse_id = ? and good_id = ? and user_org_id = ? and (consumable_type = 2 or consumable_type= 3)", storehouse_id, good_id, org_id).Find(&flow).Error
 	return flow, err
 }
 
@@ -360,8 +370,147 @@ func UpdateLastAutoCount(id int64, count int64) error {
 	return err
 }
 
-func GetWareOutInfo(good_id int64, record_date int64, user_org_id int64) (outinfo []*models.WarehouseOutInfo, err error) {
+func GetWareOutInfo(good_id int64, record_date int64, user_org_id int64, patient_id int64) (outinfo []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and status = 1", good_id, record_date, user_org_id).Find(&outinfo).Error
+	err = XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and status = 1 and patient_id = ?", good_id, record_date, user_org_id, patient_id).Find(&outinfo).Error
 	return outinfo, err
 }
+
+func AddGoodStockCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
+
+	db := writeDb.Begin()
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("flush_count", gorm.Expr("flush_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
+func AddDrugStockCount(storehouse_id int64, drug_id int64, user_org_id int64, count int64) error {
+	db := writeDb.Begin()
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_in_count", gorm.Expr("sum_in_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("flush_count", gorm.Expr("flush_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
+func ReduceStockCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
+
+	db := writeDb.Begin()
+	//err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count - ?", count)).Error
+	//if err != nil {
+	//  db.Rollback()
+	//  return err
+	//}
+
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("flush_count", gorm.Expr("flush_count - ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
+func ReduceStockCountTwo(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
+
+	db := writeDb.Begin()
+
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	err = db.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("flush_count", gorm.Expr("flush_count - ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
+func ReduceDrugStockCountSix(storehouse_id int64, drug_id int64, user_org_id int64, count int64) error {
+
+	db := writeDb.Begin()
+	//err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_in_count", gorm.Expr("sum_in_count - ?", count)).Error
+	//if err != nil {
+	//  db.Rollback()
+	//  return err
+	//}
+
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("flush_count", gorm.Expr("flush_count - ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}
+
+func ReduceDrugStockCountSeven(storehouse_id int64, drug_id int64, user_org_id int64, count int64) error {
+
+	db := writeDb.Begin()
+
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_out_count", gorm.Expr("sum_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("sum_act_out_count", gorm.Expr("sum_act_out_count + ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	err = db.Model(&models.XtDrugStockCount{}).Where("user_org_id = ? and storehouse_id = ? and drug_id = ? and status = 1", user_org_id, storehouse_id, drug_id).UpdateColumn("flush_count", gorm.Expr("flush_count - ?", count)).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
+	return err
+}

service/new_warehouse_service.go

@@ -90,7 +90,6 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
-		//fmt.Println("errcodes2333232233232wode3223", errcodes, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -99,8 +98,6 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		} else if errcodes == nil {
 
 			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
-			//fmt.Println("goods.cout23323233223232323w", count)
-			//fmt.Println("outInfoOnewowowwowowowowowo", outInfoOne.Count)
 			if count != outInfoOne.Count {
 				UpdatedWarehouseOutInfo(warehouseOutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId)
 			}
@@ -121,10 +118,6 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		for _, item := range flowGoodTwo {
 			out_count_one += item.Count
 		}
-		//fmt.Println("deliver_number", deliver_number)
-		//fmt.Println("out_count", out_count)
-		//fmt.Println("count", count)
-		//fmt.Println("cancel_out_count2333233", out_count_one)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if count > (out_count - out_count_one) {
 
@@ -553,6 +546,13 @@ func FindWarehouseOutInfoByPatientId(patient_id int64, record_time int64, good_i
 	return outInfo, err
 }
 
+func FindWarehouseOutInfoByPatientIdTwo(patient_id int64, record_time int64, good_id int64, org_id int64, project_id int64) (models.WarehouseOutInfo, error) {
+
+	outInfo := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("patient_id = ? and sys_record_time = ? and good_id = ? and org_id = ? and status = 1 and project_id = ?", patient_id, record_time, good_id, org_id, project_id).Last(&outInfo).Error
+	return outInfo, err
+}
+
 func UpdateDrugStockCount(drug_id int64, org_id int64, storehouse_id int64, flush_count int64) error {
 
 	drug := models.XtDrugStockCount{}
@@ -2120,3 +2120,723 @@ func UpdateHisPrescriptionProjectStatus(project_id int64, record_time int64, use
 	err := XTWriteDB().Model(&project).Where("project_id  = ? and record_date = ? and user_org_id = ? and patient_id = ? and status = 1", project_id, record_time, user_org_id, patient_id).Update(map[string]interface{}{"is_out": 1}).Error
 	return project, err
 }
+
+// 药品自动出库 递归方式
+func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+
+	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
+	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+	var drug_price float64
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number = count * drup.MinNumber
+
+	} else {
+		deliver_number = count
+
+	}
+
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		drug_price = drup.RetailPrice
+	}
+	fmt.Println(drug_price)
+
+	if advice.PrescribingNumberUnit == drup.MinUnit {
+		drug_price = drup.MinPrice
+	}
+
+	if advice.PrescribingNumberUnit != drup.MaxUnit || advice.PrescribingNumberUnit != drup.MinUnit {
+		drug_price = drup.RetailPrice
+	}
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
+	if lastWarehouse.StockMinNumber >= drup.MinNumber {
+		var stockMax int64
+		var stockMin int64
+		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+		ChangeMaxNumber(lastWarehouse.ID, stockMax)
+		UpdateMinNumber(lastWarehouse.ID, stockMin)
+	}
+	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
+
+	if err != nil {
+
+		return err
+	}
+	// 将该批次的剩余库存数量转换为拆零数量
+	// 将该批次的剩余库存数量转换为拆零数量
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
+
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
+		}
+
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		warehouse.Mtime = time.Now().Unix()
+
+		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
+		fmt.Println("max_number232232332232322wo", maxNumber)
+		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
+
+		if warehouse.StockMinNumber < minNumber {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			}
+		} else {
+			if minNumber > 0 {
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
+			}
+
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				if warehouse.StockMinNumber > 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
+				}
+
+			}
+
+		}
+
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		//扣减库存数据
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
+		}
+
+		//查询剩余库存
+		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    5,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			RetailPrice:             warehouse.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   deliver_number, //出最小单位
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			OrderId:                 warehouseout.OrderId,
+		}
+
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+
+		if lastDrugOutInfo.ID == 0 {
+			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			if errOne != nil {
+				return errOne
+			}
+		}
+		if lastDrugOutInfo.ID > 0 {
+			var his_count int64
+			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
+				his_count = lastDrugOutInfo.Count * drup.MinNumber
+			}
+			if lastDrugOutInfo.CountUnit == drup.MinUnit {
+				his_count = lastDrugOutInfo.Count
+			}
+			if deliver_number != his_count {
+				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
+				if errThree != nil {
+					return errThree
+				}
+			}
+		}
+
+		var out_count int64
+		var cancel_count int64
+		//查询出库数据
+		infoCountList, _ := FindDrugWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		//查询退库数据
+		cancelInfoList, _ := FindDrugCancelOutInfo(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		for _, item := range infoCountList {
+			out_count += item.Count
+		}
+
+		for _, item := range cancelInfoList {
+			cancel_count += item.Count
+		}
+
+		fmt.Println("deliver_number", deliver_number)
+		fmt.Println("out_count", out_count)
+		fmt.Println("cancel_count", cancel_count)
+		//如果本次出库数据大于历史出库数据 新增1条流水
+		if deliver_number > (out_count - cancel_count) {
+			drugflow := models.DrugFlow{
+				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+				WarehouseOutId:          warehouseout.ID,
+				DrugId:                  advice.DrugId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+				Price:                   warehouse.RetailPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				BatchNumber:             warehouse.BatchNumber,
+				MaxUnit:                 drup.MinUnit,
+				ConsumableType:          15,
+				IsEdit:                  1,
+				Creator:                 advice.ExecutionStaff,
+				IsSys:                   1,
+				PatientId:               advice.PatientId,
+				SystemTime:              advice.AdviceDate,
+				WarehousingDetailId:     warehouse.ID,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            storeConfig.DrugStorehouseOut,
+				WarehouseOutDetailId:    lastDrugOutInfo.ID,
+				OverCount:               sum_count,
+				AdviceId:                advice.ID,
+				LastPrice:               warehouse.Price,
+				OrderId:                 warehouseout.OrderId,
+			}
+
+			CreateDrugFlowOne(drugflow)
+			//出库数量相加
+			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
+		}
+
+		//如果本次出库数据小于历史出库数据 新增1条退库流水
+		if deliver_number < (out_count - cancel_count) {
+
+			operation_time := time.Now().Unix()
+
+			ctime := time.Now().Unix()
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+			cancelStock := models.DrugCancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        advice.UserOrgId,
+				Creater:      advice.ExecutionStaff,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       0,
+				Manufacturer: 0,
+				Type:         5,
+				StorehouseId: storeConfig.DrugStorehouseOut,
+				IsCheck:      1,
+				OrderId:      warehouseout.OrderId,
+			}
+
+			_, errCode := FindDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
+			if errCode == gorm.ErrRecordNotFound {
+				AddSigleDrugCancelStock(&cancelStock)
+			}
+			lastDrugCancelStock, _ := FindLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
+
+			manufactureName, _ := GetManufactureById(warehouse.Manufacturer)
+			dealer, _ := GetDealerById(warehouse.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    lastDrugCancelStock.ID,
+				DrugId:           advice.DrugId,
+				Count:            (out_count - cancel_count) - deliver_number,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             5,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      warehouse.RetailPrice,
+				RetailTotalPrice: warehouse.RetailTotalPrice,
+				Price:            warehouse.Price,
+				RegisterAccount:  "",
+				Remark:           warehouse.Remark,
+				BatchNumber:      warehouse.BatchNumber,
+				MaxUnit:          drup.MinUnit,
+				ProductDate:      warehouse.ProductDate,
+				ExpiryDate:       warehouse.ExpiryDate,
+				BatchNumberId:    warehouse.ID,
+				StorehouseId:     storeConfig.DrugStorehouseOut,
+				IsCheck:          1,
+				OrderId:          warehouseout.OrderId,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			flow := models.DrugFlow{
+				WarehousingId:           warehouse.ID,
+				DrugId:                  warehouse.DrugId,
+				Number:                  "",
+				BatchNumber:             warehouse.BatchNumber,
+				Count:                   out_count - cancel_count - deliver_number,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              advice.AdviceDate,
+				ConsumableType:          16,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				Creator:                 advice.ExecutionStaff,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.RetailPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       lastDrugCancelStock.ID,
+				ExpireDate:              warehouse.ExpiryDate,
+				ProductDate:             warehouse.ProductDate,
+				MaxUnit:                 drup.MinUnit,
+				MinUnit:                 "",
+				AdviceId:                advice.ID,
+				StorehouseId:            storeConfig.DrugStorehouseOut,
+				LastPrice:               warehouse.Price,
+				OverCount:               sum_count,
+				OrderId:                 warehouseout.OrderId,
+			}
+			CreateDrugFlowOne(flow)
+			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
+			ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+		}
+
+		//查询是否存在数据
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   deliver_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
+		if errTwo != nil {
+			return errTwo
+		}
+		return nil
+
+	} else {
+
+		info := models.XtDrugWarehouseInfo{
+			ID:                warehouse.ID,
+			WarehousingId:     warehouse.WarehousingId,
+			DrugId:            warehouse.DrugId,
+			Number:            warehouse.Number,
+			ProductDate:       warehouse.ProductDate,
+			ExpiryDate:        warehouse.ExpiryDate,
+			WarehousingCount:  warehouse.WarehousingCount,
+			Price:             warehouse.RetailPrice,
+			TotalPrice:        warehouse.TotalPrice,
+			Dealer:            warehouse.Dealer,
+			Manufacturer:      warehouse.Manufacturer,
+			Remark:            warehouse.Remark,
+			Ctime:             warehouse.Ctime,
+			Mtime:             warehouse.Mtime,
+			Status:            1,
+			OrgId:             warehouse.OrgId,
+			IsReturn:          warehouse.IsReturn,
+			WarehousingOrder:  warehouse.WarehousingOrder,
+			Type:              warehouse.Type,
+			RetailPrice:       warehouse.RetailPrice,
+			RetailTotalPrice:  warehouse.RetailPrice,
+			StockMaxNumber:    0,
+			StockMinNumber:    0,
+			BatchNumber:       warehouse.BatchNumber,
+			MaxUnit:           warehouse.MaxUnit,
+			WarehousingInfoId: warehouse.WarehousingInfoId,
+			SupplyWarehouseId: warehouse.SupplyWarehouseId,
+			StorehouseId:      storeConfig.DrugStorehouseOut,
+			IsCheck:           1,
+		}
+		//扣减库存
+		errThree := UpDateDrugWarehouseInfoByStock(&info)
+
+		if errThree != nil {
+			return errThree
+		}
+		//查询剩余库存
+		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    5,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   stock_number,
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			OrderId:                 warehouseout.OrderId,
+		}
+		//查询是否存在出库数据
+		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
+		if errCode == gorm.ErrRecordNotFound {
+
+			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			if errOne != nil {
+				return errOne
+			}
+		}
+		if errCode == nil {
+
+			lastDrugOutInfo, _ := GetSigleDrugWarehouseOutInfoOne(advice.PatientId, advice.AdviceDate, orgID)
+			var his_count int64
+			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
+				his_count = lastDrugOutInfo.Count * drup.MinNumber
+			}
+			if lastDrugOutInfo.CountUnit == drup.MinUnit {
+				his_count = lastDrugOutInfo.Count
+			}
+			if deliver_number != his_count {
+				errThree := UpdateSingleDrugWarehouseOutInfoSix(advice.PatientId, advice.AdviceDate, orgID, warehouseOutInfo, advice.ID)
+				if errThree != nil {
+					return errThree
+				}
+			}
+		}
+
+		lastDrugOutInfo, _ := FindLastDrugWarehouseOutInfo(orgID)
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   stock_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+
+		_, errcodeThree := FindDrugAutoReduceRecordInfo(advice.PatientId, advice.RecordDate, advice.DrugId)
+		if errcodeThree == gorm.ErrRecordNotFound {
+			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
+			if errTwo != nil {
+				return errTwo
+			}
+		}
+		if errcodeThree == nil {
+			UpdateDrugAutoReduceRecordInfo(advice.PatientId, advice.RecordDate, advice.DrugId, details)
+		}
+
+		var out_count int64
+		var cancel_count int64
+		//查询出库数据
+		infoCountList, _ := FindDrugWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		//查询退库数据
+		cancelInfoList, _ := FindDrugCancelOutInfo(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		for _, item := range infoCountList {
+			out_count += item.Count
+		}
+
+		for _, item := range cancelInfoList {
+			cancel_count += item.Count
+		}
+
+		//如果本次出库数据大于历史出库数据 新增1条流水
+		if deliver_number > (out_count - cancel_count) {
+
+			drugflow := models.DrugFlow{
+				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+				WarehouseOutId:          warehouseout.ID,
+				DrugId:                  advice.DrugId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   stock_number,
+				Price:                   warehouse.RetailPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				BatchNumber:             warehouse.BatchNumber,
+				MaxUnit:                 drup.MinUnit,
+				ConsumableType:          15,
+				IsEdit:                  1,
+				Creator:                 advice.ExecutionStaff,
+				IsSys:                   1,
+				PatientId:               advice.PatientId,
+				WarehousingDetailId:     warehouse.ID,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            storeConfig.DrugStorehouseOut,
+				WarehouseOutDetailId:    lastDrugOutInfo.ID,
+				OverCount:               sum_count,
+				AdviceId:                advice.ID,
+				LastPrice:               warehouse.Price,
+				SystemTime:              advice.AdviceDate,
+				OrderId:                 warehouseout.OrderId,
+			}
+
+			CreateDrugFlowOne(drugflow)
+			//出库数量相加
+			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+		}
+
+		if deliver_number < (out_count - cancel_count) {
+			operation_time := time.Now().Unix()
+
+			ctime := time.Now().Unix()
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+			cancelStock := models.DrugCancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        advice.UserOrgId,
+				Creater:      advice.ExecutionStaff,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       0,
+				Manufacturer: 0,
+				Type:         5,
+				StorehouseId: storeConfig.DrugStorehouseOut,
+				IsCheck:      1,
+				OrderId:      warehouseout.OrderId,
+			}
+
+			_, errCode := FindDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
+			if errCode == gorm.ErrRecordNotFound {
+				AddSigleDrugCancelStock(&cancelStock)
+			}
+			lastDrugCancelStock, _ := FindLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
+
+			manufactureName, _ := GetManufactureById(warehouse.Manufacturer)
+			dealer, _ := GetDealerById(warehouse.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    lastDrugCancelStock.ID,
+				DrugId:           advice.DrugId,
+				Count:            (out_count - cancel_count) - deliver_number,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             5,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      warehouse.RetailPrice,
+				RetailTotalPrice: warehouse.RetailTotalPrice,
+				Price:            warehouse.Price,
+				RegisterAccount:  "",
+				Remark:           warehouse.Remark,
+				BatchNumber:      warehouse.BatchNumber,
+				MaxUnit:          drup.MinUnit,
+				ProductDate:      warehouse.ProductDate,
+				ExpiryDate:       warehouse.ExpiryDate,
+				BatchNumberId:    warehouse.ID,
+				StorehouseId:     storeConfig.DrugStorehouseOut,
+				IsCheck:          1,
+				OrderId:          warehouseout.OrderId,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			flow := models.DrugFlow{
+				WarehousingId:           warehouse.ID,
+				DrugId:                  warehouse.DrugId,
+				Number:                  "",
+				BatchNumber:             warehouse.BatchNumber,
+				Count:                   out_count - cancel_count - deliver_number,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               advice.PatientId,
+				SystemTime:              advice.AdviceDate,
+				ConsumableType:          16,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				Creator:                 advice.ExecutionStaff,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.RetailPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       lastDrugCancelStock.ID,
+				ExpireDate:              warehouse.ExpiryDate,
+				ProductDate:             warehouse.ProductDate,
+				MaxUnit:                 drup.MinUnit,
+				MinUnit:                 "",
+				AdviceId:                advice.ID,
+				StorehouseId:            storeConfig.DrugStorehouseOut,
+				LastPrice:               warehouse.Price,
+				OverCount:               sum_count,
+				OrderId:                 warehouseout.OrderId,
+			}
+			CreateDrugFlowOne(flow)
+
+			//退库数量增加
+			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
+			ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+		}
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		overPlusNumber := float64(prescribingNumber_two_temp)
+
+		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
+		advice.PrescribingNumberUnit = drup.MinUnit
+
+		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+	}
+
+	return
+}

service/self_drug_service.go

@@ -2012,7 +2012,7 @@ func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64)
 }
 
 func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
-	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3)")
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type= 15)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	}
@@ -2144,7 +2144,7 @@ func FindEndCancelInfo(good_id int64, orgid int64, endtime int64) (info []*model
 
 func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
-	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3)")
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type = 15)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	}
@@ -2261,7 +2261,7 @@ func DrugWarehouseInfoEnd(drug_id int64, orgid int64, endTime int64) (info []*mo
 
 func DrugWarehouseOutInfoEnd(drug_id int64, orgid int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
 
-	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type = 2 or consumable_type= 3)")
+	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type = 2 or consumable_type= 3 or consumable_type= 15)")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
 	}
@@ -2309,7 +2309,7 @@ func GetDrugWarehouseStartEnd(drug_id int64, orgid int64, startTime int64, endTi
 }
 
 func FindeDrugWarehouseOutInfo(drug_id int64, orgid int64, startTime int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
-	db := XTReadDB().Model(&info).Where("status = 1  and (consumable_type = 2 or consumable_type= 3)")
+	db := XTReadDB().Model(&info).Where("status = 1  and (consumable_type = 2 or consumable_type= 3 or consumable_type= 15 )")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
 	}
@@ -2398,7 +2398,7 @@ func GetDrugFlowSart(drug_id int64, user_org_id int64, ctime int64) (flow []*mod
 
 func GetDrugFlowOut(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlowTwenty, err error) {
 
-	db := XTReadDB().Model(&flow).Where("status = 1  and (consumable_type = 2 or consumable_type= 3)")
+	db := XTReadDB().Model(&flow).Where("status = 1  and (consumable_type = 2 or consumable_type= 3 or consumable_type= 15)")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
 	}

service/stock_service.go

@@ -1620,7 +1620,7 @@ func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime
 		db = db.Where("xt_warehouse_out.storehouse_id = ?", storehouse_id)
 	}
 	if way_type == 0 {
-		db = db.Where("xt_warehouse_out.is_sys = 0 or xt_warehouse_out.is_sys = 1 or xt_warehouse_out.is_sys = 12")
+		db = db.Where("xt_warehouse_out.is_sys = 0 or xt_warehouse_out.is_sys = 1 or xt_warehouse_out.is_sys = 12 or xt_warehouse_out.is_sys = 5")
 	}
 	if way_type == 1 {
 		db = db.Where("xt_warehouse_out.is_sys = 0")
@@ -1631,6 +1631,9 @@ func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime
 	if way_type == 3 {
 		db = db.Where("xt_warehouse_out.is_sys = 12")
 	}
+	if way_type == 4 {
+		db = db.Where("xt_warehouse_out.is_sys = 5")
+	}
 	if check_type > 0 {
 		db = db.Where("xt_warehouse_out.is_check = ?", check_type)
 	}
@@ -1699,7 +1702,7 @@ func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startT
 	}
 
 	if way_type == 0 {
-		db = db.Where("xt_drug_warehouse_out.is_sys = 0 || xt_drug_warehouse_out.is_sys = 1 || xt_drug_warehouse_out.is_sys = 12")
+		db = db.Where("xt_drug_warehouse_out.is_sys = 0 || xt_drug_warehouse_out.is_sys = 1 || xt_drug_warehouse_out.is_sys = 12 || xt_drug_warehouse_out.is_sys = 5")
 	}
 	if way_type == 1 {
 		db = db.Where("xt_drug_warehouse_out.is_sys = 0")
@@ -1710,6 +1713,9 @@ func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startT
 	if way_type == 3 {
 		db = db.Where("xt_drug_warehouse_out.is_sys = 12")
 	}
+	if way_type == 4 {
+		db = db.Where("xt_drug_warehouse_out.is_sys = 15")
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	if orgId == 10191 {
@@ -3137,6 +3143,12 @@ func FindDrugStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out m
 
 }
 
+func FindDrugSettleStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out models.DrugWarehouseOut, err error) {
+	err = readDb.Model(&models.DrugWarehouseOut{}).Where("is_sys = ? AND status = 1 AND org_id = ? AND warehouse_out_time = ?", is_sys, org_id, record_time).First(&out).Error
+	return
+
+}
+
 func FindLastStockInInfoRecord(good_id int64, org_id int64) (in models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("status = 1 AND org_id = ? AND good_id = ?", org_id, good_id).First(&in).Error
 	return
@@ -4243,7 +4255,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 }
 
 func GetOrderDetailStockFlowByStorehouseById(id []string, orgid int64) (list []*models.VmStockFlow, err error) {
-	db := XTReadDB().Model(&list).Where("status = 1 and (consumable_type = 2 or consumable_type = 3)")
+	db := XTReadDB().Model(&list).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type = 15 or consumable_type = 12)")
 	if len(id) > 0 {
 		db = db.Where("warehouse_out_id in (?)", id)
 	}
@@ -4256,7 +4268,7 @@ func GetOrderDetailStockFlowByStorehouseById(id []string, orgid int64) (list []*
 
 func GetOrderDetailStockFlow(id []string, orgid int64) (list []*models.VmStockFlow, err error) {
 
-	db := XTReadDB().Model(&list).Where("status = 1 and (consumable_type = 2 or consumable_type = 3)")
+	db := XTReadDB().Model(&list).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type = 15 or consumable_type = 12)")
 	if len(id) > 0 {
 		db = db.Where("warehouse_out_id in (?)", id)
 	}
@@ -4308,6 +4320,14 @@ func GetGoodInformationByGoodId(good_id int64) (models.GoodInfo, error) {
 	err := XTReadDB().Where("id = ? and status = 1", good_id).Find(&info).Error
 	return info, err
 }
+
+func GetGoodInformationByGoodIdThirty(good_id int64) (models.GoodInformationThirty, error) {
+
+	info := models.GoodInformationThirty{}
+	err := XTReadDB().Where("id = ? and status = 1", good_id).Find(&info).Error
+	return info, err
+}
+
 func UpdateGoodInfoList(info models.GoodInfo, id int64) error {
 
 	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"total": info.Total}).Error
@@ -4784,7 +4804,7 @@ func GetStockFlowBatchNumber(id int64, goodid int64) (stock []*models.VmStockFlo
 
 func GetStockFlowBatchNumberOne(id int64, goodid int64) (stock []*models.VmStockFlowOne, err error) {
 
-	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1 and x.count > 0 and (x.consumable_type = 3 or x.consumable_type = 2)")
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1 and x.count > 0 and (x.consumable_type = 3 or x.consumable_type = 2 or x.consumable_type = 15)")
 	table := XTReadDB().Table("xt_patients as t").Where("t.status = 1")
 	fmt.Println(table)
 	tableone := XTReadDB().Table("xt_good_information as o").Where("o.status = 1")
@@ -5034,6 +5054,12 @@ func GetStockFlowIsBatchNumber(warehousing_id int64, patient_id int64, record_ti
 	return flow, nil
 }
 
+func GetStockFlowIsBatchNumberSix(patient_id int64, record_time int64, good_id int64, project_id int64) (flow []*models.VmStockFlow, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and system_time = ? and good_id = ? and status = 1 and consumable_type = 3 and project_id = ?", patient_id, record_time, good_id, project_id).Find(&flow).Error
+	return flow, nil
+}
+
 func GetStockFlowIsBatchNumberTwo(patient_id int64, record_time int64, good_id int64) (flow []*models.WarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and good_id = ? and status = 1 ", patient_id, record_time, good_id).Find(&flow).Error
@@ -5123,6 +5149,9 @@ func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int6
 		if consumable_type == 13 {
 			db = db.Where(" consumable_type = ?", consumable_type)
 		}
+		if consumable_type == 15 {
+			db = db.Where(" consumable_type = ?", consumable_type)
+		}
 	}
 	if orgId > 0 {
 		db = db.Where("user_org_id = ?", orgId)
@@ -5251,6 +5280,10 @@ func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime i
 			db = db.Where("consumable_type = 13")
 		}
 
+		if stock_type == 15 {
+			db = db.Where("consumable_type = 15")
+		}
+
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Preload("XtDrugWarehouseOutInfo", "status = 1").Find(&drug_flow).Error
 	return drug_flow, total, err
@@ -8132,7 +8165,13 @@ func UpdatePharyConfig(orgid int64, is_open int64) (models.PharmacyConfig, error
 
 func UpdateSettleOpenConfigOne(id int64, is_open int64) error {
 
-	err := XTWriteDB().Model(&models.HisSettleStockConfig{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_open": is_open}).Error
+	err := XTWriteDB().Model(&models.HisSettleStockConfig{}).Where("user_org_id = ? and status = 1", id).Update(map[string]interface{}{"is_open": is_open}).Error
+	return err
+}
+
+func UpdateSettleOpenConfigTwo(id int64, is_open int64) error {
+
+	err := XTWriteDB().Model(&models.HisSettleStockConfig{}).Where("user_org_id = ? and status = 1", id).Update(map[string]interface{}{"is_open": is_open}).Error
 	return err
 }
 
@@ -8163,3 +8202,141 @@ func GetBloodDocById(id int64, orgid int64) (models.DoctorAdvice, error) {
 	err := XTReadDB().Where("id = ? and user_org_id= ? and status = 1", id, orgid).Find(&advice).Error
 	return advice, err
 }
+
+func FindAllSettleWarehouseOut(org_id int64, warehouse_out_time int64, is_sys int64) (models.WarehouseOut, error) {
+
+	out := models.WarehouseOut{}
+	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ? and is_sys = ?", org_id, warehouse_out_time, is_sys).Find(&out).Error
+	return out, err
+
+}
+
+func GetGoodOutOpenConfig(user_org_id int64) (*models.XtGoodOutConfig, error) {
+
+	config := models.XtGoodOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
+func CreateGoodOutOpenConfig(good models.XtGoodOutConfig) error {
+
+	err := XTWriteDB().Create(&good).Error
+	return err
+}
+
+func UpdateGoodOutOpenConfig(id int64, good models.XtGoodOutConfig) error {
+
+	err := XTWriteDB().Model(&good).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"is_open": good.IsOpen}).Error
+	return err
+}
+
+func FindGoodOutConfigById(user_org_id int64) (models.XtGoodOutConfig, error) {
+
+	config := models.XtGoodOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
+	return config, err
+}
+
+func UpdateGoodAutoConfig(user_org_id int64) error {
+
+	gobalConfig := models.GobalConfig{}
+	err := XTWriteDB().Model(&gobalConfig).Where("org_id = ? and status = 1", user_org_id).Updates(map[string]interface{}{"is_open": 2}).Error
+	return err
+}
+
+func UpdateGoodOutConfig(user_org_id int64) error {
+
+	config := models.XtGoodOutConfig{}
+	err := XTWriteDB().Model(&config).Where("user_org_id = ? and status = 1", user_org_id).Updates(map[string]interface{}{"is_open": 2}).Error
+	return err
+}
+
+func GetHisGoodList(patient_id int64, record_date int64, orgid int64) (info []*models.GoodHisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and record_date = ? and status = 1 and user_org_id = ? AND type = 3", patient_id, record_date, orgid).Find(&info).Error
+	return info, err
+}
+
+func GetLastGoodWarehouseOutInfoByProjectId(good_id int64, patient_id int64, sys_record_time int64, project_id int64) (good []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and patient_id = ? and sys_record_time = ? and project_id = ? and status = 1", good_id, patient_id, sys_record_time, project_id).Find(&good).Error
+	return good, err
+}
+
+func ModifyGoodWarehouseInfo(good_id int64, warehouse_info_id int64, orgid int64, count int64) error {
+
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and org_id = ? and good_id = ? and status = 1", warehouse_info_id, orgid, good_id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	return err
+}
+
+func DeleteGoodWarehouseOutInfo(good_id int64, sys_record_time int64, org_id int64, project_id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("good_id = ? and sys_record_time = ? and org_id = ? and project_id = ? and status=1", good_id, sys_record_time, org_id, project_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func FindPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (models.WarehouseOut, error) {
+
+	out := models.WarehouseOut{}
+	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ?", org_id, warehouse_out_time).Find(&out).Error
+	return out, err
+
+}
+
+func FindLastPrescriptionWarehouseOut(org_id int64, warehouse_out_time int64) (models.WarehouseOut, error) {
+
+	out := models.WarehouseOut{}
+	err = readDb.Model(&models.WarehouseOut{}).Where("org_id = ?  and status = 1 and warehouse_out_time = ?", org_id, warehouse_out_time).Last(&out).Error
+	return out, err
+
+}
+
+func GetGoodTypeObj(goodid int64, org_id int64) (models.GoodsType, error) {
+
+	goodsType := models.GoodsType{}
+	err := XTReadDB().Where("good_id = ? and org_id = ? and status = 1", goodid, org_id).Find(&goodsType).Error
+	return goodsType, err
+}
+
+func GetSencondeGoodWarehouseInfo(good_id int64, org_id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and org_id= ? and status= 1 and is_check = 1", good_id, org_id).Find(&info).Error
+	return info, err
+}
+
+func UpdateGoodSumCountSeven(sum_count int64, good_id int64, orgid int64) error {
+	ut := writeDb.Begin()
+	err := ut.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", good_id, orgid).Updates(map[string]interface{}{"sum_count": sum_count}).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func GetWarehouseOutInfoIsExistOTwo(good_id int64, patient_id int64, record_time int64, project_id int64) (*models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	var err error
+	err = XTReadDB().Model(&info).Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ?", good_id, record_time, patient_id, project_id).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func GetWarehouseOutInfoIsExistThree(good_id int64, patient_id int64, record_time int64, project_id int64) (models.WarehouseOutInfo, error) {
+	info := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ?", good_id, record_time, patient_id, project_id).Find(&info).Error
+	return info, err
+}