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

controllers/dialysis_api_controller.go

@@ -3464,7 +3464,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 46 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 46 || template.TemplateId == 54 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -3493,7 +3493,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
@@ -3502,7 +3502,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
-	if template.TemplateId == 47 {
+	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}
 

controllers/gobal_config_api_controller.go

@@ -2245,7 +2245,7 @@ func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 
 	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids, admin.CurrentOrgId)
-
+	fmt.Println("drug_warhouse_out9999999", drug_warhouse_out)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":              info,
 		"warehousing":       warehousing,

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 {
+	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 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1002,8 +1002,10 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	catheter := c.GetString("catheter")
 	complications := c.GetString("complication")
 	remark := c.GetString("remark")
-	dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
-
+	//dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
+	dialysis_intakes := c.GetString("dialysis_intakes")
+	dialysateVolume, _ := strconv.ParseFloat(dialysis_intakes, 64)
+	fmt.Println("dialysateVolumewode 23323233223232wode", dialysateVolume)
 	dialysis_intakes_unit, _ := c.GetInt64("dialysis_intakes_unit", 0)
 
 	blood_access_part_id, _ := c.GetInt64("blood_access_part_id", 0)
@@ -1222,6 +1224,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
+		fmt.Println("err233332323232232323", err)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
@@ -2911,7 +2914,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
-			if template.TemplateId == 46 {
+			if template.TemplateId == 46 || template.TemplateId == 54 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -2933,7 +2936,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -2941,7 +2944,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 47 {
+	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}
 
@@ -4008,7 +4011,6 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 		//查询是否有库存
 		for _, item := range dialysisBefor {
-			fmt.Println("houseconfig233232323232232332323223233", houseConfig.StorehouseOutInfo)
 			_, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId, houseConfig.StorehouseOutInfo)
 
 			if err == gorm.ErrRecordNotFound {
@@ -4031,8 +4033,6 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
-		//fmt.Println("dialysisBefor9999999999999999999", dialysisBefor, active)
-
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {
@@ -4053,15 +4053,25 @@ func (c *DialysisAPIController) CreateConsumables() {
 				service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 				err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
 				//查询默认仓库
-				houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-				goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
-				var sum_count int64
-				var sum_in_count int64
-				for _, it := range goodList {
-					sum_count += it.StockCount
-					sum_in_count += it.WarehousingCount
+				//houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+				//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+				//var sum_count int64
+				//var sum_in_count int64
+				//for _, it := range goodList {
+				//	sum_count += it.StockCount
+				//	sum_in_count += it.WarehousingCount
+				//}
+				//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+				//查询默认仓库
+				storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+				stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminUser.Org.Id)
+				var total_count int64
+				for _, it := range stockList {
+					total_count += it.StockCount
 				}
-				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+				//基础库插入数据
+				service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminUser.Org.Id)
+
 			}
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -4153,15 +4163,24 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 							service.CreateDialysisBeforePrepareOne(&prepare)
 							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range goodList {
-								sum_count += it.StockCount
-								sum_in_count += it.WarehousingCount
+							//houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+							//var sum_count int64
+							//var sum_in_count int64
+							//for _, it := range goodList {
+							//	sum_count += it.StockCount
+							//	sum_in_count += it.WarehousingCount
+							//}
+							//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+
+							storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminUser.Org.Id)
+							var total_count int64
+							for _, it := range stockList {
+								total_count += it.StockCount
 							}
-							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+							//基础库插入数据
+							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminUser.Org.Id)
 						}
 					}
 
@@ -4189,15 +4208,23 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 							service.CreateDialysisBeforePrepareOne(&prepare)
 							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range goodList {
-								sum_count += it.StockCount
-								sum_in_count += it.WarehousingCount
+							//houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+							//var sum_count int64
+							//var sum_in_count int64
+							//for _, it := range goodList {
+							//	sum_count += it.StockCount
+							//	sum_in_count += it.WarehousingCount
+							//}
+							//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+							storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminUser.Org.Id)
+							var total_count int64
+							for _, it := range stockList {
+								total_count += it.StockCount
 							}
-							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+							//基础库插入数据
+							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminUser.Org.Id)
 						}
 						if err != nil {
 							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
@@ -4307,6 +4334,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				Type:                    1,
 				IsSys:                   1,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			err := service.AddSigleWarehouseOut(&warehouseOut)
 			if err != nil {
@@ -4339,16 +4367,16 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					//清空准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)
+
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-					var sum_count int64
-					var sum_in_count int64
-					for _, it := range goodList {
-						sum_count += it.StockCount
-						sum_in_count += it.WarehousingCount
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+					var total_count int64
+					for _, it := range stockList {
+						total_count += it.StockCount
 					}
-					service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+					//基础库插入数据
+					service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 				}
 			}
 			//
@@ -4379,16 +4407,16 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 					//清空准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)
+
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-					var sum_count int64
-					var sum_in_count int64
-					for _, it := range goodList {
-						sum_count += it.StockCount
-						sum_in_count += it.WarehousingCount
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+					var total_count int64
+					for _, it := range stockList {
+						total_count += it.StockCount
 					}
-					service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+					//基础库插入数据
+					service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 
 				}
 			}
@@ -4502,15 +4530,25 @@ func (c *DialysisAPIController) EditConsumables() {
 					if item.Count < goodInfo.Count {
 						//出库
 						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
-						houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-						goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range goodList {
-							sum_count += it.StockCount
-							sum_in_count += it.WarehousingCount
+						//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+						//var sum_count int64
+						//var sum_in_count int64
+						//for _, it := range goodList {
+						//	sum_count += it.StockCount
+						//	sum_in_count += it.WarehousingCount
+						//}
+						//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+
+						//查询默认仓库
+						storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+						var total_count int64
+						for _, it := range stockList {
+							total_count += it.StockCount
 						}
-						service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+						//基础库插入数据
+						service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 						break
 					}
 
@@ -4555,15 +4593,23 @@ func (c *DialysisAPIController) EditConsumables() {
 							return
 						} else {
 							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-							houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range goodList {
-								sum_count += it.StockCount
-								sum_in_count += it.WarehousingCount
+							//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+							//var sum_count int64
+							//var sum_in_count int64
+							//for _, it := range goodList {
+							//	sum_count += it.StockCount
+							//	sum_in_count += it.WarehousingCount
+							//}
+							//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+							storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+							var total_count int64
+							for _, it := range stockList {
+								total_count += it.StockCount
 							}
-							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+							//基础库插入数据
+							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 							break
 						}
 					}
@@ -4590,15 +4636,24 @@ func (c *DialysisAPIController) EditConsumables() {
 
 					service.CreateDialysisBeforePrepareOne(&prepare)
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, it.GoodId, adminInfo.Org.Id)
-					var sum_count int64
-					var sum_in_count int64
-					for _, it := range goodList {
-						sum_count += it.StockCount
-						sum_in_count += it.WarehousingCount
+					//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, it.GoodId, adminInfo.Org.Id)
+					//var sum_count int64
+					//var sum_in_count int64
+					//for _, it := range goodList {
+					//	sum_count += it.StockCount
+					//	sum_in_count += it.WarehousingCount
+					//}
+					//service.UpdateGoodByGoodId(it.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					stockList, _ := service.GetStockCountByGoodId(it.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+					var total_count int64
+					for _, it := range stockList {
+						total_count += it.StockCount
 					}
-					service.UpdateGoodByGoodId(it.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+					//基础库插入数据
+					service.UpdateGoodInfoReduceSumCount(it.GoodId, total_count, adminInfo.Org.Id)
 
 					if err != nil {
 						goodObj, _ := service.GetGoodInformationByGoodId(it.GoodId)
@@ -4922,15 +4977,25 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 		service.CreateDialysisBeforePrepareOne(&prepare)
 
 		//查询默认仓库
-		houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-		var sum_count int64
-		var sum_in_count int64
-		for _, it := range goodList {
-			sum_count += it.StockCount
-			sum_in_count += it.WarehousingCount
+		//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+		//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+		//var sum_count int64
+		//var sum_in_count int64
+		//for _, it := range goodList {
+		//	sum_count += it.StockCount
+		//	sum_in_count += it.WarehousingCount
+		//}
+		//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+
+		//查询默认仓库
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+		stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+		var total_count int64
+		for _, it := range stockList {
+			total_count += it.StockCount
 		}
-		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+		//基础库插入数据
+		service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 
 	}
 
@@ -5317,6 +5382,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 		PatientId:               good_yc.PatientId,
 		ConsumableType:          2,
 		StorehouseId:            houseConfig.StorehouseOutInfo,
+		IsCheck:                 1,
 	}
 	warehouseOutInfo.Count = count
 
@@ -5580,6 +5646,7 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 				Type:                    1,
 				IsSys:                   1,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			err := service.AddSigleWarehouseOut(&warehouseOut)
 			if err != nil {
@@ -5653,6 +5720,7 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 			GoodTypeId:              good_yc.GoodTypeId,
 			GoodId:                  good_yc.GoodId,
 			StorehouseId:            warehouseOut.StorehouseId,
+			IsCheck:                 1,
 		}
 		warehouseOutInfo.Count = delete_count
 		stockInInfo, _ := service.FindLastStockInInfoRecord(good_yc.GoodId, orgID)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -686,6 +686,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
 
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.Org.Id)
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
@@ -740,6 +741,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								})
 								return
 							}
