2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10653 //机构id
+		subscibe.OrgId = 10580 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10653 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10580 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17997 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10653 //机构id小英9675或4
+		subscibe.OrgId = 10580 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10653 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentOrgId = 10580 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17997 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/his_api_controller.go

@@ -1909,29 +1909,6 @@ func (c *HisApiController) CreateHisPrescription() {
 					}
 				}
 
-				//if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-				//	advices := items["advices"].([]interface{})
-				//
-				//	if len(advices) > 0 {
-				//		for _, advice := range advices {
-				//
-				//			var adviceId int64
-				//			if advice.(map[string]interface{})["advice_id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["advice_id"]).String() == "float64" {
-				//				adviceId = int64(advice.(map[string]interface{})["advice_id"].(float64))
-				//			}
-				//			if adviceId > 0 {
-				//				his_advice_info, err := service.GetHisDoctorAdviceInfo(adviceId)
-				//
-				//				if err == nil {
-				//					if his_advice_info.IsMedicine == 1 {
-				//
-				//						isMidicine = true
-				//					}
-				//				}
-				//			}
-				//		}
-				//	}
-				//}
 			}
 		}
 	}
@@ -2185,6 +2162,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	}
 
 	//已发药和已收费限制逻辑
+	//执行出库的逻辑
 	if drugStockConfig.IsOpen == 1 || settleConfig.IsOpen == 1 {
 		//校验库存总量
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
@@ -2303,6 +2281,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 								}
 
+								//不是保存处方出库
 								drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 								if drugOutConfig.IsOpen != 1 {
 									//修改处方
@@ -2355,6 +2334,12 @@ func (c *HisApiController) CreateHisPrescription() {
 											batch_number_counts := strconv.FormatInt(batch_number_count, 10)
 
 											all_count, _ := strconv.ParseFloat(totals, 64)
+
+											if all_count == 0 {
+												tx.Rollback()
+												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+												return
+											}
 											if prescribingNumberUnit == drug.MinUnit {
 												batch_number_all_count, _ := strconv.ParseFloat(batch_number_counts, 64)
 												if drug.IsUse != 1 {
@@ -2426,21 +2411,26 @@ func (c *HisApiController) CreateHisPrescription() {
 												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
 												device_number = prescribingNumberInt * drug.MinNumber
+
 											}
 											if advicelist.PrescribingNumberUnit == drug.MinUnit {
 												prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
 												device_number = prescribingNumberInt
+
+												//回退库存
 											}
 
 											var number_count int64
 											if prescribingNumberUnit == drug.MaxUnit {
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 												number_count = prescribingNumberInt * drug.MinNumber
+												//回退库存
 											}
 											if prescribingNumberUnit == drug.MinUnit {
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 												number_count = prescribingNumberInt
+												//回退库存
 											}
 
 											//如果修改的数量大于之前修改的数量
@@ -2499,7 +2489,6 @@ func (c *HisApiController) CreateHisPrescription() {
 															var sum_in_count int64
 															warehouseInfo, _ := service.FindLastDrugWarehousingInfoByID(drug_id, storeConfig.DrugStorehouseOut)
 															sum_in_count = warehouseInfo.StockMaxNumber*drug.MinNumber + warehouseInfo.StockMinNumber
-															fmt.Println("sum_in_count", sum_in_count)
 															//如果修改的数量大于有库存的第一个批次
 															if number_count > sum_in_count {
 																tx.Rollback()
@@ -2512,60 +2501,69 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 
 											}
-											pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
-
-											if pharmacyConfig.IsOpen != 1 {
-												if device_number != number_count {
-
-													// 查询该药品最后一次出库记录
-													druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
-
-													//回退库存
-													if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
-														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
-
-													}
-													if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-														var stock_max_number int64
-														var stock_min_number int64
-
-														if number_count >= drug.MinNumber {
-
-															stock_max_number = device_number / drug.MinNumber
-															service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
-
-															stock_min_number = device_number % drug.MinNumber
-															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
-
-														} else {
-
-															service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
-
-														}
-													}
-
-													if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
-														service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
-
-													}
-													//删除记录
-													service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
-
-													//查询默认仓库剩余多少库存
-													var sum_count int64
-													stockInfo, _ := service.GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
-													for _, its := range stockInfo {
-														if its.MaxUnit == drug.MaxUnit {
-															its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
-														}
-														sum_count += its.StockMaxNumber + its.StockMinNumber
-													}
 
-													service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
-
-												}
-											}
+											//药品发药
+											//pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
+											//不使用药品发药的功能
+											//if pharmacyConfig.IsOpen != 1 {
+											//	if device_number != number_count {
+											//
+											//		//查询该药品的出库记录
+											//		outListExport, _ := service.GetWarehouseOutListExport(drug_id, patient_id, recordDateTime, adviceId)
+											//		if len(outListExport) > 0 {
+											//			//
+											//			for _, item := range outListExport {
+											//				//回退库存
+											//				if item.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+											//					service.ModefyDrugByWarehouseInfo(item.WarehouseInfoId, number_count)
+											//				}
+											//				if item.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+											//					var stock_max_number int64
+											//					var stock_min_number int64
+											//
+											//					if number_count >= drug.MinNumber {
+											//
+											//						stock_max_number = device_number / drug.MinNumber
+											//						service.ModefyDrugByWarehouseInfo(item.WarehouseInfoId, stock_max_number)
+											//
+											//						stock_min_number = device_number % drug.MinNumber
+											//						service.ModefyDrugByWarehouseInfoOne(item.WarehouseInfoId, stock_min_number)
+											//
+											//					} else {
+											//
+											//						service.ModefyDrugByWarehouseInfoOne(item.WarehouseInfoId, device_number)
+											//
+											//					}
+											//				}
+											//
+											//				if item.CountUnit == drug.MaxUnit && item.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
+											//					service.ModefyDrugByWarehouseInfo(item.WarehouseInfoId, device_number)
+											//				}
+											//			}
+											//		}
+											//
+											//		service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
+											//		var sum_count int64
+											//		orgId := c.GetAdminUserInfo().CurrentOrgId
+											//		stockInfo, _ := service.GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgId, drug_id)
+											//		for _, its := range stockInfo {
+											//			if its.MaxUnit == drug.MaxUnit {
+											//				its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+											//			}
+											//			sum_count += its.StockMaxNumber + its.StockMinNumber
+											//		}
+											//		//更新字典里面的库存
+											//		service.UpdateBaseDrugSumTwo(drug_id, sum_count, orgId)
+											//
+											//		//剩余库存
+											//		service.UpdateDrugStockCount(drug_id, orgId, storeConfig.DrugStorehouseOut, sum_count)
+											//
+											//		over, _ := service.FindOverCount(drug_id, orgId, storeConfig.DrugStorehouseOut)
+											//		//减少出库数量
+											//		service.UpdateActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount)
+											//
+											//	}
+											//}
 
 										}
 									}
@@ -2707,9 +2705,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 												number_count = prescribingNumberInt
 											}
