历史排班

controllers/mobile_api_controllers/patient_api_controller.go

@@ -694,9 +694,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					var total int64
 					var prescribing_number_total int64
 
-					//判断库存
+					//出库
 					for _, item := range advices {
 						if item.Way == 1 {
+
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 							//查询该药品的剩余库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
@@ -719,7 +720,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if medical.IsUse == 1 {
-								service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -731,6 +732,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+									advice.ExecutionTime = 0
+									advice.ExecutionState = 2
+									advice.ExecutionStaff = 0
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "3",
 										"advice": advice,
@@ -741,6 +745,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 								if prescribing_number_total > total {
 									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+									advice.ExecutionTime = 0
+									advice.ExecutionState = 2
+									advice.ExecutionStaff = 0
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "2",
 										"advice": advice,
@@ -749,17 +756,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 							}
-
-						}
-					}
-
-					//出库
-					for _, item := range advices {
-						if item.Way == 1 {
 							//查询是否出库按钮开启
 							adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
-							//查询改药品信息
-							medical, _ := service.GetBaseDrugMedical(item.DrugId)
 							if adviceSetting.IsAdviceOpen == 1 {
 								//查询是否出库按钮开启
 								prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
@@ -861,16 +859,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if len(advices) > 0 {
 					var total int64
 					var prescribing_number_total int64
-					for _, item := range advices {
 
+					for _, item := range advices {
 						if item.Way == 1 {
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
+
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 							//查询该药品的剩余库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 
-							//查询改药品信息
-							medical, _ := service.GetBaseDrugMedical(item.DrugId)
-
 							//判断单位是否相等
 							if medical.MaxUnit == item.PrescribingNumberUnit {
 								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -889,7 +888,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if medical.IsUse == 1 {
-								service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -900,6 +899,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+									advice.ExecutionTime = 0
+									advice.ExecutionState = 2
+									advice.ExecutionStaff = 0
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "3",
 										"advice": advice,
@@ -909,6 +911,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 								if prescribing_number_total > total {
 									service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+									advice.ExecutionTime = 0
+									advice.ExecutionState = 2
+									advice.ExecutionStaff = 0
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "2",
 										"advice": advice,
@@ -917,15 +922,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 							}
-
-						}
-					}
-
-					for _, item := range advices {
-						if item.Way == 1 {
-							//查询改药品信息
-							medical, _ := service.GetBaseDrugMedical(item.DrugId)
-							pharmacyConfig, _ := service.FindPharmacyConfig(item.UserOrgId)
 							if medical.IsUse == 2 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									//查询今日是否出库

controllers/patient_api_controller.go

@@ -1831,10 +1831,17 @@ func (c *PatientApiController) ExecGroupAdvice() {
 				pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
 				if medical.IsUse == 2 {
 					if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-						service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+						drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+						if drugOutInfo.ID == 0 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+						}
+
 					}
 					if pharmacyConfig.IsOpen != 1 {
-						service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+						drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+						if drugOutInfo.ID == 0 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+						}
 					}
 
 					//查询默认仓库
@@ -2029,7 +2036,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				if medical.IsUse != 1 {
+
 					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+						service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+						advice.ExecutionState = 2
+						advice.ExecutionStaff = 0
+						advice.ExecutionTime = 0
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "3",
 							"advice": advice,
@@ -2037,6 +2049,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						return
 					}
 					if prescribing_number_total > total {
+						service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
+						advice.ExecutionState = 2
+						advice.ExecutionStaff = 0
+						advice.ExecutionTime = 0
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "2",
 							"advice": advice,
@@ -2069,12 +2085,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								//是通过药房发药
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									//执行出库
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									}
 								}
 								//不通过药房发药
 								if pharmacyConfig.IsOpen != 1 {
 									//执行出库
-									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+									if drugOutInfo.ID == 0 {
+										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									}
 								}
 
 								//查询默认仓库
@@ -2091,6 +2115,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 
 								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+
+								//剩余库存
+								service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 								break
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
@@ -2120,11 +2147,19 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						if medical.IsUse == 2 {
 							//是通过药房发药
 							if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+								if drugOutInfo.ID == 0 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
 							}
 							//不通过药房发药
 							if pharmacyConfig.IsOpen != 1 {
-								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+								drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
+								if drugOutInfo.ID == 0 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+								}
 							}
 							//更新字典里面的库存
 							var sum_count int64
@@ -2136,6 +2171,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								sum_count += its.StockMaxNumber + its.StockMinNumber
 							}
 							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+							//剩余库存
+							service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 							break
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",

controllers/secondary_order_api_contorller.go

@@ -1321,12 +1321,12 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 					}
 					//查询该调拨单是否有生成入库单
 					_, errcodess := service.GetWarehouseBySecondWarehouseId(12, item.WarehouseId, orgId, record_date)
-					fmt.Println("ERRCODESSS-------------------", errcodess)
+
 					if errcodess == gorm.ErrRecordNotFound {
 						service.AddSigleWarehouse(&warehousing)
 					}
 					infoObj, _ := service.GetLastWarehouseById(12, item.WarehouseId, orgId, record_date)
-					fmt.Println("INFOR----------------------", infoObj.ID)
+
 					warehouseInfo := &models.WarehousingInfo{
 						WarehousingOrder:      infoObj.WarehousingOrder,
 						WarehousingId:         infoObj.ID,

service/his_project_service.go

@@ -93,11 +93,15 @@ func CreatedProjectTeam(team *models.XtHisProjectTeam) error {
 func GetProjectTeamList(limit int64, page int64, orgid int64, keyword string) (projectTeam []*models.XtHisProjectTeam, total int64, err error) {
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
-	db := XTReadDB().Model(&projectTeam)
+	db := XTReadDB().Model(&projectTeam).Where("status=1")
 	if len(keyword) > 0 {
 		db = db.Where("project_team like ?", likeKey)
 	}
-	err = db.Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&projectTeam).Error
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&projectTeam).Error
 	return projectTeam, total, err
 }
 

service/manage_service.go

@@ -1732,7 +1732,7 @@ func DeleteObjectTableDisinfect(id int64) error {
 
 func GetAirDisInfectionLongTime(user_org_id int64) (list []*models.XtNewAriDisinfect, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&list).Error
+	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Order("id desc").First(&list).Error
 	return
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -227,6 +227,7 @@ type PrescriptionVM struct {
 	SodiumBicarbonateFlow      string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
 	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
 	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 }
 
 func (PrescriptionVM) TableName() string {

service/warhouse_service.go

@@ -4026,6 +4026,12 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 		AddWarehosingInfo(warehouseInfo)
 
+		//查询剩余库存
+		goodListOne, _ := GetAllGoodSumCount(goods.GoodId, orgID, warehouseInfo.StorehouseId)
+		var sum_count_one int64
+		for _, item := range goodListOne {
+			sum_count_one += item.StockCount
+		}
 		stockInfoFlow := models.VmStockFlow{
 			WarehousingId:           warehouseInfo.WarehousingId,
 			GoodId:                  goods.GoodId,
@@ -4059,6 +4065,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouseInfo.StorehouseId,
 			SecondWarehouseInfoId:   warehouseInfo.SecondWarehouseInfoId,
+			OverCount:               sum_count_one,
 		}
 
 		//创建入库流水
@@ -4199,6 +4206,12 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 
 		AddWarehosingInfo(warehouseInfo)
 
+		//查询剩余库存
+		goodListOne, _ := GetAllGoodSumCount(goods.GoodId, orgID, warehouseInfo.StorehouseId)
+		var sum_count_one int64
+		for _, item := range goodListOne {
+			sum_count_one += item.StockCount
+		}
 		stockInfoFlow := models.VmStockFlow{
 			WarehousingId:           warehouseInfo.WarehousingId,
 			GoodId:                  goods.GoodId,
@@ -4232,6 +4245,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouseInfo.StorehouseId,
 			SecondWarehouseInfoId:   warehouseInfo.SecondWarehouseInfoId,
+			OverCount:               sum_count_one,
 		}
 
 		//创建出库流水
@@ -4267,8 +4281,8 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 	//开启事物
 	//storeConfig, _ := GetAllStoreHouseConfig(orgID)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
-	fmt.Println("lastWarehouse.StockMinNumber", lastWarehouse.StockMinNumber)
-	fmt.Println("drup.MinNumber", drup.MinNumber)
+	//fmt.Println("lastWarehouse.StockMinNumber", lastWarehouse.StockMinNumber)
+	//fmt.Println("drup.MinNumber", drup.MinNumber)
 	if lastWarehouse.StockMinNumber >= drup.MinNumber {
 		var stockMax int64
 		var stockMin int64
@@ -4289,8 +4303,8 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
-	fmt.Println("stock23233233232", stock_number)
-	fmt.Println("deliver_number", deliver_number)
+	//fmt.Println("stock23233233232", stock_number)
+	//fmt.Println("deliver_number", deliver_number)
 
 	// 出库完成后，要减去对应批次的库存数量
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
@@ -4455,6 +4469,15 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 		CreateDrugWarehouseInfo(drugInfo)
 
+		//查询剩余库存
+		stockInfoOne, _ := GetDrugAllStockInfo(drugWarehouse.StorehouseId, orgID, advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfoOne {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
+		}
 		flow := models.DrugFlow{
 			WarehousingId:           drugWarehouse.WarehousingId,
 			DrugId:                  warehouse.DrugId,
@@ -4491,6 +4514,7 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			StockMinNumber:          deliver_number,
 			StorehouseId:            drugWarehouse.StorehouseId,
 			SecondWarehouseInfoId:   drugWarehouse.SecondWarehouseInfoId,
+			OverCount:               sum_count_one,
 		}
 
 		CreateDrugFlowOne(flow)
@@ -4623,6 +4647,15 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 		CreateDrugWarehouseInfo(drugInfo)
 
+		//查询剩余库存
+		stockInfoTwo, _ := GetDrugAllStockInfo(drugWarehouse.StorehouseId, orgID, advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfoTwo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
+		}
 		flow := models.DrugFlow{
 			WarehousingId:           drugWarehouse.WarehousingId,
 			DrugId:                  warehouse.DrugId,