+							fmt.Println("total23323232323232323232", total)
+							fmt.Println("total23323232323232323232", prescribing_number_total)
 							if prescribing_number_total <= total {
 
 								//查询是否出库按钮开启
@@ -750,43 +753,26 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									if prescriptionConfig.IsOpen == 1 {
 										if medical.IsUse == 2 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-											//查询默认仓库
-											houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-											//查询默认仓库剩余多少库存
-											list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+
+											//更新字典里面的库存
+											stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 											var sum_count int64
-											var sum_in_count int64
-											for _, it := range list {
-												baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-												if it.MaxUnit == baseDrug.MaxUnit {
-													it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-													it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-												}
-												sum_count += it.StockMaxNumber + it.StockMinNumber
-												sum_in_count += it.WarehousingCount
+											for _, its := range stockInfo {
+												sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 											}
-											service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+											service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 										}
 									}
 								} else {
 									if medical.IsUse == 2 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-										//查询默认仓库
-										houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-										//查询默认仓库剩余多少库存
-										list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+
+										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 										var sum_count int64
-										var sum_in_count int64
-										for _, it := range list {
-											baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-											if it.MaxUnit == baseDrug.MaxUnit {
-												it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-												it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-											}
-											sum_count += it.StockMaxNumber + it.StockMinNumber
-											sum_in_count += it.WarehousingCount
+										for _, its := range stockInfo {
+											sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 										}
-										service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+										service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 									}
 								}
 							}
@@ -863,22 +849,14 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if prescribing_number_total <= total {
 								if medical.IsUse == 2 {
 									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-									//查询默认仓库
-									houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-									//查询默认仓库剩余多少库存
-									list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+
+									//更新字典里面的库存
+									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 									var sum_count int64
-									var sum_in_count int64
-									for _, it := range list {
-										baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-										if it.MaxUnit == baseDrug.MaxUnit {
-											it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-											it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-										}
-										sum_count += it.StockMaxNumber + it.StockMinNumber
-										sum_in_count += it.WarehousingCount
+									for _, its := range stockInfo {
+										sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 									}
-									service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "1",
 										"advice": advice,
@@ -1074,6 +1052,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			//药品管理信息
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 			if drugStockConfig.IsOpen == 1 {
 				for _, item := range advices {
 					//查询改药品信息
@@ -1119,68 +1098,61 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 					var total int64
 					var prescribing_number_total int64
-					//查询该药品是否有库存
-					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
-					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
-
-					//判断单位是否相等
-					if medical.MaxUnit == advice.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						//转化为最小单位
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count * medical.MinNumber
-					}
-					//fmt.Println("医嘱开的数量", total)
-					if medical.MinUnit == advice.PrescribingNumberUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						total = list.Count*medical.MinNumber + list.StockMinNumber
-						prescribing_number_total = count
-					}
 
-					//fmt.Println("数量一", prescribing_number_total)
-					//fmt.Println("数量二", total)
+					config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
+					if config.IsOpen != 1 {
+						//查询该药品是否有库存
+						houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+						list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+
+						//判断单位是否相等
+						if medical.MaxUnit == advice.PrescribingNumberUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							//转化为最小单位
+							total = list.Count*medical.MinNumber + list.StockMinNumber
+							prescribing_number_total = count * medical.MinNumber
+						}
+						//fmt.Println("医嘱开的数量", total)
+						if medical.MinUnit == advice.PrescribingNumberUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							total = list.Count*medical.MinNumber + list.StockMinNumber
+							prescribing_number_total = count
+						}
 
-					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "3",
-							"advice": advice,
-							"ids":    ids,
-						})
-						return
-					}
-					if prescribing_number_total > total {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "2",
-							"advice": advice,
-							"ids":    ids,
-						})
-						return
-					}
-					if prescribing_number_total <= total {
-						if medical.IsUse == 2 {
-							config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
-							if config.IsOpen != 1 {
-								service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-								//查询默认仓库
-								houseConfig, _ := service.GetAllStoreHouseConfig(medical.OrgId)
-								//查询默认仓库剩余多少库存
-								list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, medical.OrgId, medical.ID)
-								var sum_count int64
-								var sum_in_count int64
-								for _, it := range list {
-									baseDrug, _ := service.GetBaseDrugMedical(medical.ID)
-									if it.MaxUnit == baseDrug.MaxUnit {
-										it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-										it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "3",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
+						}
+						if prescribing_number_total > total {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": advice,
+								"ids":    ids,
+							})
+							return
+						}
+
+						if prescribing_number_total <= total {
+							if medical.IsUse == 2 {
+
+								if config.IsOpen != 1 {
+									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+									//更新字典里面的库存
+									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+									var sum_count int64
+									for _, its := range stockInfo {
+										sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 									}
-									sum_count += it.StockMaxNumber + it.StockMinNumber
-									sum_in_count += it.WarehousingCount
+									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 								}
-								service.UpdateMedicalSumCount(medical.ID, sum_count, sum_in_count, medical.OrgId)
-							}
 
+							}
 						}
 					}
 				}
@@ -3397,7 +3369,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
-
+	lastWeight, _ := service.MobileGetLast(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"users":                   adminUser,
@@ -3417,6 +3389,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"last_order":              last_order,
 			"projects":                projects,
 			"project_config":          project_config,
+			"lastWeight":              lastWeight,
 		})
 	}
 
@@ -3439,6 +3412,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"last_order":              last_order,
 			"projects":                projects,
 			"project_config":          project_config,
+			"lastWeight":              lastWeight,
 		})
 	}
 

controllers/patient_api_controller.go

@@ -1608,18 +1608,135 @@ func (c *PatientApiController) ExecGroupAdvice() {
 	exceAdvice := models.DoctorAdvice{
 		ExecutionStaff: executionStaff,
 		ExecutionTime:  theTime.Unix(),
-		// Checker:        checker,
-		UpdatedTime: time.Now().Unix(),
+		UpdatedTime:    time.Now().Unix(),
 	}
 	err = service.ExceDoctorAdviceByGroupNo(&exceAdvice, groupNo, adminUserInfo.CurrentOrgId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
 		return
 	}
 
+	//查询自动扣减是否开启
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
+	//查询已经执行的医嘱
+	advicelist, _ := service.GetExceDoctorAdviceGroupNo(groupNo, adminUserInfo.CurrentOrgId)
+
+	if drugStockConfig.IsOpen == 1 {
+		for _, item := range advicelist {
+			medical, _ := service.GetBaseDrugMedical(advice.DrugId)
+			//查询这个患者这个患者这个药已经出库的所有数量
+			advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+			drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+			var total_count int64
+			var drug_count int64
+			for _, it := range advicelist {
+				if it.PrescribingNumberUnit == medical.MaxUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+					prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total_count += prenumber * medical.MinNumber
+				}
+				if it.PrescribingNumberUnit == medical.MinUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+					prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					total_count += prenumber
+				}
+
+			}
+
+			for _, its := range drugoutlist {
+				if its.CountUnit == medical.MaxUnit {
+					drug_count += its.Count * medical.MinNumber
+				}
+				if its.CountUnit == medical.MinUnit {
+					drug_count += its.Count
+				}
+			}
+			if total_count == drug_count {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+				})
+				return
+			}
+
+			var total int64
+			var prescribing_number_total int64
+
+			//查询默认出库仓库
+			houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+
+			//查询该药品在默认仓库是否有库存
+			list, _ := service.GetDrugTotalCountTwenty(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+
+			//判断单位是否相等
+			if medical.MaxUnit == advice.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//转化为最小单位
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+				prescribing_number_total = count * medical.MinNumber
+			}
+
+			if medical.MinUnit == advice.PrescribingNumberUnit {
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				total = list.Count*medical.MinNumber + list.StockMinNumber
+
+				prescribing_number_total = count
+
+			}
+
+			if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "3",
+					"advice": advice,
+				})
+				return
+			}
+			if prescribing_number_total > total {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "2",
+					"advice": advice,
+				})
+				return
+			}
+			if prescribing_number_total <= total {
+				if medical.IsUse == 2 {
+					service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+					//查询默认仓库剩余多少库存
+					var sum_count int64
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					for _, its := range stockInfo {
+						sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					break
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+
+				}
+
+				if medical.IsUse == 1 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+				}
+
+			}
+
+		}
+	}
+
 	advice.ExecutionStaff = executionStaff
 	advice.ExecutionTime = theTime.Unix()