-											fmt.Println("number_count--------------", number_count)
-											fmt.Println("device_number--------------", device_number)
-											fmt.Println("batch_number_count", batch_number_count)
+
 											//如果修改的数量大于之前修改的数量
 											if (number_count - device_number) > 0 {
 												//如果修改的差数量 大于库存数量
@@ -3180,7 +3176,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3554,17 +3550,11 @@ func (c *HisApiController) CreateHisPrescription() {
 													history_count += prescribingNumberSevenTy
 												}
 
-												fmt.Println("drug_nam,e---------------", drug.DrugName)
-												fmt.Println("local_count0000000000000000000000000000000000000000000", local_count)
-												fmt.Println("history_count999999999999999999999999999999999999999", history_count)
-
 												//如果当前出库数量大于历史出库数量则需要出库
 												if local_count > history_count {
 													//按最小单位出库
 													var cha_count = local_count - history_count
 
-													//fmt.Println("cha_count000000000000000000000000000", cha_count)
-
 													newadviceInfo.PrescribingNumber = float64(cha_count)
 													newadviceInfo.PrescribingNumberUnit = drug.MinUnit
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -87,7 +87,7 @@ func (this *DialysisAPIController) Scheduals() {
 	defer redis.Close()
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-	//redis.Set(key, "", time.Second)
+	redis.Set(key, "", time.Second)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	patients, _ := service.GetAllPatientListSix(orgID)
@@ -10760,6 +10760,55 @@ func (c *DialysisAPIController) MobileCoverSch() {
 	}
 }
 
-//func BatchExectime() {
-//
-//}
+func (c *DialysisAPIController) BatchCheckAdvice() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	advice_date, _ := c.GetInt64("advice_date")
+
+	org_id := c.GetMobileAdminUserInfo().Org.Id
+
+	creater := c.GetMobileAdminUserInfo().AdminUser.Id
+
+	//查询是his系统还是血透系统
+	_, configs := service.FindXTHisRecordByOrgId(org_id)
+
+	//his客户
+	if configs.IsOpen == 1 {
+
+		adviceList, _ := service.GetAllHisAdviceList(patient_id, advice_date, org_id)
+		for _, item := range adviceList {
+			service.BatchCheckHisAdvice(item.ID, creater)
+		}
+		projectList, _ := service.GetMobileProjectList(patient_id, advice_date, org_id)
+		for _, item := range projectList {
+			service.BatchCheckProject(item.ID, creater)
+		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"adviceList":  adviceList,
+			"projectList": projectList,
+		})
+
+	}
+
+	if configs.IsOpen != 1 {
+
+		adviceList, _ := service.GetAllAdviceList(patient_id, advice_date, org_id)
+
+		for _, item := range adviceList {
+			service.BatchAdviceList(item.ID, creater)
+		}
+		projectList, _ := service.GetMobileProjectList(patient_id, advice_date, org_id)
+		for _, item := range projectList {
+			service.BatchCheckProject(item.ID, creater)
+		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"adviceList":  adviceList,
+			"projectList": projectList,
+		})
+	}
+
+	return
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -212,6 +212,5 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/sch/coversch", &DialysisAPIController{}, "Get:MobileCoverSch")
 
-	//beego.Router("/m/api/batchandleexectime", &DialysisAPIController{}, "Get:BatchExectime")
-
+	beego.Router("/m/api/batchcheckadvice", &DialysisAPIController{}, "Get:BatchCheckAdvice")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1354,8 +1354,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}
 
-			//err = service.SaveHisDoctorAdvice(item)
-
 			service.SaveHisDoctorAdviceOne(item, tx)
 
 			//记录日志
@@ -1504,15 +1502,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					list, _ := service.GetDrugTotalCountTwoTwety(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut, tx)
 
 					//判断单位是否相等