-	// advice.Checker = checker
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":    "ok",
@@ -1665,7 +1782,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 
 		executionStaff := adminUserInfo.AdminUser.Id
-		// checker := adminUserInfo.AdminUser.Id
 
 		timeLayout := "2006-01-02 15:04:05"
 		loc, _ := time.LoadLocation("Local")
@@ -1684,8 +1800,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		exceAdvice := models.DoctorAdvice{
 			ExecutionStaff: executionStaff,
 			ExecutionTime:  theTime.Unix(),
-			// Checker:        checker,
-			UpdatedTime: time.Now().Unix(),
+			UpdatedTime:    time.Now().Unix(),
 		}
 		if advice.ParentId > 0 {
 			err = service.ExceDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
@@ -1738,7 +1853,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		advice.ExecutionStaff = executionStaff
 		advice.ExecutionTime = theTime.Unix()
-		// advice.Checker = checker
 
 		//处理出库相关逻辑
 
@@ -1750,6 +1864,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
 
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 		if drugStockConfig.IsOpen == 1 {
 			var total int64
 			var prescribing_number_total int64
@@ -1795,29 +1910,24 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
 
 					adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
-					if adviceSetting.IsAdviceOpen == 1 {
 
+					if adviceSetting.IsAdviceOpen == 1 {
 						//查询是否出库按钮开启
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
+						fmt.Println("prescriptionConfigwodweweeeweweweweweewewewwewew", prescriptionConfig.IsOpen)
 						if prescriptionConfig.IsOpen == 1 {
 							if medical.IsUse == 2 {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 								//查询默认仓库
-								houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 								//查询默认仓库剩余多少库存
-								list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 								var sum_count int64
-								var sum_in_count int64
-								for _, it := range list {
-									baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-									if it.MaxUnit == baseDrug.MaxUnit {
-										it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-										it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-									}
-									sum_count += it.StockMaxNumber + it.StockMinNumber
-									sum_in_count += it.WarehousingCount
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								for _, its := range stockInfo {
+									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 								}
-								service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 								break
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
@@ -1845,22 +1955,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					} else {
 						if medical.IsUse == 2 {
 							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-							//查询默认仓库剩余多少库存
-							list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							//更新字典里面的库存
 							var sum_count int64
-							var sum_in_count int64
-							for _, it := range list {
-								baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-								if it.MaxUnit == baseDrug.MaxUnit {
-									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-								}
-								sum_count += it.StockMaxNumber + it.StockMinNumber
-								sum_in_count += it.WarehousingCount
+							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							for _, its := range stockInfo {
+								sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 							}
-							service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 							break
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",
@@ -1885,9 +1986,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			if item.Way == 2 {
 				if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
-
-					//adviceName, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
-
 					if item.ExecutionState == 1 {
 						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
@@ -1978,8 +2076,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		exceAdvice := models.HisDoctorAdviceInfo{
 			ExecutionStaff: executionStaff,
 			ExecutionTime:  theTime.Unix(),
-			// Checker:        checker,
-			UpdatedTime: time.Now().Unix(),
+			UpdatedTime:    time.Now().Unix(),
 		}
 		if advice.ParentId > 0 {
 			err = service.ExceHidDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
@@ -2031,7 +2128,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		advice.ExecutionStaff = executionStaff
 		advice.ExecutionTime = theTime.Unix()
-		// advice.Checker = checker
 
 		//处理出库相关逻辑
 
@@ -2039,131 +2135,128 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
-
+		fmt.Println("h2h332o2o23o32o32o32oo32o23o23o23o23o23o32o23o232o3wode", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
-			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
+			advices, _ := service.GetHisExecutionDoctorsTwo(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
-
 				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
 				//查询这个患者这个患者这个药已经出库的所有数量
-				advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-				drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
-				var total_count int64
-				var drug_count int64
-				for _, it := range advicelist {
-					if it.PrescribingNumberUnit == medical.MaxUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-						prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						total_count += prenumber * medical.MinNumber
-					}
-					if it.PrescribingNumberUnit == medical.MinUnit {
-						prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
-						prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-						total_count += prenumber
-					}
-
-				}
-
-				for _, its := range drugoutlist {
-					if its.CountUnit == medical.MaxUnit {
-						drug_count += its.Count * medical.MinNumber
-					}
-					if its.CountUnit == medical.MinUnit {
-						drug_count += its.Count
-					}
-				}
-				if total_count == drug_count {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
-						"advice": advice,
-					})
-					return
-				}
+				//advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+				//drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+				//var total_count int64 // 现在出库的
+				//var drug_count int64  // 已经出库的
+				//for _, it := range advicelist {
+				//	if it.PrescribingNumberUnit == medical.MaxUnit {
+				//		prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+				//		prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//		total_count += prenumber * medical.MinNumber
+				//	}
+				//	if it.PrescribingNumberUnit == medical.MinUnit {
+				//		prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+				//		prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//		total_count += prenumber
+				//	}
+				//
+				//}
+				//
+				//
+				//for _, its := range drugoutlist {
+				//	if its.CountUnit == medical.MaxUnit {
+				//		drug_count += its.Count * medical.MinNumber
+				//	}
+				//	if its.CountUnit == medical.MinUnit {
+				//		drug_count += its.Count
+				//	}
+				//}
+				//fmt.Println("total_count23232323232323232wode",total_count)
+				//fmt.Println("total_count23232323232323232wode",drug_count)
+				//if total_count == drug_count {
+				//	c.ServeSuccessJSON(map[string]interface{}{
+				//		"msg":    "1",
+				//		"advice": advice,
+				//	})
+				//	return
+				//}
 
 				var total int64
 				var prescribing_number_total int64
+				config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
+				if config.IsOpen != 1 {
+					//查询默认出库仓库
+					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+
+					//查询该药品在默认仓库是否有库存
+					list, _ := service.GetDrugTotalCountTwenty(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
+
+					//判断单位是否相等
+					if medical.MaxUnit == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						//转化为最小单位
+						total = list.Count*medical.MinNumber + list.StockMinNumber
+						prescribing_number_total = count * medical.MinNumber
+					}
 
-				//查询默认出库仓库
-				houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
-
-				//查询该药品在默认仓库是否有库存
-				list, _ := service.GetDrugTotalCountTwenty(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
-
-				//判断单位是否相等
-				if medical.MaxUnit == advice.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					//转化为最小单位
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-					prescribing_number_total = count * medical.MinNumber
-				}
-
-				if medical.MinUnit == advice.PrescribingNumberUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					total = list.Count*medical.MinNumber + list.StockMinNumber
-
-					prescribing_number_total = count
+					if medical.MinUnit == advice.PrescribingNumberUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total = list.Count*medical.MinNumber + list.StockMinNumber
 
-				}
+						prescribing_number_total = count
 
-				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "3",
-						"advice": advice,
-					})
-					return
-				}
-				if prescribing_number_total > total {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "2",
-						"advice": advice,
-					})
-					return
-				}
-				if prescribing_number_total <= total {
-					if medical.IsUse == 2 {
-						config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
+					}
 
-						if config.IsOpen != 1 {
-							service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "3",
+							"advice": advice,
+						})
+						return
+					}
+					fmt.Println("prescribing_number_totalwodeeeeeeeeeeeeee", prescribing_number_total)
+					fmt.Println("total3233332323223322323322323", total)
+					if prescribing_number_total > total {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "2",
+							"advice": advice,
+						})
+						return
+					}
 
-							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-							//查询默认仓库剩余多少库存
-							list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range list {
-								baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-								if it.MaxUnit == baseDrug.MaxUnit {
-									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+					if prescribing_number_total <= total {
+						if medical.IsUse == 2 {
+							fmt.Println("config233232323232232333223232332323233223322232wode", config.IsOpen)
+							if config.IsOpen != 1 {
+								service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+								//查询默认仓库
+								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+								//查询默认仓库剩余多少库存
+								var sum_count int64
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								for _, its := range stockInfo {
+									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 								}
-								sum_count += it.StockMaxNumber + it.StockMinNumber
-								sum_in_count += it.WarehousingCount
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+								break
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+								})
+								return
 							}
-							service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
-							break
+						}
+
+						if medical.IsUse == 1 {
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",
 								"advice": advice,
 							})
 							return
 						}
-					}
 
-					if medical.IsUse == 1 {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg":    "1",
-							"advice": advice,
-						})
-						return
 					}
-
 				}
-
 			}
 
 		}

controllers/print_data_api_controller.go

@@ -209,6 +209,7 @@ func (this *PrintDataAPIController) GetGoodDetailPrintList() {
 	if types == 2 {
 		//list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
 		list, _ := service.GetWarehouseOutInfoPrintList(adminUserInfo.CurrentOrgId, startTime, endTime)
+		fmt.Println("list23323232233232", list)
 		stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/secondary_order_api_contorller.go

@@ -1086,6 +1086,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						StorehouseId:            item.StorehouseOutId,
 						SecondWarehouseId:       item.WarehouseId,
 						IsSys:                   12,
+						IsCheck:                 1,
 					}
 					_, drugerrcodes := service.GetDrugWarehouseBySyS(orgId, 12, item.WarehouseId, record_date)
 
@@ -1120,6 +1121,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						WarehouseInfoId:         0,
 						StorehouseId:            item.StorehouseOutId,
 						SecondWarehouseInfoId:   item.ID,
+						IsCheck:                 1,
 					}
 					drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
 
@@ -1140,6 +1142,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						StorehouseId:      item.StorehouseInId,
 						IsSys:             13,
 						SecondWarehouseId: item.WarehouseId,
+						IsCheck:           1,
 					}
 
 					//查询该调拨单是否有生成入库单
@@ -1175,26 +1178,19 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						RetailPrice:           0,
 						StorehouseId:          item.StorehouseInId,
 						SecondWarehouseInfoId: item.ID,
+						IsCheck:               1,
 					}
 					service.AutoDrugDeliverInfoTwelve(orgId, item.Count, &drugWarehouseOut, &drup, warehouseOutInfo, drugwarehouseInfo)
 
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-					//查询默认仓库剩余多少库存
-					list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ProjectId)
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+					//更新字典里面的库存
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.ProjectId)
 					var sum_count int64
-					var sum_in_count int64
-					for _, it := range list {
-						baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-						if it.MaxUnit == baseDrug.MaxUnit {
-							it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-							it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-						}
-						sum_count += it.StockMaxNumber + it.StockMinNumber
-						sum_in_count += it.WarehousingCount
+					for _, its := range stockInfo {
+						sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 					}
-					service.UpdateMedicalSumCount(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+					service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 				}
 			}
 
@@ -1222,6 +1218,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						StorehouseId:            item.StorehouseOutId,
 						IsSys:                   12,
 						SecondWarehouseId:       item.WarehouseId,
+						IsCheck:                 1,
 					}
 
 					//查询今日是否存在调拨出库
@@ -1253,6 +1250,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						WarehouseInfotId:        0,
 						StorehouseId:            item.StorehouseOutId,
 						SecondWarehouseInfoId:   item.ID,
+						IsCheck:                 1,
 					}
 
 					//入库操作
@@ -1268,6 +1266,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						StorehouseId:      item.StorehouseInId,
 						IsSys:             12,
 						SecondWarehouseId: item.WarehouseId,
+						IsCheck:           1,
 					}
 					//查询该调拨单是否有生成入库单
 					_, errcodess := service.GetWarehouseBySecondWarehouseId(12, item.WarehouseId, orgId, record_date)
@@ -1299,6 +1298,7 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 						PackingPrice:          item.MinPrice,
 						StorehouseId:          item.StorehouseInId,
 						SecondWarehouseInfoId: item.ID,
+						IsCheck:               1,
 					}
 
 					//出库逻辑
@@ -1308,15 +1308,14 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 				}
 
 				//查询默认仓库
-				houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-				goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
-				var sum_count int64
-				var sum_in_count int64
-				for _, it := range goodList {
-					sum_count += it.StockCount
-					sum_in_count += it.WarehousingCount
+				storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+				stockList, _ := service.GetStockCountByGoodId(item.ProjectId, storeHouseConfig.StorehouseOutInfo, orgId)
+				var total_count int64
+				for _, it := range stockList {
+					total_count += it.StockCount
 				}
-				service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+				//基础库插入数据
+				service.UpdateGoodInfoSumCount(item.ProjectId, total_count, orgId)
 			}
 		}
 	}
@@ -1485,23 +1484,14 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 				}
 
 			}
-			//查询默认仓库
-			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ProjectId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, it := range list {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-				if it.MaxUnit == baseDrug.MaxUnit {
-					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
 
-				}
-				sum_count += it.StockMaxNumber + it.StockMinNumber
-				sum_in_count += it.WarehousingCount
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			var sum_count int64
+			stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.ProjectId)
+			for _, its := range stockInfo {
+				sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 			}
-			service.UpdateMedicalSumCount(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+			service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 		}
 
 		//耗材
@@ -1533,15 +1523,14 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 			}
 
 			//查询默认仓库
-			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-			goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, it := range goodList {
-				sum_count += it.StockCount
-				sum_in_count += it.WarehousingCount
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			stockList, _ := service.GetStockCountByGoodId(item.ProjectId, storeHouseConfig.StorehouseOutInfo, orgId)
+			var total_count int64
+			for _, it := range stockList {
+				total_count += it.StockCount
 			}
-			service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+			//基础库插入数据
+			service.UpdateGoodInfoSumCount(item.ProjectId, total_count, orgId)
 
 		}
 	}

controllers/self_drug_api_congtroller.go

@@ -2355,7 +2355,7 @@ func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
 	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, total, err := service.GetDrugInventoryDetailList(keyword, page, limit, orgId, storehouse_id)
-
+	inventoryList, _, _ := service.GetDrugInventoryDetailListTwo(keyword, page, limit, orgId, storehouse_id)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
 	doctorList, _ := service.GetAllDoctorThree(orgId)
 	if err != nil {
@@ -2364,10 +2364,11 @@ func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":      total,
-		"list":       list,
-		"doctorList": doctorList,
-		"houseList":  houseList,
+		"total":         total,
+		"list":          list,
+		"doctorList":    doctorList,
+		"houseList":     houseList,
+		"inventoryList": inventoryList,
 	})
 }
 

controllers/supply_order_api_contorller.go

@@ -2230,6 +2230,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						Type:              1,
 						SupplyWarehouseId: id,
 						StorehouseId:      houseConfig.DrugStorehouseInfo,
+						IsCheck:           1,
 					}
 					//查询今日是否存在入库单号
 					//_, errcode := service.GetSingleDrugWarehouseOrder(record_date, orgId)
@@ -2264,6 +2265,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
 						StorehouseId:              houseConfig.DrugStorehouseInfo,
+						IsCheck:                   1,
 					}
 					if medical.MaxUnit == medical.MinUnit {
 						warehouseInfoDetailOne.StockMaxNumber = item.Count
@@ -2334,6 +2336,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						Type:              1,
 						SupplyWarehouseId: id,
 						StorehouseId:      houseConfig.StorehouseInfo,
+						IsCheck:           1,
 					}
 					//查询是否存在入库单
 					//_, errcose := service.GetSindleWarehouse(record_date, orgId)
@@ -2367,6 +2370,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
 						StorehouseId:              houseConfig.StorehouseInfo,
+						IsCheck:                   1,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 				}
@@ -3205,50 +3209,41 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 			service.UpdateGoodWarehousing(id, orgId)
 		}
 
-		// 查询入库单
-		drugInfo, _ := service.GetDrugSupplyWarehouseIdSeven(id, orgId)
-		for _, item := range drugInfo {
-
-			//查询默认仓库
-			houseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
-			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, it := range list {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-				if it.MaxUnit == baseDrug.MaxUnit {
-					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-				}
-				sum_count += it.StockMaxNumber + it.StockMinNumber
-				sum_in_count += it.WarehousingCount
-			}
-			service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
-		}
-
 		//删除药品入库单
 		service.UpdateDrugSupplyWarehousingInfo(id, orgId)
 
 		//删除入库流水
 		service.UpdateDrugSupplyFlow(id, orgId)