-					if medical.MaxUnit == advice.PrescribingNumberUnit {
+					if medical.MaxUnit == advice.PrescribingNumberUnit && medical.MaxUnit != medical.MinUnit {
 						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 {
+
+					if medical.MinUnit == advice.PrescribingNumberUnit && medical.MaxUnit != medical.MinUnit {
+						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 && medical.MaxUnit == medical.MinUnit {
 						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
@@ -1637,8 +1642,122 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								}
 								if pharmacyConfig.IsOpen != 1 {
 
-									//service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-									service.NewHisDrugsDelivery(adminInfo.Org.Id, creater, &advice, tx)
+									//查询已经出库数量
+
+									outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
+
+									var out_count int64
+									if len(outListExport) > 0 {
+										for _, item := range outListExport {
+											if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+												out_count = item.Count * medical.MinNumber
+											}
+											if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+												out_count = item.Count
+											}
+											if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+												out_count = item.Count * medical.MinNumber
+											}
+
+										}
+									}
+
+									newadviceInfo := &models.HisDoctorAdviceInfo{
+										ID:                    advice.ID,
+										UserOrgId:             advice.UserOrgId,
+										PatientId:             advice.PatientId,
+										HisPatientId:          advice.HisPatientId,
+										AdviceType:            advice.AdviceType,
+										AdviceDate:            advice.AdviceDate,
+										StartTime:             advice.StartTime,
+										AdviceName:            advice.AdviceName,
+										AdviceDesc:            advice.AdviceDesc,
+										ReminderDate:          advice.ReminderDate,
+										SingleDose:            advice.SingleDose,
+										SingleDoseUnit:        advice.SingleDoseUnit,
+										PrescribingNumber:     advice.PrescribingNumber,
+										PrescribingNumberUnit: advice.PrescribingNumberUnit,
+										DeliveryWay:           advice.DeliveryWay,
+										ExecutionFrequency:    advice.ExecutionFrequency,
+										AdviceDoctor:          advice.AdviceDoctor,
+										Status:                advice.Status,
+										CreatedTime:           advice.CreatedTime,
+										UpdatedTime:           advice.UpdatedTime,
+										AdviceAffirm:          advice.AdviceAffirm,
+										Remark:                advice.Remark,
+										StopTime:              advice.StopTime,
+										StopReason:            advice.StopReason,
+										StopDoctor:            advice.StopDoctor,
+										StopState:             advice.StopState,
+										ParentId:              advice.ParentId,
+										ExecutionTime:         advice.ExecutionTime,
+										ExecutionStaff:        advice.ExecutionStaff,
+										ExecutionState:        advice.ExecutionState,
+										Checker:               advice.Checker,
+										RecordDate:            advice.RecordDate,
+										DialysisOrderId:       advice.DialysisOrderId,
+										CheckTime:             advice.CheckTime,
+										CheckState:            advice.CheckState,
+										DrugSpec:              advice.DrugSpec,
+										DrugSpecUnit:          advice.DrugSpecUnit,
+										Groupno:               advice.Groupno,
+										RemindType:            advice.RemindType,
+										FrequencyType:         advice.FrequencyType,
+										DayCount:              advice.DayCount,
+										WeekDay:               advice.WeekDay,
+										TemplateId:            advice.TemplateId,
+										Modifier:              advice.Modifier,
+										DrugId:                advice.DrugId,
+										Price:                 advice.Price,
+										PrescriptionId:        advice.PrescriptionId,
+										MedListCodg:           advice.MedListCodg,
+										FeedetlSn:             advice.FeedetlSn,
+										Day:                   advice.DayCount,
+										ChildDoctorAdvice:     nil,
+										Drug:                  models.Drug{},
+										Diagnosis:             advice.Diagnosis,
+										Way:                   advice.Way,
+										HospApprFlag:          advice.HospApprFlag,
+										LmtUsedFlag:           advice.LmtUsedFlag,
+										HisOrderInfo:          models.HisOrderInfo{},
+										IsMedicine:            advice.IsMedicine,
+										ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+										Child:                 nil,
+										IsSettle:              advice.IsSettle,
+										IsMobile:              advice.IsMobile,
+										IsSelfDrug:            advice.IsSelfDrug,
+										DrugWayCount:          advice.DrugWayCount,
+									}
+
+									//如果当前医嘱数量大于历史出库数据则需要出库
+									if prescribing_number_total > out_count {
+
+										//按最小单位出库
+										var cha_count = prescribing_number_total - out_count
+
+										newadviceInfo.PrescribingNumber = float64(cha_count)
+										newadviceInfo.PrescribingNumberUnit = medical.MinUnit
+
+										service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+
+									}
+
+									//如果当前医嘱数量小于历史出库数据则需要退库
+									if prescribing_number_total < out_count {
+										var cha_count = out_count - prescribing_number_total
+										drug, _ := service.FindBaseDrugLibRecordSeven(advice.UserOrgId, advice.DrugId)
+										service.NewHisDrugCancelInfo(advice.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+										service.NewHisDrugAutoCancelInfo(advice.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+
+									}
+
+									if prescribing_number_total == out_count {
+										if out_count == 0 {
+											service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+										}
+
+									}
+
 									if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 10265 {
 										//查询该药品是否有出库记录
 										flowMap, _ := service.GetDrugFLowByAdviceByIdOne(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate, tx)
@@ -1695,6 +1814,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			}
 		}
+
 		tx.Commit()
 		for _, item := range advices {
 			advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2969,7 +2969,7 @@ func (this *NewDialysisApiController) GetNextInspectionDetail() {
 	org_id := this.GetMobileAdminUserInfo().Org.Id
 
 	inspection, _ := service.GetNextInspection(patients.BloodId, date, project_id, org_id)
-	fmt.Println("inspection", inspection.InspectDate)
+
 	if inspection.InspectDate > 0 {
 		InspectionDetail, err := service.GetLastInspectionDetail(patients.BloodId, inspection.InspectDate, project_id, org_id)
 		if err != nil {
@@ -2994,7 +2994,8 @@ func (this *NewDialysisApiController) GetInspectionGroup() {
 
 	org_id := this.GetMobileAdminUserInfo().Org.Id
 
-	inspection, _ := service.GetInspectionGroup(patient_id, org_id)
+	patient, _ := service.GetPatientDetailTwo(patient_id)
+	inspection, _ := service.GetInspectionGroup(patient.BloodId, org_id)
 
 	if len(inspection) > 0 {
 		for _, item := range inspection {
@@ -3018,9 +3019,20 @@ func (this *NewDialysisApiController) GetInspectionByProject() {
 
 	org_id := this.GetMobileAdminUserInfo().Org.Id
 
-	inspection, _ := service.GetInspectionByProject(patient_id, project_id, org_id)
+	patient, _ := service.GetPatientDetailTwo(patient_id)
+
+	inspection, _ := service.GetInspectionGroupByRecordDate(patient.BloodId, project_id, org_id)
+
+	if len(inspection) > 0 {
+		for _, item := range inspection {
+			inspeclist, _ := service.GetInspectionByProject(patient.BloodId, project_id, org_id, item.InspectDate)
+			for _, it := range inspeclist {
+				item.Child = append(item.Child, it)
+			}
+		}
+	}
 
-	patients, _ := service.GetPatientByIDOne(org_id, patient_id)
+	patients, _ := service.GetPatientByIDOne(org_id, patient.BloodId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"inspection": inspection,

controllers/patient_api_controller.go

@@ -2909,7 +2909,130 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						if medical.IsUse == 2 {
 							if config.IsOpen != 1 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
-									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									// 开始主事务
+									db := service.XTWriteDB()
+									tx := db.Begin()
+
+									// 在函数结束时处理事务回滚
+									defer func() {
+										if r := recover(); r != nil {
+											tx.Rollback()
+										}
+									}()
+									creater := c.GetAdminUserInfo().AdminUser.Id
+									outListExport, _ := service.GetWarehouseOutListExport(item.DrugId, item.PatientId, item.AdviceDate, item.ID)
+									var out_count int64
+									if len(outListExport) > 0 {
+										for _, item := range outListExport {
+											if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+												out_count = item.Count * medical.MinNumber
+											}
+											if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+												out_count = item.Count
+											}
+											if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+												out_count = item.Count * medical.MinNumber
+											}
+
+										}
+									}
+
+									newadviceInfo := &models.HisDoctorAdviceInfo{
+										ID:                    item.ID,
+										UserOrgId:             item.UserOrgId,
+										PatientId:             item.PatientId,
+										HisPatientId:          item.HisPatientId,
+										AdviceType:            item.AdviceType,
+										AdviceDate:            item.AdviceDate,
+										StartTime:             item.StartTime,
+										AdviceName:            item.AdviceName,
+										AdviceDesc:            item.AdviceDesc,
+										ReminderDate:          item.ReminderDate,
+										SingleDose:            item.SingleDose,
+										SingleDoseUnit:        item.SingleDoseUnit,
+										PrescribingNumber:     item.PrescribingNumber,
+										PrescribingNumberUnit: item.PrescribingNumberUnit,
+										DeliveryWay:           item.DeliveryWay,
+										ExecutionFrequency:    item.ExecutionFrequency,
+										AdviceDoctor:          item.AdviceDoctor,
+										Status:                item.Status,
+										CreatedTime:           item.CreatedTime,
+										UpdatedTime:           item.UpdatedTime,
+										AdviceAffirm:          item.AdviceAffirm,
+										Remark:                item.Remark,
+										StopTime:              item.StopTime,
+										StopReason:            item.StopReason,
+										StopDoctor:            item.StopDoctor,
+										StopState:             item.StopState,
+										ParentId:              item.ParentId,
+										ExecutionTime:         item.ExecutionTime,
+										ExecutionStaff:        item.ExecutionStaff,
+										ExecutionState:        item.ExecutionState,
+										Checker:               item.Checker,
+										RecordDate:            item.RecordDate,
+										DialysisOrderId:       item.DialysisOrderId,
+										CheckTime:             item.CheckTime,
+										CheckState:            item.CheckState,
+										DrugSpec:              item.DrugSpec,
+										DrugSpecUnit:          item.DrugSpecUnit,
+										Groupno:               item.Groupno,
+										RemindType:            item.RemindType,
+										FrequencyType:         item.FrequencyType,
+										DayCount:              item.DayCount,
+										WeekDay:               item.WeekDay,
+										TemplateId:            item.TemplateId,
+										Modifier:              item.Modifier,
+										DrugId:                item.DrugId,
+										Price:                 item.Price,
+										PrescriptionId:        item.PrescriptionId,
+										MedListCodg:           item.MedListCodg,
+										FeedetlSn:             item.FeedetlSn,
+										Day:                   item.DayCount,
+										ChildDoctorAdvice:     nil,
+										Drug:                  models.Drug{},
+										Diagnosis:             item.Diagnosis,
+										Way:                   item.Way,
+										HospApprFlag:          item.HospApprFlag,
+										LmtUsedFlag:           item.LmtUsedFlag,
+										HisOrderInfo:          models.HisOrderInfo{},
+										IsMedicine:            item.IsMedicine,
+										ExecutionFrequencyId:  item.ExecutionFrequencyId,
+										Child:                 nil,
+										IsSettle:              item.IsSettle,
+										IsMobile:              item.IsMobile,
+										IsSelfDrug:            item.IsSelfDrug,
+										DrugWayCount:          item.DrugWayCount,
+									}
+
+									//如果当前医嘱数量大于历史出库数据则需要出库
+									if prescribing_number_total > out_count {
+
+										//按最小单位出库
+										var cha_count = prescribing_number_total - out_count
+
+										item.PrescribingNumber = float64(cha_count)
+										item.PrescribingNumberUnit = medical.MinUnit
+
+										service.NewHisDrugsDelivery(item.UserOrgId, creater, newadviceInfo, tx)
+
+									}
+
+									//如果当前医嘱数量小于历史出库数据则需要退库
+									if prescribing_number_total < out_count {
+										var cha_count = out_count - prescribing_number_total
+										drug, _ := service.FindBaseDrugLibRecordSeven(item.UserOrgId, item.DrugId)
+										service.NewHisDrugCancelInfo(item.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+										service.NewHisDrugAutoCancelInfo(item.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+
+									}
+
+									if prescribing_number_total == out_count {
+										if out_count == 0 {
+											service.NewHisDrugsDelivery(item.UserOrgId, creater, newadviceInfo, tx)
+										}
+
+									}
+									//service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
 									if item.UserOrgId == 3877 || item.UserOrgId == 10265 {
 										//查询该药品是否有出库记录
@@ -2939,10 +3062,138 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											return
 										}
 									}
+
+									tx.Commit()
 								}
 								//不通过药房发药
 								if pharmacyConfig.IsOpen != 1 {
-									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									//service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									// 开始主事务
+									db := service.XTWriteDB()
+									tx := db.Begin()
+
+									// 在函数结束时处理事务回滚
+									defer func() {
+										if r := recover(); r != nil {
+											tx.Rollback()
+										}
+									}()
+									creater := c.GetAdminUserInfo().AdminUser.Id
+									outListExport, _ := service.GetWarehouseOutListExport(item.DrugId, item.PatientId, item.AdviceDate, item.ID)
+									var out_count int64
+									if len(outListExport) > 0 {
+										for _, item := range outListExport {
+											if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+												out_count = item.Count * medical.MinNumber
+											}
+											if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+												out_count = item.Count
+											}
+											if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+												out_count = item.Count * medical.MinNumber
+											}
+
+										}
+									}
+
+									newadviceInfo := &models.HisDoctorAdviceInfo{
+										ID:                    item.ID,
+										UserOrgId:             item.UserOrgId,
+										PatientId:             item.PatientId,
+										HisPatientId:          item.HisPatientId,
+										AdviceType:            item.AdviceType,
+										AdviceDate:            item.AdviceDate,
+										StartTime:             item.StartTime,
+										AdviceName:            item.AdviceName,
+										AdviceDesc:            item.AdviceDesc,
+										ReminderDate:          item.ReminderDate,
+										SingleDose:            item.SingleDose,
+										SingleDoseUnit:        item.SingleDoseUnit,
+										PrescribingNumber:     item.PrescribingNumber,
+										PrescribingNumberUnit: item.PrescribingNumberUnit,
+										DeliveryWay:           item.DeliveryWay,
+										ExecutionFrequency:    item.ExecutionFrequency,
+										AdviceDoctor:          item.AdviceDoctor,
+										Status:                item.Status,
+										CreatedTime:           item.CreatedTime,
+										UpdatedTime:           item.UpdatedTime,
+										AdviceAffirm:          item.AdviceAffirm,
+										Remark:                item.Remark,
+										StopTime:              item.StopTime,
+										StopReason:            item.StopReason,
+										StopDoctor:            item.StopDoctor,
+										StopState:             item.StopState,
+										ParentId:              item.ParentId,
+										ExecutionTime:         item.ExecutionTime,
+										ExecutionStaff:        item.ExecutionStaff,
+										ExecutionState:        item.ExecutionState,
+										Checker:               item.Checker,
+										RecordDate:            item.RecordDate,
+										DialysisOrderId:       item.DialysisOrderId,
+										CheckTime:             item.CheckTime,
+										CheckState:            item.CheckState,
+										DrugSpec:              item.DrugSpec,
+										DrugSpecUnit:          item.DrugSpecUnit,
+										Groupno:               item.Groupno,
+										RemindType:            item.RemindType,
+										FrequencyType:         item.FrequencyType,
+										DayCount:              item.DayCount,
+										WeekDay:               item.WeekDay,
+										TemplateId:            item.TemplateId,
+										Modifier:              item.Modifier,
+										DrugId:                item.DrugId,
+										Price:                 item.Price,
+										PrescriptionId:        item.PrescriptionId,
+										MedListCodg:           item.MedListCodg,
+										FeedetlSn:             item.FeedetlSn,
+										Day:                   item.DayCount,
+										ChildDoctorAdvice:     nil,
+										Drug:                  models.Drug{},
+										Diagnosis:             item.Diagnosis,
+										Way:                   item.Way,
+										HospApprFlag:          item.HospApprFlag,
+										LmtUsedFlag:           item.LmtUsedFlag,
+										HisOrderInfo:          models.HisOrderInfo{},
+										IsMedicine:            item.IsMedicine,
+										ExecutionFrequencyId:  item.ExecutionFrequencyId,
+										Child:                 nil,
+										IsSettle:              item.IsSettle,
+										IsMobile:              item.IsMobile,
+										IsSelfDrug:            item.IsSelfDrug,
+										DrugWayCount:          item.DrugWayCount,
+									}
+
+									//如果当前医嘱数量大于历史出库数据则需要出库
+									if prescribing_number_total > out_count {
+
+										//按最小单位出库
+										var cha_count = prescribing_number_total - out_count
+
+										newadviceInfo.PrescribingNumber = float64(cha_count)
+										newadviceInfo.PrescribingNumberUnit = medical.MinUnit
+
+										service.NewHisDrugsDelivery(item.UserOrgId, creater, newadviceInfo, tx)
+
+									}
+
+									//如果当前医嘱数量小于历史出库数据则需要退库
+									if prescribing_number_total < out_count {
+										var cha_count = out_count - prescribing_number_total
+										drug, _ := service.FindBaseDrugLibRecordSeven(item.UserOrgId, item.DrugId)
+										service.NewHisDrugCancelInfo(item.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+										service.NewHisDrugAutoCancelInfo(item.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+
+									}
+
+									if prescribing_number_total == out_count {
+										if out_count == 0 {
+											service.NewHisDrugsDelivery(item.UserOrgId, creater, newadviceInfo, tx)
+										}
+
+									}
+									//service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+
+									tx.Commit()
 									if item.UserOrgId == 3877 || item.UserOrgId == 10265 {
 										//查询该药品是否有出库记录
 										flowMap, _ := service.GetDrugFLowByAdviceById(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate)

controllers/pharmacy_controller.go

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

controllers/sign_api_controller.go

@@ -1223,7 +1223,7 @@ func (this *SignApiController) ToAutoDrug() {
 
 func (this *SignApiController) ToAutoDiagnose() {
 
-	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//order, _ := service.GetDialysisOrderTotalCount()
 	//
@@ -1238,11 +1238,11 @@ func (this *SignApiController) ToAutoDiagnose() {
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	//list, _ := service.GetAllDialysisOrder(14749)
-	//for _, item := range list {
-	//	schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
-	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
-	//}
+	list, _ := service.GetAllDialysisOrder(14749)
+	for _, item := range list {
+		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
+	}
 
 	//drugList, _ := service.GetAllBaseDrugList(10318)
 	//for _, item := range drugList {

models/inspection_models.go

@@ -19,6 +19,7 @@ type Inspection struct {
 	Name         string `gorm:"-" json:"name" form:"name"`
 	DialysisNo   string `gorm:"-" json:"dialysis_no" form:"dialysis_no"`
 	Date         string `gorm:"-" json:"date" form:"date"`
+	Child        []*Inspection
 }
 
 func (Inspection) TableName() string {

service/dialysis_service.go

@@ -2457,3 +2457,45 @@ func CreateMonitorRecordLog(log models.XtMonitorRecordLog) error {
 	err := XTWriteDB().Create(&log).Error
 	return err
 }
+
+func GetAllHisAdviceList(patient_id int64, advice_date int64, user_org_id int64) (advice []*models.HisDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date =? and user_org_id = ? and status =1", patient_id, advice_date, user_org_id).Find(&advice).Error
+
+	return advice, err
+}
+
+func BatchCheckHisAdvice(id int64, creater int64) error {
+
+	err := XTWriteDB().Model(&models.HisDoctorAdvice{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"checker": creater, "check_state": 1, "check_time": time.Now().Unix()}).Error
+
+	return err
+}
+
+func BatchAdviceList(id int64, creater int64) error {
+
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"checker": creater, "check_state": 1, "check_time": time.Now().Unix()}).Error
+
+	return err
+}
+
+func GetMobileProjectList(patient_id int64, advice_date int64, user_org_id int64) (project []*models.HisPrescriptionProject, err error) {
+
+	err = XTReadDB().Where("patient_id  = ? and status=1 and record_date = ? and user_org_id = ?", patient_id, advice_date, user_org_id).Find(&project).Error
+
+	return project, err
+}
+
+func BatchCheckProject(id int64, creater int64) error {
+
+	err = XTWriteDB().Model(&models.HisPrescriptionProject{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"checker": creater, "check_state": 1, "check_time": time.Now().Unix()}).Error
+
+	return err
+}
+
+func GetAllAdviceList(patient_id int64, advice_date int64, user_org_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id = ? and status=1", patient_id, advice_date, user_org_id).Find(&advice).Error
+
+	return advice, err
+}

service/inspection_service.go

@@ -364,7 +364,7 @@ func GetInspectionGroup(patient_id int64, org_id int64) (inspection []*models.Ne
 		db = db.Where("org_id = ?", org_id)
 	}
 
-	err = db.Order("inspect_date desc").Group("project_id").Scan(&inspection).Error
+	err = db.Order("inspect_date asc").Group("project_id").Scan(&inspection).Error
 	return inspection, err
 }
 
@@ -396,9 +396,16 @@ func GetInspectionByProjectId(patient_id int64, org_id int64, project_id int64)
 
 }
 
-func GetInspectionByProject(patient_id int64, project_id int64, org_id int64) (inspection []*models.XtInspection, err error) {
+func GetInspectionGroupByRecordDate(patient_id int64, project_id int64, org_id int64) (inspetion []*models.Inspection, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ? and status=1", patient_id, project_id, org_id).Order("id desc").Find(&inspection).Error
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ? and status=1", patient_id, project_id, org_id).Order("inspect_date asc").Limit(10).Group("inspect_date").Find(&inspetion).Error
+
+	return inspetion, err
+}
+
+func GetInspectionByProject(patient_id int64, project_id int64, org_id int64, record_date int64) (inspection []*models.Inspection, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ? and status=1 and inspect_date =?", patient_id, project_id, org_id, record_date).Order("id desc").Find(&inspection).Error
 
 	return inspection, err
 }

service/manage_center_service.go

@@ -641,7 +641,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				Creator:                 creater,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   info.SysRecordTime,
 				Mtime:                   0,
 				Price:                   info.Price,
 				WarehousingDetailId:     info.WarehouseInfoId,
@@ -763,7 +763,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				Creator:                 creater,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   info.SysRecordTime,
 				Mtime:                   0,
 				Price:                   info.Price,
 				WarehousingDetailId:     info.WarehouseInfoId,
@@ -874,7 +874,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				Creator:                 creater,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   info.SysRecordTime,
 				Mtime:                   0,
 				Price:                   info.Price,
 				WarehousingDetailId:     info.WarehouseInfoId,

service/new_warehouse_service.go

@@ -5280,3 +5280,468 @@ func ReduceDrugWarehouseOut(drug_id int64, total_count int64, storehouse_id int6
 	ut.Commit()
 	return err
 }
+
+func HisStoryBloodHisDrugDeliverInfoOne(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64, unit string, tx *gorm.DB) (err error) {
+
+	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+	var deliver_number int64 = 0
+
+	var stock_number int64 = 0
+
+	var stock_number_one int64 = 0
+
+	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
+	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+	prescribingNumber_temp_one := strconv.FormatFloat(math.Abs(hisprescribingNumber), 'f', 0, 64)
+	count_one, _ := strconv.ParseInt(prescribingNumber_temp_one, 10, 64)
+
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number = count * drup.MinNumber
+
+	} else {
+		deliver_number = count
+
+	}
+
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		stock_number_one = count_one * drup.MinNumber
+	} else {
+		stock_number_one = count_one
+	}
+
+	fmt.Println(stock_number_one)
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+	storeConfig, _ := GetNewAllStoreHouseConfig(advice.UserOrgId, tx)
+	lastWarehouse, _ := FindNewLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut, tx)
+
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeNewMaxNumber(lastWarehouse.ID, stockMax, tx)
+			UpdateNewMinNumber(lastWarehouse.ID, stockMin, tx)
+
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeNewMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
+
+	}
+
+	warehouse, _ := FindNewLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut, tx)
+
+	// 将该批次的剩余库存数量转换为拆零数量
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		var maxNumber int64 = 0
+		var minNumber int64 = 0
+
+		maxNumber = deliver_number / drup.MinNumber
+		minNumber = deliver_number % drup.MinNumber
+
+		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+			minNumber = maxNumber
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
+				return errors.New("库存数量不足")
+			}
+		}
+
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+		if warehouse.StockMinNumber < 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		warehouse.Mtime = time.Now().Unix()
+
+		//fmt.Println("hahhahahah", warehouse.StockMinNumber)
+		//fmt.Println("howowowoowow", minNumber)
+		if warehouse.StockMinNumber < minNumber {
+
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			if warehouse.MaxUnit != warehouse.MinUnit {
+				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+			}
+			if minNumber == 2 && warehouse.MaxUnit == warehouse.MinUnit && warehouse.StockMinNumber == 0 {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+			}
+		} else {
+
+			if minNumber > 0 {
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
+			}
+
+			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+
+				if warehouse.StockMinNumber > 0 {
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
+				}
+
+			}
+
+		}
+
+		//fmt.Println("maxNumber", maxNumber)
+		//fmt.Println("minNumber", maxNumber)
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+			}
+
+		}
+
+		if drup.MaxUnit != drup.MinUnit {
+			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				return errors.New("库存数量不足")
+			}
+		}
+		if warehouse.StockMinNumber <= 0 {
+			warehouse.StockMinNumber = 0
+		}
+
+		//扣减库存数据
+		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
+
+		////查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			RetailPrice:             warehouse.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   deliver_number, //出最小单位
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
+
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		//如果有数量则新增数量
+		if lastDrugOutInfo.ID > 0 {
+
+			UpdateSigleDrugWarehouseOutInfoDetail(lastDrugOutInfo.ID, warehouseOutInfo.Count, tx)
+
+		}
+
+		drugflow := models.DrugFlow{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   deliver_number, //按最小单位计算,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               orgID,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 advice.ExecutionStaff,
+			IsSys:                   1,
+			PatientId:               advice.PatientId,
+			SystemTime:              advice.AdviceDate,
+			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			LastPrice:               warehouse.Price,
+			OperateTime:             time.Now().Unix(),
+		}
+
+		CreateNewDrugFlowOne(drugflow, tx)
+
+		AddNewDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count, tx)
+
+		//查询是否存在数据
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   deliver_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+
+		//查找是否有数据
+		autoMaticReduceDetail, _ := GetDrugAutoMaticReduceDetail(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if autoMaticReduceDetail.ID == 0 {
+			AddNewSigleDrugAutoReduceRecordInfo(details, tx)
+		}
+
+		if autoMaticReduceDetail.ID > 0 {
+			UpdateNewSingleDrugAutoReduceRecordInfo(autoMaticReduceDetail.ID, deliver_number, tx)
+		}
+
+		return nil
+
+	} else {
+
+		info := models.XtDrugWarehouseInfo{
+			ID:                warehouse.ID,
+			WarehousingId:     warehouse.WarehousingId,
+			DrugId:            warehouse.DrugId,
+			Number:            warehouse.Number,
+			ProductDate:       warehouse.ProductDate,
+			ExpiryDate:        warehouse.ExpiryDate,
+			WarehousingCount:  warehouse.WarehousingCount,
+			Price:             warehouse.RetailPrice,
+			TotalPrice:        warehouse.TotalPrice,
+			Dealer:            warehouse.Dealer,
+			Manufacturer:      warehouse.Manufacturer,
+			Remark:            warehouse.Remark,
+			Ctime:             warehouse.Ctime,
+			Mtime:             warehouse.Mtime,
+			Status:            1,
+			OrgId:             warehouse.OrgId,
+			IsReturn:          warehouse.IsReturn,
+			WarehousingOrder:  warehouse.WarehousingOrder,
+			Type:              warehouse.Type,
+			RetailPrice:       warehouse.RetailPrice,
+			RetailTotalPrice:  warehouse.RetailPrice,
+			StockMaxNumber:    0,
+			StockMinNumber:    0,
+			BatchNumber:       warehouse.BatchNumber,
+			MaxUnit:           warehouse.MaxUnit,
+			MinUnit:           drup.MinUnit,
+			WarehousingInfoId: warehouse.WarehousingInfoId,
+			SupplyWarehouseId: warehouse.SupplyWarehouseId,
+			StorehouseId:      storeConfig.DrugStorehouseOut,
+			IsCheck:           1,
+		}
+		//扣减库存
+		UpDateNewDrugWarehouseInfoByStock(&info, tx)
+
+		//查询剩余库存
+		stockInfo, _ := GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId, tx)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
+		}
+
+		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			Status:                  1,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           advice.RecordDate,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   warehouse.RetailPrice,
+			CountUnit:               drup.MinUnit,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   stock_number,
+			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+		}
+
+		//查询今日该药品该患者是否有出库数据
+		lastDrugOutInfo, _ := GetNewNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if lastDrugOutInfo.ID == 0 {
+			AddNewSigleDrugWarehouseOutInfo(warehouseOutInfo, tx)
+		}
+		//如果有数量则新增数量
+		if lastDrugOutInfo.ID > 0 {
+
+			UpdateSigleDrugWarehouseOutInfoDetail(lastDrugOutInfo.ID, warehouseOutInfo.Count, tx)
+
+		}
+
+		//查询是否存在数据
+		details := &models.DrugAutomaticReduceDetail{
+			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			PatientId:               advice.PatientId,
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              advice.RecordDate,
+			OrgId:                   orgID,
+			DrugId:                  advice.DrugId,
+			Count:                   stock_number,
+			CountUnit:               drup.MinUnit,
+			WarehouseInfoId:         warehouse.ID,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			AdviceId:                advice.ID,
+		}
+
+		//查找是否有数据
+		autoMaticReduceDetail, _ := GetDrugAutoMaticReduceDetail(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID, tx)
+
+		if autoMaticReduceDetail.ID == 0 {
+			AddNewSigleDrugAutoReduceRecordInfo(details, tx)
+		}
+
+		if autoMaticReduceDetail.ID > 0 {
+			UpdateNewSingleDrugAutoReduceRecordInfo(autoMaticReduceDetail.ID, deliver_number, tx)
+		}
+
+		drugflow := models.DrugFlow{
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseout.ID,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   stock_number,
+			Price:                   warehouse.RetailPrice,
+			Status:                  1,
+			Ctime:                   advice.AdviceDate,
+			Mtime:                   time.Now().Unix(),
+			UserOrgId:               orgID,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          3,
+			IsEdit:                  1,
+			Creator:                 advice.ExecutionStaff,
+			IsSys:                   1,
+			PatientId:               advice.PatientId,
+			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            storeConfig.DrugStorehouseOut,
+			WarehouseOutDetailId:    lastDrugOutInfo.ID,
+			OverCount:               sum_count,
+			AdviceId:                advice.ID,
+			LastPrice:               warehouse.Price,
+			SystemTime:              advice.AdviceDate,
+			OperateTime:             time.Now().Unix(),
+		}
+
+		CreateNewDrugFlowOne(drugflow, tx)
+		//出库数量相加
+		AddNewDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count, tx)
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		prescribingNumber_two_temp := deliver_number - stock_number
+
+		overPlusNumber := float64(prescribingNumber_two_temp)
+
+		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
+		advice.PrescribingNumberUnit = drup.MinUnit
+
+		HisStoryBloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber, unit, tx)
+	}
+
+	return
+}