+		// 查询入库单
+		drugInfo, _ := service.GetDrugSupplyWarehouseIdSeven(id, orgId)
+		if len(drugInfo) > 0 {
+			for _, item := range drugInfo {
+				//查询默认仓库
+				houseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+				//查询默认仓库剩余多少库存
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
+				var sum_count int64
+				var sum_in_count int64
+				for _, it := range list {
+					baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+					if it.MaxUnit == baseDrug.MaxUnit {
+						it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+						it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
 
-		//查寻入库单
-		info, _ := service.GetSupplySupplyWarehouseIdSeven(id, orgId)
-		for _, item := range info {
-			//扣减库存
-			//查询该机构默认仓库
-			storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
-			//查询剩余库存
-			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, item := range goodList {
-				sum_count += item.StockCount
-				sum_in_count += item.WarehousingCount
+					}
+					sum_count += it.StockMaxNumber + it.StockMinNumber
+					sum_in_count += it.WarehousingCount
+				}
+				service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
+			}
+		} else {
+			for _, it := range goodOrder {
+				if it.IsSource == 1 {
+
+					service.UpdateMedicalSumCount(it.ProjectId, 0, 0, this.GetAdminUserInfo().CurrentOrgId)
+				}
 			}
-			service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+
 		}
 
 		//删除耗材入库单
@@ -3257,6 +3252,31 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 		//删除耗材入库流水
 		service.UpdateGoodSupplyFlow(id, orgId)
 
+		//查寻入库单
+		info, _ := service.GetSupplySupplyWarehouseIdSeven(id, orgId)
+		if len(info) > 0 {
+			for _, item := range info {
+				//扣减库存
+				//查询该机构默认仓库
+				storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+				//查询剩余库存
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
+				var sum_count int64
+				var sum_in_count int64
+				for _, item := range goodList {
+					sum_count += item.StockCount
+					sum_in_count += item.WarehousingCount
+				}
+				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+			}
+		} else {
+			for _, it := range goodOrder {
+				if it.IsSource == 2 {
+					service.UpdateGoodByGoodId(it.ProjectId, 0, 0, this.GetAdminUserInfo().CurrentOrgId)
+				}
+			}
+		}
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"cancelList":   cancelList,
@@ -3463,6 +3483,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyCancelOutId:       id,
 				SupplyWarehouseId:       warehouse_out_id,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
 			}
 			// 查询今日是否存在出库单
 			_, errcodes := service.GetDrugWarehouseOutById(orgId, record_date)
@@ -3499,6 +3520,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SysRecordTime:           record_date,
 				IsSource:                item.Type,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
 			}
 
 			drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
@@ -3561,6 +3583,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyWarehouseId:       warehouse_out_id,
 				IsSys:                   0,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			//查询是否生成出库单
 			_, errcodes := service.FindStockOutByIsSys(orgId, 0, record_date)
@@ -3594,6 +3617,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyWarehouseId:       warehouse_out_id,
 				IsSource:                item.Type,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			//出库逻辑
 			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.SupplyCount, creater, warehouse_out_id, id)

enums/error_code.go