service/pharmacy_service.go

@@ -869,7 +869,7 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 			pharmacyConfig := IsPharmacyConfig(orgid)
 			if pharmacyConfig == true {
 				//扣减库存
-				err = HisDrugsDelivery(orgid, creater, item)
+				err = HisFaDrugsDelivery(orgid, creater, item)
 				if err != nil {
 					err = fmt.Errorf("!:%v", err)
 					return

service/schedule_service.go

@@ -1918,7 +1918,7 @@ func UpdateMobileSchedule(id_two int64, mode_id int64, bed_id int64, zone_id int
 
 func GetPatientGoodCountToday(patient_id int64, schedule_date int64, user_org_id int64) (list []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("patient_id =? and sys_record_time=? and org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&list).Error
+	err = XTReadDB().Where("patient_id =? and sys_record_time=? and org_id = ? and status=1 and count>0", patient_id, schedule_date, user_org_id).Find(&list).Error
 	return list, err
 }
 

service/sign_service.go

@@ -2112,7 +2112,7 @@ func UpdateAllPatient(id int64, diagose string, orgid int64) error {
 
 func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", 29083).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1", 26973).Find(&list).Error
 
 	return list, err
 }

service/stock_service.go

@@ -3487,6 +3487,13 @@ func UpdateSigleDrugWarehouseOutInfoDetail(id int64, count int64, tx *gorm.DB) e
 	return err
 }
 
+func UpdateSigleDrugWarehouseOutInfoDetailOne(id int64, count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"count": count}).Error
+
+	return err
+}
+
 func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
 	ut := writeDb.Begin()
 	err := ut.Create(&detail).Error