@@ -249,6 +249,9 @@ const ( // ErrorCode
 	ErrorPsnNoEmpty = 310000
 
 	ErrorEmployeeNumber = 320000
+
+	ErrorCheckGoodParamSuccess = 3400000
+	ErrorCheckGoodParamWrong   = 3300000
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -485,8 +488,10 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorCodeStockExced: "请先出库,执行失败",
 
-	ErrorPsnNoEmpty:     "人员编码不能为空",
-	ErrorEmployeeNumber: "请输入正确的工号",
+	ErrorPsnNoEmpty:            "人员编码不能为空",
+	ErrorEmployeeNumber:        "请输入正确的工号",
+	ErrorCheckGoodParamSuccess: "反审核成功!",
+	ErrorCheckGoodParamWrong:   "该入库单已出库,反审核失败!",
 }
 
 type SGJError struct {

models/device_models.go

@@ -829,7 +829,7 @@ type XtAssessmentAfterDislysis struct {
 	Complication                    string  `gorm:"column:complication" json:"complication" form:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark" form:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes" form:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes" form:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed" form:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion" form:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion" form:"dialysis_intakes_blood_transfusion"`

models/dialysis.go

@@ -574,7 +574,7 @@ type AssessmentAfterDislysis struct {
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`

models/drug.go

@@ -1,37 +1,36 @@
 package models
 
 type BaseDrugLib struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                   float64 `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	MinPrice               float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
-	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
-	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
 	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
 	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
@@ -88,6 +87,7 @@ type BaseDrugLibSeven struct {
 	MinNumber int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit   string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	SumCount  int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	IsUse     int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

models/drug_stock.go

@@ -18,6 +18,7 @@ type DrugWarehouse 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"`
 	IsSys             int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	IsCheck           int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (DrugWarehouse) TableName() string {
@@ -86,6 +87,7 @@ type DrugWarehouseInfo struct {
 	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"`
 }
 
 func (DrugWarehouseInfo) TableName() string {
@@ -95,6 +97,8 @@ func (DrugWarehouseInfo) TableName() string {
 type DrugWarehouseInfoSeven struct {
 	StockMaxNumber int64 `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
 	StockMinNumber int64 `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	StorehouseId   int64 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck        int64 `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (DrugWarehouseInfoSeven) TableName() string {
@@ -123,6 +127,7 @@ type DrugWarehouseOut struct {
 	SupplyWarehouseId       int64         `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	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"`
 }
 
 func (DrugWarehouseOut) TableName() string {
@@ -130,44 +135,46 @@ func (DrugWarehouseOut) TableName() string {
 }
 
 type DrugWarehouseOutInfo struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	AdviceId                int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	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"`
-	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId              int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	ID                      int64       `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64       `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64       `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64       `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string      `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64     `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64       `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string      `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64       `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string      `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64       `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64       `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64       `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string      `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64       `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64       `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	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"`
+	AdminUserId             int64       `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64     `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string      `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64       `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsCheck                 int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -240,6 +247,7 @@ type DrugCancelStock struct {
 	Dealers             *Dealer                `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	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"`
 }
 
 func (DrugCancelStock) TableName() string {
@@ -247,32 +255,34 @@ func (DrugCancelStock) TableName() string {
 }
 
 type DrugCancelStockInfo struct {
-	ID               int64       `gorm:"column:id" json:"id" form:"id"`
-	DrugId           int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	CancelStockId    int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	Count            int64       `gorm:"column:count" json:"count" form:"count"`
-	Price            float64     `gorm:"column:price" json:"price" form:"price"`
-	Total            float64     `gorm:"column:total" json:"total" form:"total"`
-	ProductDate      int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Ctime            int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64       `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	OrderNumber      string      `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	Type             int64       `gorm:"column:type" json:"type" form:"type"`
-	Dealer           string      `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     string      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	RetailPrice      float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number           string      `gorm:"column:number" json:"number" form:"number"`
-	RegisterAccount  string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
-	Remark           string      `gorm:"column:remark" json:"remark" form:"remark"`
-	BatchNumber      string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit          string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	BaseDrugLib      BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
-	BatchNumberId    int64       `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
-	StorehouseId     int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	ID                int64                `gorm:"column:id" json:"id" form:"id"`
+	DrugId            int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	CancelStockId     int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	Count             int64                `gorm:"column:count" json:"count" form:"count"`
+	Price             float64              `gorm:"column:price" json:"price" form:"price"`
+	Total             float64              `gorm:"column:total" json:"total" form:"total"`
+	ProductDate       int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64                `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime             int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64                `gorm:"column:status" json:"status" form:"status"`
+	OrgId             int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber       string               `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type              int64                `gorm:"column:type" json:"type" form:"type"`
+	Dealer            string               `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      string               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice       float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice  float64              `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number            string               `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount   string               `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark            string               `gorm:"column:remark" json:"remark" form:"remark"`
+	BatchNumber       string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit           string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	BaseDrugLib       BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	BatchNumberId     int64                `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
+	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" `
 }
 
 func (DrugCancelStockInfo) TableName() string {
@@ -323,6 +333,7 @@ type VmDrugWarehouseInfo struct {
 	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"`
+	IsCheck                   int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type StDrugWarehouseOutInfo struct {
@@ -422,52 +433,6 @@ func (DrugFlow) TableName() string {
 	return "xt_drug_flow"
 }
 
-type DrugWarehouseOutInfoTenty struct {
-	ID                      int64       `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64       `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64       `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64       `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string      `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	Price                   float64     `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64       `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string      `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64       `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string      `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64       `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64       `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64       `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	RetailPrice             float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice        float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number                  string      `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PatientId               int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	WarehouseInfoId         int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	AdviceId                int64       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyCancelOutId       int64       `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseId       int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	IsSource                int64       `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	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"`
-	AdminUserId             int64       `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice               float64     `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount              string      `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId              int64       `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
-	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
-}
-
-func (DrugWarehouseOutInfoTenty) TableName() string {
-	return "xt_drug_warehouse_out_info"
-}
-
 type DrugWarehouseOutTwenty struct {
 	ID                        int64                        `gorm:"column:id" json:"id" form:"id"`
 	WarehouseOutOrderNumber   string                       `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
@@ -488,9 +453,98 @@ type DrugWarehouseOutTwenty struct {
 	SupplyWarehouseId         int64                        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	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"`
+	BaseDrugLib               BaseDrugLib                  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 	DrugWarehouseOutInfoTenty []*DrugWarehouseOutInfoTenty `gorm:"ForeignKey:WarehouseOutId;AssociationForeignKey:ID"json:"xt_drug_warehouse_out_info" `
 }
 
 func (DrugWarehouseOutTwenty) TableName() string {
 	return "xt_drug_warehouse_out"
 }
+
+type DrugWarehouseOutInfoTenty struct {
+	ID                      int64               `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64               `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64               `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64               `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64               `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string              `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64             `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64             `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64               `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64               `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64               `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64               `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64               `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64               `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string              `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64               `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string              `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64               `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64               `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64               `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64               `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64             `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64             `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string              `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string              `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64               `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64               `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64               `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64               `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64               `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	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"`
+	AdminUserId             int64               `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64             `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string              `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64               `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	BaseDrugLib             BaseDrugLib         `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	DrugWarehouseInfo       XtDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"json:"drug_warehouse_info" `
+}
+
+func (DrugWarehouseOutInfoTenty) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}
+
+type DrugWarehouseInfoTwenty struct {
+	ID                        int64                        `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64                        `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64                        `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string                       `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64                        `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64                        `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64                        `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price                     float64                      `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64                      `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64                        `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64                        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark                    string                       `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64                        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64                        `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64                        `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64                        `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string                       `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type                      int64                        `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice               float64                      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice          float64                      `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber               string                       `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit                   string                       `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string                       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64                        `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64                        `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	WarehousingInfoId         int64                        `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	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"`
+	BaseDrugLib               BaseDrugLib                  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	DrugWarehouseOutInfoTenty []*DrugWarehouseOutInfoTenty `gorm:"ForeignKey:WarehouseOutId;AssociationForeignKey:ID"json:"xt_drug_warehouse_out_info" `
+}
+
+func (DrugWarehouseInfoTwenty) TableName() string {
+	return "xt_drug_warehouse_info"
+}

models/good_models.go

@@ -149,6 +149,7 @@ type XtCancelStockInfo struct {
 	Number          string   `gorm:"column:number" json:"number" form:"number"`
 	RegisterAccount string   `gorm:"column:register_account" json:"register_account" form:"register_account"`
 	Remark          string   `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCheck         int64    `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (XtCancelStockInfo) TableName() string {

models/self_drug_models.go

@@ -416,6 +416,7 @@ type XtDrugWarehouseInfo struct {
 	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"`
+	IsCheck                   int64      `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {
@@ -484,6 +485,7 @@ type BloodDrugWarehouseInfo struct {
 	DrugOriginPlace  string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	CountUnit        string  `json:"count_unit"`
+	IsCheck          string  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type BloodDrugCancelStockInfo struct {
@@ -831,46 +833,48 @@ type VmXtDrugInventory struct {
 }
 
 type XtDrugInventory struct {
-	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName           string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	SpecificationName  string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	WarehousingUnit    string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Count              int64   `gorm:"column:count" json:"count" form:"count"`
-	LastPrice          float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	RetailPrice        float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	NewPrice           float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
-	Manufacturer       string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer             string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
-	DrugId             int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status             int64   `gorm:"column:status" json:"status" form:"status"`
-	WarehousingOrder   string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	LicenseNumber      string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	Creater            int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	Checker            int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckerStatus      int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
-	CheckerTime        int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
-	ExpiryDate         int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	ProductDate        int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	Number             string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber        string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Total              string  `gorm:"column:total" json:"total" form:"total"`
-	DrugOriginPlace    string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	WarehouseInfoId    int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	ProofCount         int64   `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
-	StockMaxNumber     int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber     int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	MinCount           int64   `gorm:"column:min_count" json:"min_count" form:"min_count"`
-	MinUnit            string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	LastStockMaxNumber int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
-	LastStockMinNumber int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
-	InventoryType      int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
-	Type               int64   `gorm:"column:type" json:"type" form:"type"`
-	StorehouseId       int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	ID                 int64             `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string            `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName  string            `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit    string            `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count              int64             `gorm:"column:count" json:"count" form:"count"`
+	LastPrice          float64           `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice        float64           `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice           float64           `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer       string            `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer             string            `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark             string            `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId             int64             `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId          int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime              int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64             `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder   string            `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber      string            `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime          int64             `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater            int64             `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker            int64             `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus      int64             `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime        int64             `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	ExpiryDate         int64             `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate        int64             `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Number             string            `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber        string            `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Total              string            `gorm:"column:total" json:"total" form:"total"`
+	DrugOriginPlace    string            `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	WarehouseInfoId    int64             `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	ProofCount         int64             `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
+	StockMaxNumber     int64             `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber     int64             `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	MinCount           int64             `gorm:"column:min_count" json:"min_count" form:"min_count"`
+	MinUnit            string            `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	LastStockMaxNumber int64             `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber int64             `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64             `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	Type               int64             `gorm:"column:type" json:"type" form:"type"`
+	StorehouseId       int64             `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	BaseDrugLib        BaseDrugLib       `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	DrugWarehouseInfo  DrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"json:"drug_warehouse_info" `
 }
 
 func (XtDrugInventory) TableName() string {

models/stock_models.go

@@ -68,6 +68,7 @@ type Warehousing struct {
 	StorehouseId      int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsSys             int64        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	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"`
 }
 
 func (Warehousing) TableName() string {
@@ -142,6 +143,7 @@ type WarehousingInfo struct {
 	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"`
 }
 
@@ -190,6 +192,7 @@ type VmWarehousingInfo struct {
 	Count             int64       `gorm:json:"count"`
 	PackingPrice      float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	StorehouseId      int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck           int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type WarehouseOut struct {
@@ -214,6 +217,7 @@ type WarehouseOut struct {
 	SupplyWarehouseId       int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	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"`
 }
 
 func (WarehouseOut) TableName() string {
@@ -259,6 +263,7 @@ type WarehouseOutInfo struct {
 	AdminUserId             int64        `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	BuyPrice                float64      `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StockCount              string       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	RegisterNumber          string       `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
@@ -360,6 +365,7 @@ type CancelStock struct {
 	Type              int64                `gorm:"column:type" json:"type"`
 	XtCancelStockInfo []*XtCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"XtCancelStockInfo"`
 	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (CancelStock) TableName() string {
@@ -661,6 +667,7 @@ type CancelStockInfo struct {
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	RecordDate      int64              `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	StorehouseId    int64              `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck         int64              `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (CancelStockInfo) TableName() string {
@@ -893,6 +900,7 @@ type BloodWarehouseInfo struct {
 	PackingUnit       string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck           string  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type XtStockAdjustPrice struct {
@@ -1051,40 +1059,42 @@ func (XtStockReportPrice) TableName() string {
 }
 
 type XtStockInventory struct {
-	ID                int64   `gorm:"column:id" json:"id" form:"id"`
-	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Count             int64   `gorm:"column:count" json:"count" form:"count"`
-	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
-	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
-	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status            int64   `gorm:"column:status" json:"status" form:"status"`
-	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
-	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
-	Total             int64   `gorm:"column:total" json:"total" form:"total"`
-	Number            string  `gorm:"column:number" json:"number" form:"number"`
-	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
-	ExpireDate        int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
-	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	GoodOriginPlace   string  `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
-	Type              int64   `gorm:"column:type" json:"type" form:"type"`
-	InventoryType     int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
-	LastStockCount    int64   `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
-	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	ID                int64           `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string          `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName string          `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit   string          `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count             int64           `gorm:"column:count" json:"count" form:"count"`
+	BuyPrice          float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	PackingPrice      float64         `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	NewPrice          float64         `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer      string          `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            string          `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark            string          `gorm:"column:remark" json:"remark" form:"remark"`
+	GoodId            int64           `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	UserOrgId         int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64           `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder  string          `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber     string          `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime         int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater           int64           `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker           int64           `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus     int64           `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime       int64           `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	Total             int64           `gorm:"column:total" json:"total" form:"total"`
+	Number            string          `gorm:"column:number" json:"number" form:"number"`
+	WarehousingInfoId int64           `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	ExpireDate        int64           `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate       int64           `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	GoodOriginPlace   string          `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
+	Type              int64           `gorm:"column:type" json:"type" form:"type"`
+	InventoryType     int64           `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	LastStockCount    int64           `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
+	StockCount        int64           `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId      int64           `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	GoodInfo          GoodInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	WarehousingInfo   WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingInfoId" json:"xt_warehouse_info"`
 }
 
 func (XtStockInventory) TableName() string {
@@ -1395,3 +1405,41 @@ type DrugOutConfig struct {
 func (DrugOutConfig) TableName() string {
 	return "xt_drug_out_config"
 }
+
+type VmWarehousingInfoSix 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"`
+	GoodInfo                  GoodInfo `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	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"`
+	RegisterNumber            string   `gorm:"column:register_number" json:"register_number" form:"register_number"`
+}
+
+func (VmWarehousingInfoSix) TableName() string {
+	return "xt_warehouse_info"
+}

service/dialysis_service.go

@@ -928,6 +928,12 @@ func ExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id int
 	return err
 }
 
+func GetExceDoctorAdviceGroupNo(groupNo int64, org_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("groupno = ?  AND user_org_id = ? AND status = 1", groupNo, org_id).Find(&advice).Error
+	return advice, err
+}
+
 func ExceOldDoctorAdvice(m *models.DoctorAdvice, advice_id int64) (err error) {
 
 	ut := writeDb.Begin()
@@ -1372,6 +1378,12 @@ func GetHisExecutionDoctors(orgid int64, patientid int64, id int64) (doctorAdvic
 	return doctorAdvice, err
 }
 
+func GetHisExecutionDoctorsTwo(orgid int64, patientid int64, id int64) (doctorAdvice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? and patient_id = ? AND id = ? and status = 1 and execution_state = 1", orgid, patientid, id).Find(&doctorAdvice).Error
+	return doctorAdvice, err
+}
+
 func FindHisDoctorAdviceById(orgID int64, id int64) (advice models.HisDoctorAdviceInfo, err error) {
 	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
 	return

service/gobal_config_service.go

@@ -278,7 +278,7 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
 	dbOne := XTReadDB().Table("xt_base_drug as t").Where("t.status =1")
 	dbTwo := XTReadDB().Table("xt_drug_warehouse as s").Where("s.status = 1")
 	dbThree := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
@@ -352,7 +352,7 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1")
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1 and x.is_check = 1")
 	dbOne := XTReadDB().Table("xt_base_drug as b").Where("b.status =1")
 	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
 	fmt.Print(dbOne, dbTwo)
@@ -654,7 +654,7 @@ func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcatego
 		if storehouse_id > 0 {
 			db = db.Where("storehouse_id = ?", storehouse_id)
 		}
-		return db.Where("status = 1")
+		return db.Where("status = 1 and is_check = 1")
 	}).Preload("DrugCancelStockInfo", func(db *gorm.DB) *gorm.DB {
 		if startime > 0 {
 			db = db.Where("ctime>=?", startime)
@@ -744,7 +744,7 @@ func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64
 
 func GetBatchOrderDetail(drugid int64, orgid int64, page int64, limit int64) (drug []*models.DrugWarehouseInfo, total int64, err error) {
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ? and status = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ? and status = 1 and is_check = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&drug).Error
 	return drug, total, err
 }
 

service/manage_center_service.go

@@ -2,7 +2,10 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -169,12 +172,12 @@ func FindAllDrugLibRecordTotal(org_id int64) (count int64) {
 }
 
 func FindBaseDrugLibRecord(org_id int64, id int64) (lib models.BaseDrugLib, err error) {
-	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
+	err = readDb.Model(&models.BaseDrugLib{}).Where("id = ? AND org_id = ?  AND status = 1", id, org_id).First(&lib).Error
 	return
 }
 
 func FindBaseDrugLibRecordSeven(org_id int64, id int64) (lib models.BaseDrugLibSeven, err error) {
-	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
+	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count,is_user").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
 	return
 }
 
@@ -202,6 +205,18 @@ func GetDrugAutoWarehouseOutSeven(patient_id int64, advicedate int64, drugid int
 	return &detail, nil
 }
 
+func GetDrugAutoWarehouseOutEight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (models.DrugWarehouseOutInfo, error) {
+	detail := models.DrugWarehouseOutInfo{}
+	err = XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&detail).Error
+	return detail, err
+}
+
+func GetDrugAutoWarehouseOutNight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (night []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&night).Error
+	return night, err
+}
+
 func UpdateDrugWarehouse(id int64, info models.DrugWarehouseInfo) error {
 	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
 	return err
@@ -411,3 +426,397 @@ func GetAllDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
 	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
 	return drug, err
 }
+
+//自动退库分装方法
+
+func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) error {
+
+	//查询该病人该药品是否有库存记录
+	info, _ := GetDrugAutoWarehouseOutEight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+
+	list, _ := GetDrugAutoWarehouseOutNight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+
+	storeHouseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+	//退库
+	drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+	fmt.Println("list223323232233223322323323223", len(list))
+
+	//如果剩余数量 + 退库数量 < 总入库数量
+	if len(list) > 0 {
+		for _, its := range list {
+			//查询该药品出库批次总入库数量
+			druginfo, _ := GetDrugInfoSix(its.WarehouseInfoId, info.OrgId)
+
+			var out_count int64  //该批次出库库存
+			var sum_count int64  //该批次总库存
+			var over_count int64 //剩余数量
+
+			over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			if info.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = info.Count * drug.MinNumber
+
+			}
+			if info.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = info.Count
+			}
+
+			if info.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				out_count = info.Count
+			}
+
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount * drug.MinNumber
+			}
+
+			if druginfo.MaxUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
+
+			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				sum_count = druginfo.WarehousingCount
+			}
+
+			fmt.Println("该批次剩余库存", over_count)
+			fmt.Println("该批次退库数量", out_count)
+			fmt.Println("该批次总入库数量", sum_count)
+			if (over_count + out_count) <= sum_count {
+				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+					fmt.Println("进来1", its.Count)
+					//退库
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMinNumber: its.Count,
+					}
+					UpdateDrugWarehouse(its.WarehouseInfoId, warehouseInfo)
+				}
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+					fmt.Println("进来2", its.Count)
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMaxNumber: its.Count,
+					}
+					UpdateDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
+				}
+
+				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+					fmt.Println("进来3", its.Count)
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMaxNumber: its.Count,
+					}
+					UpdateDrugWarehouseOne(its.WarehouseInfoId, warehouseInfo)
+				}
+
+			}
+		}
+
+		floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+		prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+		if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+			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:      creater,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       info.Dealer,
+				Manufacturer: info.Manufacturer,
+				Type:         1,
+				StorehouseId: storeHouseConfig.DrugStorehouseOut,
+				IsCheck:      1,
+			}
+			AddSigleDrugCancelStock(&cancelStock)
+
+			manufactureName, _ := GetManufactureById(info.Manufacturer)
+			dealer, _ := GetDealerById(info.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    cancelInfo.ID,
+				DrugId:           advice.DrugId,
+				Count:            prescribingNumber,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             1,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      info.RetailPrice,
+				RetailTotalPrice: info.RetailTotalPrice,
+				Price:            info.Price,
+				RegisterAccount:  "",
+				Remark:           info.Remark,
+				BatchNumber:      info.BatchNumber,
+				MaxUnit:          advice.PrescribingNumberUnit,
+				ProductDate:      info.ProductDate,
+				ExpiryDate:       info.ExpiryDate,
+				BatchNumberId:    info.WarehouseInfoId,
+				StorehouseId:     storeHouseConfig.DrugStorehouseOut,
+				IsCheck:          1,
+			}
+
+			flow := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               0,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            storeHouseConfig.DrugStorehouseOut,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			CreateDrugFlowOne(flow)
+
+			//删除出库记录
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+			houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+
+			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:      creater,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       info.Dealer,
+				Manufacturer: info.Manufacturer,
+				Type:         1,
+				StorehouseId: houseConfig.DrugStorehouseOut,
+				IsCheck:      1,
+			}
+			AddSigleDrugCancelStock(&cancelStock)
+
+			manufactureName, _ := GetManufactureById(info.Manufacturer)
+			dealer, _ := GetDealerById(info.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    cancelInfo.ID,
+				DrugId:           info.DrugId,
+				Count:            prescribingNumber,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             1,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      info.RetailPrice,
+				RetailTotalPrice: info.RetailTotalPrice,
+				Price:            info.Price,
+				RegisterAccount:  "",
+				Remark:           info.Remark,
+				BatchNumber:      info.BatchNumber,
+				MaxUnit:          advice.PrescribingNumberUnit,
+				ProductDate:      info.ProductDate,
+				ExpiryDate:       info.ExpiryDate,
+				BatchNumberId:    info.WarehouseInfoId,
+				StorehouseId:     houseConfig.DrugStorehouseOut,
+				IsCheck:          1,
+			}
+
+			flow := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               0,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			CreateDrugFlowOne(flow)
+			//删除出库记录
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+
+		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+			houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+
+			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:      creater,
+				Ctime:        ctime,
+				Status:       1,
+				ReturnTime:   advice.AdviceDate,
+				Dealer:       info.Dealer,
+				Manufacturer: info.Manufacturer,
+				Type:         1,
+				StorehouseId: houseConfig.DrugStorehouseOut,
+				IsCheck:      1,
+			}
+			AddSigleDrugCancelStock(&cancelStock)
+
+			manufactureName, _ := GetManufactureById(info.Manufacturer)
+			dealer, _ := GetDealerById(info.Dealer)
+			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			cancelStockInfo := models.DrugCancelStockInfo{
+				OrderNumber:      cancelInfo.OrderNumber,
+				CancelStockId:    cancelInfo.ID,
+				DrugId:           info.DrugId,
+				Count:            prescribingNumber,
+				Status:           1,
+				Ctime:            ctime,
+				OrgId:            advice.UserOrgId,
+				Type:             1,
+				Manufacturer:     manufactureName.ManufacturerName,
+				Dealer:           dealer.DealerName,
+				Total:            0,
+				RetailPrice:      info.RetailPrice,
+				RetailTotalPrice: info.RetailTotalPrice,
+				Price:            info.Price,
+				RegisterAccount:  "",
+				Remark:           info.Remark,
+				BatchNumber:      info.BatchNumber,
+				MaxUnit:          advice.PrescribingNumberUnit,
+				ProductDate:      info.ProductDate,
+				ExpiryDate:       info.ExpiryDate,
+				BatchNumberId:    info.WarehouseInfoId,
+				StorehouseId:     houseConfig.DrugStorehouseOut,
+				IsCheck:          1,
+			}
+
+			flow := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  info.DrugId,
+				Number:                  "",
+				BatchNumber:             info.BatchNumber,
+				Count:                   prescribingNumber,
+				UserOrgId:               advice.UserOrgId,
+				PatientId:               0,
+				SystemTime:              info.SysRecordTime,
+				ConsumableType:          7,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            info.Manufacturer,
+				Dealer:                  info.Dealer,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   info.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              info.ExpiryDate,
+				ProductDate:             info.ProductDate,
+				MaxUnit:                 advice.PrescribingNumberUnit,
+				MinUnit:                 "",
+				AdviceId:                info.AdviceId,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+			}
+			CreatedCancelStock(cancelStockInfo)
+			CreateDrugFlowOne(flow)
+			//删除出库记录
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
+			//删除流水
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
+		}
+
+		//更新字典里面的库存
+		stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+		//查询改药品信息
+		medical, _ := GetBaseDrugMedical(advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfo {
+			sum_count_one += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+		}
+		UpdateBaseDrugSumTwo(advice.DrugId, sum_count_one, advice.UserOrgId)
+	}
+	return err
+}

service/mobile_dialysis_service.go

@@ -795,7 +795,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 // 透析记录
 func MobileGetSchedualDialysisRecordTen(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder
-	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
+	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ?", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil

service/patient_service.go

@@ -569,8 +569,8 @@ func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients
 
 func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient models.SchedualPatient2, err error) {
 	err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
+		return db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("DeviceZone", "org_id = ?", orgID).
 			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
 	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status=1", orgID, no).First(&patient).Error
 	return

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -318,7 +318,7 @@ type AssessmentAfterDislysisVM struct {
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`
@@ -400,7 +400,7 @@ type XtAssessmentAfterDislysisVM struct {
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`

service/secondary_service.go

@@ -1086,7 +1086,7 @@ func GetStoreHouseDrugWarehouseingInfo(id int64) (models.DrugWarehouseInfo, erro
 
 func GetDrugSumCountByStorehouseId(storehouse_id int64, orgid int64, drug_id int64) (info []*models.DrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("storehouse_id = ? and org_id = ? and status = 1 and (stock_max_number >0 or stock_min_number>0) and drug_id =?", storehouse_id, orgid, drug_id).Find(&info).Error
+	err = XTReadDB().Where("storehouse_id = ? and org_id = ? and status = 1 and (stock_max_number >0 or stock_min_number>0) and drug_id =? and is_check = 1", storehouse_id, orgid, drug_id).Find(&info).Error
 	return info, err
 }
 
@@ -1098,7 +1098,7 @@ func GetDrugSumCountByStorehouseIdSix(storehouse_id int64, orgid int64) (info []
 
 func GetGoodSumCountByStoreId(storehouse_id int64, goodid int64, orgid int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Where("storehouse_id = ? and good_id = ? and org_id =? and status =1 and stock_count > 0", storehouse_id, goodid, orgid).Find(&info).Error
+	err = XTReadDB().Where("storehouse_id = ? and good_id = ? and org_id =? and status =1 and stock_count > 0 and is_check = 1", storehouse_id, goodid, orgid).Find(&info).Error
 	return info, err
 }
 

service/self_drug_service.go

@@ -827,7 +827,7 @@ func GetLastDrugWarehouseOutInfo(drugid int64, warehouseOutId int64, orgid int64
 }
 
 func PostSearchDrugWarehouseList(keyword string, orgid int64, storehouse_id int64) (info []*models.BloodDrugWarehouseInfo, err error) {
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status")
 	fmt.Println(table)
 	likeKey := "%" + keyword + "%"
@@ -1115,7 +1115,21 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
+func GetDrugInventoryDetailListTwo(keyword string, page int64, limit int64, orgid int64, storehouse_id int64) (list []*models.XtDrugInventory, total int64, err error) {
+
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	offset := (page - 1) * limit
+	err = db.Preload("BaseDrugLib", "org_id = ? and status = 1", orgid).Preload("DrugWarehouseInfo", "org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 	return list, total, err
 }
 

service/statistics_service/index_evaluation_service.go

@@ -1241,9 +1241,9 @@ func GetDoctorWorkloadTableData(user_org_id int64, start_time int64, end_time in
 	userDb := service.UserReadDB()
 	db := service.XTReadDB()
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 2 ", user_org_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where  org_id = ?  AND user_type = 2 ", user_org_id).Scan(&datas)
 	} else {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 2  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where  org_id = ?  AND user_type = 2  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
 	var sys_datas VMUserAdminRole
 	sys_datas.AdminUserId = 0
@@ -1273,9 +1273,9 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 	db := service.XTReadDB()
 
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3 ", user_org_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where  org_id = ?  AND user_type = 3 ", user_org_id).Scan(&datas)
 	} else {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where   org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
 
 	var NewTotalOne int64
@@ -1449,9 +1449,9 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 	//db.Model(&models.Dataconfig{}).Where("name = '血管通路' AND module = 'hemodialysis' AND field_name = 'vascular_access_desc' AND parent_id = 0").First(&tempConfig)
 
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3 ", user_org_id).Offset(offset).Limit(limit).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3 ", user_org_id).Offset(offset).Limit(limit).Scan(&datas)
 	} else {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
 
 	for _, item := range datas {

service/supply_service.go

@@ -768,7 +768,7 @@ func GetSupplySupplyWarehouseId(id int64, orgid int64) (models.WarehousingInfo,
 
 func GetSupplySupplyWarehouseIdSeven(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
 	return info, err
 }
 
@@ -780,7 +780,7 @@ func GetDrugSupplyWarehouseId(id int64, orgid int64) (models.DrugWarehouseInfo,
 
 func GetDrugSupplyWarehouseIdSeven(id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
 	return info, err
 }