@@ -5924,12 +5931,26 @@ func GetHisAdviceListByDrugIdEight(drugid int64, patient_id int64, advice_date i
 	return info, err
 }
 
+func GetHisAdviceListByDrugIdNight(drugid int64, patient_id int64, advice_date int64, advice_id int64) (models.HisDoctorAdviceInfo, error) {
+
+	info := models.HisDoctorAdviceInfo{}
+	err := XTReadDB().Model(&info).Where("drug_id = ? and patient_id = ? and advice_date = ? and status = 1 and id =?", drugid, patient_id, advice_date, advice_id).Find(&info).Error
+	return info, err
+}
+
 func GetLastDrugWarehouseOutByDrugId(drugid int64, patient_id int64, advice_date int64, advice_id int64) (models.DrugAutomaticReduceDetail, error) {
 	detail := models.DrugAutomaticReduceDetail{}
 	err := XTReadDB().Model(&detail).Where("drug_id = ? and patient_id = ? and record_time = ? and status = 1 and advice_id = ?", drugid, patient_id, advice_date, advice_id).Last(&detail).Error
 	return detail, err
 }
 
+func GetWarehouseOutListExport(drug_id int64, patient_id int64, record_date int64, advice_id int64) (out []*models.XtDrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time = ? and advice_id =? and status =1", drug_id, patient_id, record_date, advice_id).Find(&out).Error
+
+	return out, err
+}
+
 func GetLastDrugWarehouseOutByDrugIdTwenty(drugid int64, patient_id int64, advice_date int64, advice_id int64) (out []*models.DrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("advice_id = ?  and drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and is_check = 1", advice_id, drugid, patient_id, advice_date).Find(&out).Error

service/user_service.go

@@ -218,7 +218,10 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 
 func GetDrugFlowDetailById(drug_id int64, org_id int64) (flow []*models.DrugFlow, err error) {
 
-	err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =?", drug_id, org_id).Order("ctime asc").Find(&flow).Error
-
+	if org_id == 10217 {
+		err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =? and system_time>=1717171200", drug_id, org_id).Order("ctime asc").Find(&flow).Error
+	} else {
+		err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =?", drug_id, org_id).Order("ctime asc").Find(&flow).Error
+	}
 	return flow, err
 }

service/warhouse_service.go

@@ -8606,7 +8606,6 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 // 保存处方出库
 func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, creator int64, tx *gorm.DB) (err error) {
 
-	fmt.Println("出库时间-------------------------------------------------", record_time)
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -8887,8 +8886,7 @@ func NewHisGoodCancelInfo(orgID int64, creater int64, project *models.HisPrescri
 
 	out_count = GoodOutInfo.Count
 	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
-	fmt.Println("out_count---------------------------------------", out_count)
-	fmt.Println("cha_count++++++++++++++++++++++++++++++++++++++=", cha_count)
+
 	if out_count >= cha_count {
 		//退库 退回 cha_count 的数量
 		ModifyNewGoodWarehouseInfoStockMinNumber(cha_count, GoodOutInfo.GoodId, GoodOutInfo.OrgId, GoodOutInfo.WarehouseInfotId, tx)
@@ -9169,3 +9167,278 @@ func NewHisGoodAutoCancelInfo(orgID int64, creater int64, project *models.HisPre
 	}
 	return err
 }
+
+func NewHisDrugsDeliveryOne(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
+
+	// 1.判断药品是否来自专用字典的药品库
+	// 2.判断当天当前机构有没有创建出库单，没有则创建
+	// 3.创建出库流程
+	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+
+	isHasWay := false
+	record_time := int64(0)
+	isHasWay = true
+	record_time = advice.RecordDate
+
+	if isHasWay {
+		//判断当天当前机构有没有创建出库单，没有则创建
+		out, err := FindNewDrugStockOutByIsSys(orgID, 1, record_time, tx)
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		if err == gorm.ErrRecordNotFound {
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugWarehouseOut(orgID)
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+
+			warehouseOut := models.DrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           time.Now().Unix(),
+				OrgId:                   orgID,
+				Creater:                 creater,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        record_time,
+				Dealer:                  0,
+				Manufacturer:            0,
+				Type:                    1,
+				IsSys:                   1,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
+			}
+			err := AddNewSigleDrugWarehouseOut(&warehouseOut, tx)
+			if err != nil {
+				utils.TraceLog("创建出库单失败 err = %v", err)
+				return err
+			} else {
+				out = warehouseOut
+			}
+		}
+
+		//出库流程
+		//1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+		drup, _ := FindNewBaseDrugLibRecord(orgID, advice.DrugId, tx)
+		if drup.ID > 0 {
+			prescribingNumber := advice.PrescribingNumber
+			HisStoryBloodHisDrugDeliverInfoOne(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit, tx)
+
+		} else {
+			return errors.New("药品信息不存在")
+		}
+
+	}
+
+	return
+}
+
+func HisFaDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo) (err error) {
+
+	// 1.判断药品是否来自专用字典的药品库
+	// 2.判断当天当前机构有没有创建出库单，没有则创建
+	// 3.创建出库流程
+	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+
+	isHasWay := false
+	record_time := int64(0)
+	isHasWay = true
+	record_time = advice.RecordDate
+
+	if isHasWay {
+		//判断当天当前机构有没有创建出库单，没有则创建
+		out, err := FindDrugStockOutByIsSys(orgID, 1, record_time)
+		fmt.Println(out)
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		if err == gorm.ErrRecordNotFound {
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllDrugWarehouseOut(orgID)
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+
+			warehouseOut := models.DrugWarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           time.Now().Unix(),
+				OrgId:                   orgID,
+				Creater:                 creater,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        record_time,
+				Dealer:                  0,
+				Manufacturer:            0,
+				Type:                    1,
+				IsSys:                   1,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
+			}
+			err := AddSigleDrugWarehouseOut(&warehouseOut)
+			if err != nil {
+				utils.TraceLog("创建出库单失败 err = %v", err)
+				return err
+			} else {
+				out = warehouseOut
+			}
+		}
+
+		// 出库流程
+		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
+		if drup.ID > 0 {
+			//var now_count int64
+			////prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+			////now_count, _ = strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+			var now_count int64
+
+			if advice.PrescribingNumberUnit == drup.MaxUnit {
+				prescribingNumberOne := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)
+				prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+				now_count = prescribingNumberInt * drup.MinNumber
+
+			}
+			if advice.PrescribingNumberUnit == drup.MinUnit {
+				prescribingNumberOne := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 64)
+				prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
+				now_count = prescribingNumberInt
+
+				//回退库存
+			}
+
+			outListExport, _ := GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
+
+			var out_count int64
+			if len(outListExport) > 0 {
+				for _, item := range outListExport {
+					if item.CountUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+						out_count = item.Count * drup.MinNumber
+					}
+					if item.CountUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+						out_count = item.Count
+					}
+					if item.CountUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+						out_count = item.Count * drup.MinNumber
+					}
+
+				}
+			}
+
+			newadviceInfo := &models.HisDoctorAdviceInfo{
+				ID:                    advice.ID,
+				UserOrgId:             advice.UserOrgId,
+				PatientId:             advice.PatientId,
+				HisPatientId:          advice.HisPatientId,
+				AdviceType:            advice.AdviceType,
+				AdviceDate:            advice.AdviceDate,
+				StartTime:             advice.StartTime,
+				AdviceName:            advice.AdviceName,
+				AdviceDesc:            advice.AdviceDesc,
+				ReminderDate:          advice.ReminderDate,
+				SingleDose:            advice.SingleDose,
+				SingleDoseUnit:        advice.SingleDoseUnit,
+				PrescribingNumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				DeliveryWay:           advice.DeliveryWay,
+				ExecutionFrequency:    advice.ExecutionFrequency,
+				AdviceDoctor:          advice.AdviceDoctor,
+				Status:                advice.Status,
+				CreatedTime:           advice.CreatedTime,
+				UpdatedTime:           advice.UpdatedTime,
+				AdviceAffirm:          advice.AdviceAffirm,
+				Remark:                advice.Remark,
+				StopTime:              advice.StopTime,
+				StopReason:            advice.StopReason,
+				StopDoctor:            advice.StopDoctor,
+				StopState:             advice.StopState,
+				ParentId:              advice.ParentId,
+				ExecutionTime:         advice.ExecutionTime,
+				ExecutionStaff:        advice.ExecutionStaff,
+				ExecutionState:        advice.ExecutionState,
+				Checker:               advice.Checker,
+				RecordDate:            advice.RecordDate,
+				DialysisOrderId:       advice.DialysisOrderId,
+				CheckTime:             advice.CheckTime,
+				CheckState:            advice.CheckState,
+				DrugSpec:              advice.DrugSpec,
+				DrugSpecUnit:          advice.DrugSpecUnit,
+				Groupno:               advice.Groupno,
+				RemindType:            advice.RemindType,
+				FrequencyType:         advice.FrequencyType,
+				DayCount:              advice.DayCount,
+				WeekDay:               advice.WeekDay,
+				TemplateId:            advice.TemplateId,
+				Modifier:              advice.Modifier,
+				DrugId:                advice.DrugId,
+				Price:                 advice.Price,
+				PrescriptionId:        advice.PrescriptionId,
+				MedListCodg:           advice.MedListCodg,
+				FeedetlSn:             advice.FeedetlSn,
+				Day:                   advice.DayCount,
+				ChildDoctorAdvice:     nil,
+				Drug:                  models.Drug{},
+				Diagnosis:             advice.Diagnosis,
+				Way:                   advice.Way,
+				HospApprFlag:          advice.HospApprFlag,
+				LmtUsedFlag:           advice.LmtUsedFlag,
+				HisOrderInfo:          models.HisOrderInfo{},
+				IsMedicine:            advice.IsMedicine,
+				ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+				Child:                 nil,
+				IsSettle:              advice.IsSettle,
+				IsMobile:              advice.IsMobile,
+				IsSelfDrug:            advice.IsSelfDrug,
+				DrugWayCount:          advice.DrugWayCount,
+			}
+
+			db := XTWriteDB()
+			tx := db.Begin()
+
+			// 在函数结束时处理事务回滚
+			defer func() {
+				if r := recover(); r != nil {
+					tx.Rollback()
+				} else {
+					tx.Commit()
+				}
+			}()
+
+			//如果当前医嘱数量大于历史出库数据则需要出库
+			if now_count > out_count {
+
+				//按最小单位出库
+				var cha_count = now_count - out_count
+
+				newadviceInfo.PrescribingNumber = float64(cha_count)
+				newadviceInfo.PrescribingNumberUnit = drup.MinUnit
+
+				NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+
+			}
+
+			//如果当前医嘱数量小于历史出库数据则需要退库
+			if now_count < out_count {
+				var cha_count = out_count - now_count
+				drug, _ := FindBaseDrugLibRecordSeven(advice.UserOrgId, advice.DrugId)
+				NewHisDrugCancelInfo(advice.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+				NewHisDrugAutoCancelInfo(advice.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
+
+			}
+
+			if now_count == out_count {
+				if out_count == 0 {
+					NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+				}
+
+			}
+		} else {
+			return errors.New("药品信息不存在")
+		}
+
+	}
+
+	return
+}