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

controllers/doctors_api_controller.go

@@ -931,47 +931,7 @@ func (this *DoctorsApiController) SaveCreationInspection() {
 	inspect_date := dataBody["inspect_date"].(string)
 	project_id := dataBody["project_id"].(string)
 	template_inspection_id := int64(dataBody["template_inspection_id"].(float64))
-	//title := this.GetString("title")
-	//dryWeight := this.GetString("dry_weight")
-	//dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	//dialysis_count, _ := this.GetInt64("dialysis_count")
-	//hd_count, _ := this.GetInt64("hd_count")
-	//hdf_count, _ := this.GetInt64("hdf_count")
-	//hp_count, _ := this.GetInt64("hp_count")
-	//other_count, _ := this.GetInt64("other_count")
-	//dialzer_apparatus := this.GetString("dialzer_apparatus")
-	//perfusion_apparatus := this.GetString("perfusion_apparatus")
-	//anticoagulant, _ := this.GetInt64("anticoagulant")
-	//kaliumstr := this.GetString("kalium")
-	//kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-	//
-	//autunitestr := this.GetString("autunite")
-	//autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	//natriumstr := this.GetString("natrium")
-	//natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	//hour, _ := this.GetInt64("hour")
-	//minute, _ := this.GetInt64("minute")
-	//beforWeight := this.GetString("befor_weight")
-	//befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	//afterWeight := this.GetString("after_weight")
-	//after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	//befor_pressure := this.GetString("befor_pressure")
-	//template_summary_content := this.GetString("template_summary_content")
-	//template_plan_content := this.GetString("template_plan_content")
-	//admin_user_id, _ := this.GetInt64("admin_user_id")
-	//record_time := this.GetString("record_time")
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	//recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	//after_pressure := this.GetString("after_pressure")
-	//template_summary_id, _ := this.GetInt64("template_summary_id")
-	//template_plan_id, _ := this.GetInt64("template_plan_id")
-	//template_inspection_id, _ := this.GetInt64("template_inspection_id")
-	//patient_id, _ := this.GetInt64("patient_id")
-	//fmt.Println("patient_id", patient_id)
-	//orgId := this.GetAdminUserInfo().CurrentOrgId
-	//inspect_date := this.GetString("inspect_date")
-	//project_id := this.GetString("project_id")
+
 	summary := models.XtTemplateSummary{
 		StartYear:              0,
 		StartMonth:             0,
@@ -1086,50 +1046,86 @@ func (this *DoctorsApiController) UpdateTempalteSummary() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-
-	id, _ := this.GetInt64("id")
-	title := this.GetString("title")
-
-	dryWeight := this.GetString("dry_weight")
+	id := int64(dataBody["id"].(float64))
+	title := dataBody["title"].(string)
+	dryWeight := dataBody["dry_weight"].(string)
 	dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	dialysis_count, _ := this.GetInt64("dialysis_count")
-	hd_count, _ := this.GetInt64("hd_count")
-	hdf_count, _ := this.GetInt64("hdf_count")
-	hp_count, _ := this.GetInt64("hp_count")
-	other_count, _ := this.GetInt64("other_count")
-	dialzer_apparatus := this.GetString("dialzer_apparatus")
-	perfusion_apparatus := this.GetString("perfusion_apparatus")
-	anticoagulant, _ := this.GetInt64("anticoagulant")
-	kaliumstr := this.GetString("kalium")
+	dialysis_count := int64(dataBody["dialysis_count"].(float64))
+	hd_count := int64(dataBody["hd_count"].(float64))
+	hdf_count := int64(dataBody["hdf_count"].(float64))
+	hp_count := int64(dataBody["hp_count"].(float64))
+	other_count := int64(dataBody["other_count"].(float64))
+	dialzer_apparatus := dataBody["dialzer_apparatus"].(string)
+	perfusion_apparatus := dataBody["perfusion_apparatus"].(string)
+	anticoagulant := int64(dataBody["anticoagulant"].(float64))
+	kaliumstr := dataBody["kalium"].(string)
 	kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-
-	autunitestr := this.GetString("autunite")
+	autunitestr := dataBody["autunite"].(string)
 	autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	natriumstr := this.GetString("natrium")
+	natriumstr := dataBody["natrium"].(string)
 	natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	hour, _ := this.GetInt64("hour")
-	minute, _ := this.GetInt64("minute")
-	beforWeight := this.GetString("befor_weight")
+	hour := int64(dataBody["hour"].(float64))
+	minute := int64(dataBody["minute"].(float64))
+	beforWeight := dataBody["befor_weight"].(string)
 	befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	afterWeight := this.GetString("after_weight")
+	afterWeight := dataBody["after_weight"].(string)
 	after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	befor_pressure := this.GetString("befor_pressure")
-	template_summary_content := this.GetString("template_summary_content")
-	template_plan_content := this.GetString("template_plan_content")
-	admin_user_id, _ := this.GetInt64("admin_user_id")
-	record_time := this.GetString("record_time")
+	befor_pressure := dataBody["befor_pressure"].(string)
+	template_summary_content := dataBody["template_summary_content"].(string)
+	template_plan_content := dataBody["template_plan_content"].(string)
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
+	record_time := dataBody["record_time"].(string)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	after_pressure := this.GetString("after_pressure")
-	template_summary_id, _ := this.GetInt64("template_summary_id")
-	template_plan_id, _ := this.GetInt64("template_plan_id")
-	template_inspection_id, _ := this.GetInt64("template_inspection_id")
-	patient_id, _ := this.GetInt64("patient_id")
-	fmt.Println("patient_id", patient_id)
+	after_pressure := dataBody["after_pressure"].(string)
+	template_summary_id := int64(dataBody["template_summary_id"].(float64))
+	template_plan_id := int64(dataBody["template_plan_id"].(float64))
+	patient_id := int64(dataBody["patient_id"].(float64))
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	inspect_date := this.GetString("inspect_date")
-	project_id := this.GetString("project_id")
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
+	template_inspection_id := int64(dataBody["template_inspection_id"].(float64))
+	//dryWeight := this.GetString("dry_weight")
+	//dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
+	//dialysis_count, _ := this.GetInt64("dialysis_count")
+	//hd_count, _ := this.GetInt64("hd_count")
+	//hdf_count, _ := this.GetInt64("hdf_count")
+	//hp_count, _ := this.GetInt64("hp_count")
+	//other_count, _ := this.GetInt64("other_count")
+	//dialzer_apparatus := this.GetString("dialzer_apparatus")
+	//perfusion_apparatus := this.GetString("perfusion_apparatus")
+	//anticoagulant, _ := this.GetInt64("anticoagulant")
+	//kaliumstr := this.GetString("kalium")
+	//kalium, _ := strconv.ParseFloat(kaliumstr, 64)
+	//
+	//autunitestr := this.GetString("autunite")
+	//autunite, _ := strconv.ParseFloat(autunitestr, 64)
+	//natriumstr := this.GetString("natrium")
+	//natrium, _ := strconv.ParseFloat(natriumstr, 64)
+	//hour, _ := this.GetInt64("hour")
+	//minute, _ := this.GetInt64("minute")
+	//beforWeight := this.GetString("befor_weight")
+	//befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
+	//afterWeight := this.GetString("after_weight")
+	//after_weight, _ := strconv.ParseFloat(afterWeight, 64)
+	//befor_pressure := this.GetString("befor_pressure")
+	//template_summary_content := this.GetString("template_summary_content")
+	//template_plan_content := this.GetString("template_plan_content")
+	//admin_user_id, _ := this.GetInt64("admin_user_id")
+	//record_time := this.GetString("record_time")
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
+	//after_pressure := this.GetString("after_pressure")
+	//template_summary_id, _ := this.GetInt64("template_summary_id")
+	//template_plan_id, _ := this.GetInt64("template_plan_id")
+	//template_inspection_id, _ := this.GetInt64("template_inspection_id")
+	//patient_id, _ := this.GetInt64("patient_id")
+	//fmt.Println("patient_id", patient_id)
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	//inspect_date := this.GetString("inspect_date")
+	//project_id := this.GetString("project_id")
 	summary := models.XtTemplateSummary{
 		ID:                     id,
 		StartYear:              0,

controllers/drug_stock_api_contorller.go

@@ -240,8 +240,13 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					MinUnit:          min_unit,
 					RetailPrice:      retail_price,
 				}
-
-				if max_unit == min_unit {
+				medical, _ := service.GetBaseDrugMedical(drug_id)
+				if medical.MaxUnit == medical.MinUnit {
+					warehouseInfo.StockMaxNumber = warehousing_count
+					warehouseInfo.StockMinNumber = 0
+					warehouseInfo.MaxUnit = min_unit
+				}
+				if max_unit == medical.MinUnit {
 					warehouseInfo.StockMaxNumber = 0
 					warehouseInfo.StockMinNumber = warehousing_count
 					warehouseInfo.MaxUnit = min_unit
@@ -271,9 +276,12 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					IsSys:            0,
 				}
 
-				if max_unit == min_unit {
+				if medical.MaxUnit == medical.MinUnit {
 					drugflow.MaxUnit = min_unit
 				}
+				if max_unit == medical.MinUnit {
+					warehouseInfo.MaxUnit = min_unit
+				}
 				drugFlow = append(drugFlow, drugflow)
 
 			}
@@ -561,6 +569,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				manufacturer := int64(items["manufacturer"].(float64))
 
 				dealer := int64(items["dealer"].(float64))
+
+				medical, _ := service.GetBaseDrugMedical(drug_id)
 				if id == 0 {
 					warehouseInfo := &models.DrugWarehouseInfo{
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -586,11 +596,17 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						MinUnit:          min_unit,
 						StockMaxNumber:   warehousing_count,
 					}
-					if max_unit == min_unit {
+
+					if medical.MaxUnit == medical.MinUnit {
 						warehouseInfo.StockMaxNumber = warehousing_count
 						warehouseInfo.StockMinNumber = 0
 						warehouseInfo.MaxUnit = min_unit
 					}
+					if max_unit == medical.MinUnit {
+						warehouseInfo.StockMaxNumber = 0
+						warehouseInfo.StockMinNumber = warehousing_count
+						warehouseInfo.MaxUnit = min_unit
+					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
 				} else {
@@ -619,12 +635,18 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						MinUnit:          min_unit,
 						BatchNumber:      batch_number,
 					}
-					if max_unit == min_unit {
+					if medical.MaxUnit == medical.MinUnit {
 						warehouseInfo.StockMaxNumber = warehousing_count
 						warehouseInfo.StockMinNumber = 0
 						warehouseInfo.MaxUnit = min_unit
 					}
 
+					if max_unit == medical.MinUnit {
+						warehouseInfo.StockMaxNumber = 0
+						warehouseInfo.StockMinNumber = warehousing_count
+						warehouseInfo.MaxUnit = min_unit
+					}
+
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
 					drugflow := &models.DrugFlow{
@@ -1455,6 +1477,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			})
 			return
 		}
+
 		if prescribing_number_total > total_count {
 
 			goodObj, _ := service.GetDrugByGoodId(item.DrugId)

controllers/gobal_config_api_controller.go

@@ -2061,6 +2061,8 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 	page, _ := c.GetInt64("page")
 	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, page, limit)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	drug, _ := service.GetBaseDrugMedical(drug_id)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -2069,6 +2071,7 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 		"detail":           detail,
 		"total":            total,
 		"manufacturerList": manufacturerList,
+		"drug":             drug,
 	})
 }
 
@@ -2127,11 +2130,13 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	id, _ := c.GetInt64("id")
 	start_time, _ := c.GetInt64("start_time")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
+
 	list, err := service.GetSingleOrderDetail(id, orgId)
+
 	dealerList, err := service.GetAllDealerList(orgId)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	drugFlowList, _ := service.GetDrugStockFlowDetail(start_time, orgId)
-
+	flowlist, _ := service.GetSingeOrderFlow(id, orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -2141,6 +2146,7 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 		"dealerList":       dealerList,
 		"manufacturerList": manufacturerList,
 		"drugFlowList":     drugFlowList,
+		"flowlist":         flowlist,
 	})
 }
 

controllers/his_api_controller.go

@@ -1685,7 +1685,7 @@ func (c *HisApiController) DeletePrescription() {
 						cancelStockInfo := models.CancelStockInfo{
 							GoodId:          item.ProjectId,
 							CancelStockId:   cancel.ID,
-							GoodTypeId:      info.GoodTypeId,
+							GoodTypeId:      good.GoodTypeId,
 							Count:           prescribingNumber,
 							Price:           info.Price,
 							Total:           0,
@@ -2404,7 +2404,7 @@ func (c *HisApiController) DeleteProject() {
 				cancelStockInfo := models.CancelStockInfo{
 					GoodId:          project.ProjectId,
 					CancelStockId:   cancel.ID,
-					GoodTypeId:      info.GoodTypeId,
+					GoodTypeId:      good.GoodTypeId,
 					Count:           prescribingNumber,
 					Price:           info.Price,
 					Total:           0,
@@ -3235,13 +3235,24 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.StartTime = hisAdvice.StartTime
 					advice.HospApprFlag = hisAdvice.HospApprFlag
 
-					if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
-						advice.ExecutionTime = 0
-						advice.ExecutionStaff = 0
-						advice.ExecutionState = 2
-						advice.CheckTime = 0
-						advice.Checker = 0
-						advice.CheckState = 2
+					if hisAdvice.UserOrgId == 10028 {
+						if hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
+							advice.ExecutionTime = 0
+							advice.ExecutionStaff = 0
+							advice.ExecutionState = 2
+							advice.CheckTime = 0
+							advice.Checker = 0
+							advice.CheckState = 2
+						}
+					} else {
+						if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark || hisAdvice.PrescribingNumberUnit != advice.PrescribingNumberUnit {
+							advice.ExecutionTime = 0
+							advice.ExecutionStaff = 0
+							advice.ExecutionState = 2
+							advice.CheckTime = 0
+							advice.Checker = 0
+							advice.CheckState = 2
+						}
 					}
 
 					//advice.Groupno = hisAdvice.Groupno

controllers/mobile_api_controllers/patient_api_controller.go

@@ -687,11 +687,13 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+
 				isHasWay := false //用来判断是否包含来自药品库的医嘱
 				for _, item := range advices {
 					if item.Way == 1 {
 						isHasWay = true
 					}
+
 				}
 
 				if isHasWay {
@@ -1001,6 +1003,44 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 			if drugStockConfig.IsOpen == 1 {
 				for _, item := range advices {
+					//查询改药品信息
+					medical, _ := service.GetBaseDrugMedical(item.DrugId)
+					//查询这个患者这个患者这个药已经出库的所有数量
+					advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+					drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+					var total_count int64
+					var drug_count int64
+					for _, it := range advicelist {
+						if it.PrescribingNumberUnit == medical.MaxUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+							prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							total_count += prenumber * medical.MinNumber
+						}
+						if it.PrescribingNumberUnit == medical.MinUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+							prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							total_count += prenumber
+						}
+
+					}
+
+					for _, its := range drugoutlist {
+						if its.CountUnit == medical.MaxUnit {
+							drug_count += its.Count * medical.MinNumber
+						}
+						if its.CountUnit == medical.MinUnit {
+							drug_count += its.Count
+						}
+					}
+					if total_count == drug_count {
+						advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "1",
+							"advice": advice,
+							"ids":    ids,
+						})
+						return
+					}
 
 					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
 
@@ -1009,8 +1049,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					//查询该药品是否有库存
 					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
 
-					//查询改药品信息
-					medical, _ := service.GetBaseDrugMedical(advice.DrugId)
 					//判断单位是否相等
 					if medical.MaxUnit == advice.PrescribingNumberUnit {
 						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
@@ -1030,41 +1068,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					fmt.Println("数量一", prescribing_number_total)
 					fmt.Println("数量二", total)
 
-					//查询该药品的医嘱记录
-					//advicelist, _ := service.GetHisAdviceListByDrugId(advice.DrugId, advice.PatientId, advice.AdviceDate)
-					//if(advicelist.ID > 0){
-					//  //获取上一次的出库记录
-					//  record, _ := service.GetDrugAutoReduceRecordOne(advice.DrugId, advice.PatientId, advice.AdviceDate)
-					//  var out_count int64
-					//  for _, res := range record {
-					//    if(res.CountUnit == medical.MaxUnit){
-					//      res.Count = res.Count * medical.MinNumber
-					//    }
-					//    if(res.CountUnit == medical.MinUnit){
-					//      res.Count = res.Count
-					//    }
-					//    out_count += res.Count
-					//  }
-					//  if((prescribing_number_total - out_count) > 0){
-					//
-					//    if((prescribing_number_total - out_count) > total){
-					//      c.ServeSuccessJSON(map[string]interface{}{
-					//        "msg":    "2",
-					//        "advice": advice,
-					//        "ids":    ids,
-					//      })
-					//      return
-					//
-					//    }else{
-					//      service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//      break
-					//    }
-					//  }else{
-					//    service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//    break
-					//  }
-					//}
-
 					if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "3",

controllers/patient_api_controller.go

@@ -1935,13 +1935,48 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			//查询已经执行的医嘱
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
+
+				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
+				//查询这个患者这个患者这个药已经出库的所有数量
+				advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+				drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
+				var total_count int64
+				var drug_count int64
+				for _, it := range advicelist {
+					if it.PrescribingNumberUnit == medical.MaxUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+						prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total_count += prenumber * medical.MinNumber
+					}
+					if it.PrescribingNumberUnit == medical.MinUnit {
+						prescribingNumber_temp := strconv.FormatFloat(math.Abs(it.PrescribingNumber), 'f', 0, 64)
+						prenumber, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+						total_count += prenumber
+					}
+
+				}
+
+				for _, its := range drugoutlist {
+					if its.CountUnit == medical.MaxUnit {
+						drug_count += its.Count * medical.MinNumber
+					}
+					if its.CountUnit == medical.MinUnit {
+						drug_count += its.Count
+					}
+				}
+				if total_count == drug_count {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+				}
+
 				var total int64
 				var prescribing_number_total int64
 				//查询该药品是否有库存
 				list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
 
-				//查询改药品信息
-				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
 				//判断单位是否相等
 				if medical.MaxUnit == advice.PrescribingNumberUnit {
 					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
@@ -1950,9 +1985,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					total = list.Count*medical.MinNumber + list.StockMinNumber
 					prescribing_number_total = count * medical.MinNumber
 				}
-				//fmt.Println("单位1", medical.MinUnit)
-				//fmt.Println("d单位23", advice.PrescribingNumberUnit)
-				//fmt.Println("hhhhhhh", list.Count)
+
 				if medical.MinUnit == advice.PrescribingNumberUnit {
 					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
@@ -1962,49 +1995,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				}
 
-				//fmt.Println("要出库的数量", prescribing_number_total)
-				//fmt.Println("库存", total)
-
-				//查询该药品的医嘱记录
-				//advicelist, _ := service.GetHisAdviceListByDrugId(advice.DrugId, advice.PatientId, advice.AdviceDate)
-				//
-				//if(advicelist.ID > 0){
-				//  //获取上一次的出库记录
-				//  record, _ := service.GetDrugAutoReduceRecordOne(advice.DrugId, advice.PatientId, advice.AdviceDate)
-				//  var out_count int64
-				//  for _, res := range record {
-				//   if(res.CountUnit == medical.MaxUnit){
-				//      res.Count = res.Count * medical.MinNumber
-				//   }
-				//   if(res.CountUnit == medical.MinUnit){
-				//     res.Count = res.Count
-				//   }
-				//    out_count += res.Count
-				//  }
-				//  fmt.Println("上次",out_count)
-				//  fmt.Println("这次出库",prescribing_number_total)
-				//  fmt.Println("总库存",total)
-				//  fmt.Println("差2332332323232232323",prescribing_number_total - out_count)
-				//  //判断库存
-				//  if((prescribing_number_total - out_count) > 0){
-				//
-				//     if((prescribing_number_total - out_count) > total){
-				//       c.ServeSuccessJSON(map[string]interface{}{
-				//         "msg":    "2",
-				//         "advice": advice,
-				//       })
-				//       return
-				//     }else{
-				//       service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
-				//       break
-				//     }
-				//  }else{
-				//    service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
-				//    break
-				//  }
-				//
-				//}
-
 				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "3",

controllers/schedule_api_controller.go

@@ -1417,17 +1417,27 @@ func (this *ScheduleApiController) ExportSchedule() {
 			schedule_date := time.Now().Format("2006-01-02")
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
-			if err == nil {
 
+			if err == nil {
 				for _, item := range schedules {
 					if item.ScheduleDate > clear_schedule_date {
+						//查询已经存在的所有排班
+
 						//查找当天日期是否存在
 						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
 						if errcode == gorm.ErrRecordNotFound {
+							//查询该床位是否有患者
+							sch, errcodes := service.GetPatientByBed(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
+
+							if errcodes == gorm.ErrRecordNotFound {
+								service.CreateSchedule(item)
+							} else if errcodes == nil {
+
+								//清除当天该床位已有的患者
+								service.ModeFyScheduleById(sch.ScheduleDate, sch.BedId, sch.ScheduleType, sch.UserOrgId)
+								service.CreateSchedule(item)
+							}
 
-							//清除当天该床位已有的患者
-							service.ModeFyScheduleById(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
-							service.CreateSchedule(item)
 						} else if errcode == nil {
 							schedule := models.XtSchedule{
 								PartitionId:  item.PartitionId,

controllers/stock_in_api_controller.go

@@ -1738,7 +1738,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-
+			fmt.Println("item233223232323233223", item.Count)
 			//1.查询该耗材该批次的最后一次出库记录
 			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, item.OrgId)
 
@@ -1776,7 +1776,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 					//判断该批次的剩余库存 和出库的库存进行比较
 					//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
-
+					fmt.Println("total233322323232332232332", total)
+					fmt.Println("info333223322332323332233223", info.StockCount)
 					if total > info.StockCount {
 						//计算出库和该批次相差的库存
 						total_count = item.Count - info.StockCount
@@ -1789,9 +1790,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 							return
 						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "1",
-						})
 					}
 					//如果与上次比的库存小于或等于于该批次的剩余库存,那么需要该批次出库
 					if total <= info.StockCount {
@@ -1837,10 +1835,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 								return
 							}
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg": "1",
-							})
-							return
 						} else if errcode == nil {
 							service.UpDateWarehouseOutInfo(item)
 							//更新流水
@@ -1861,10 +1855,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 								Dealer:       item.Dealer,
 							}
 							service.UpdatedGoodInfo(goodInfo, item.GoodId)
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg": "1",
-							})
-							return
 						}
 					}
 				}
@@ -1931,10 +1921,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 							return
 						}
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "1",
-						})
-						return
+
 					} else if errcode == nil {
 						service.UpDateWarehouseOutInfo(item)
 						flow := models.VmStockFlow{
@@ -1953,7 +1940,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							Dealer:       item.Dealer,
 						}
 						service.UpdatedGoodInfo(goodInfo, item.GoodId)
-						return
+
 					}
 				}
 
@@ -1985,15 +1972,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					Dealer:       item.Dealer,
 				}
 				service.UpdatedGoodInfo(goodInfo, item.GoodId)
-				if errs != nil {
-					utils.ErrorLog(errs.Error())
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-					return
-				}
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "1",
-				})
-				return
+
 			}
 
 		}

controllers/supply_order_api_contorller.go

@@ -0,0 +1,43 @@
+package controllers
+
+import (
+	"XT_New/service"
+	"github.com/astaxie/beego"
+)
+
+type SupplyOrderApiController struct {
+	BaseAuthAPIController
+}
+
+func SupplyOrderApiRegistRouters() {
+
+	beego.Router("/api/supply/getinitorder", &SupplyOrderApiController{}, "get:GetInitOrder")
+}
+
+func (this *SupplyOrderApiController) GetInitOrder() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取药品库数据
+	baseList, _ := service.GetSupplyDrugList(orgId)
+
+	goodList, _ := service.GetSupplyGoodList(orgId)
+
+	manufactuerList, _ := service.GetAllManufacturerList(orgId)
+
+	goodTypeList, _ := service.GetAllGoodType(orgId)
+
+	supplyList, _ := service.GetSupplierList(orgId)
+
+	var drugType = "药品类型"
+	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
+	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugList":        baseList,
+		"goodList":        goodList,
+		"manufactuerList": manufactuerList,
+		"goodTypeList":    goodTypeList,
+		"drugTypeList":    drugTypeList,
+		"supplyList":      supplyList,
+	})
+	return
+}

models/device_models.go

@@ -166,7 +166,6 @@ func (MDeviceNumberForList) TableName() string {
 	return "xt_device_number"
 }
 
-
 type XtDeviceNumber struct {
 	ID      int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
 	OrgId   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
@@ -416,6 +415,7 @@ type XtSchedule struct {
 	Status          int64                   `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime     int64                   `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime     int64                   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport        int64                   `gorm:"column:is_export" json:"is_export" form:"is_export"`
 	LastAfterWeight AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 

models/supply.models.go

@@ -0,0 +1,89 @@
+package models
+
+type SpBaseDrug struct {
+	ID                int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName          string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugCategory      int64                  `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec          string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType          int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	MaxUnit           string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber         int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit           string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose              float64                `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit          string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDose          float64                `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit      int64                  `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	Manufacturer      int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId             int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number            string                 `gorm:"column:number" json:"number" form:"number"`
+	DrugWarehouseInfo []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+}
+
+func (SpBaseDrug) TableName() string {
+	return "xt_base_drug"
+}
+
+type SpGoodInformation struct {
+	ID                int64              `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId        int64              `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit          int64              `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	Manufacturer      int64              `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId             int64              `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName          string             `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodWarehouseInfo []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
+}
+
+func (SpGoodInformation) TableName() string {
+	return "xt_good_information"
+}
+
+type SpWarehouseInfo struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	GoodId     int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	StockCount int64 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (SpWarehouseInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
+type SpDrugWarehouseInfo struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	BatchNumber    string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (SpDrugWarehouseInfo) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+
+type SpSupplierName struct {
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	SupplierCode string  `gorm:"column:supplier_code" json:"supplier_code" form:"supplier_code"`
+	SupplierName string  `gorm:"column:supplier_name" json:"supplier_name" form:"supplier_name"`
+	SupplierType int64   `gorm:"column:supplier_type" json:"supplier_type" form:"supplier_type"`
+	VatRate      float64 `gorm:"column:vat_rate" json:"vat_rate" form:"vat_rate"`
+	Number       string  `gorm:"column:number" json:"number" form:"number"`
+	Bank         string  `gorm:"column:bank" json:"bank" form:"bank"`
+	BankAccount  string  `gorm:"column:bank_account" json:"bank_account" form:"bank_account"`
+	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64   `gorm:"column:status" json:"status" form:"status"`
+	ContactsId   string  `gorm:"column:contacts_id" json:"contacts_id" form:"contacts_id"`
+	Ctime        int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater      int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Modify       int64   `gorm:"column:modify" json:"modify" form:"modify"`
+}
+
+func (SpSupplierName) TableName() string {
+	return "xt_supplier_name"
+}

routers/router.go

@@ -76,4 +76,5 @@ func init() {
 	controllers.HisProjectRouters()
 	controllers.GdybRegistRouters()
 
+	controllers.SupplyOrderApiRegistRouters()
 }

service/gobal_config_service.go

@@ -819,6 +819,21 @@ func GetDrugStockFlowDetail(record_time int64, orgid int64) (drugflow []*models.
 	return drugflow, err
 }
 
+func GetSingeOrderFlow(id int64, orgid int64) (outInfo []*models.VmDrugWarehouseOutInfo, err error) {
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if id > 0 {
+		db = db.Where("x.warehouse_out_id in(?)", id)
+	}
+
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&outInfo).Error
+	return outInfo, err
+}
+
 func GetAllSingleDrugDetail(id int64, orgid int64) (outInfo []*models.VmDrugWarehouseOutInfo, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")

service/schedule_service.go

@@ -199,6 +199,19 @@ func GetTodayScheduleIsExistOne(patientid int64, schedudate int64, orgid int64)
 	return &scheudle, nil
 }
 
+func GetPatientByBed(schedule_date int64, bed_id int64, scheduletype int64, orgid int64) (*models.XtSchedule, error) {
+	var scheudle models.XtSchedule
+	var err error
+	err = XTReadDB().Model(&scheudle).Where(" schedule_date= ? and bed_id = ? and  schedule_type = ? and  user_org_id = ? and status = 1", schedule_date, bed_id, scheduletype, orgid).Find(&scheudle).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &scheudle, nil
+}
+
 func ModeFyScheduleById(schedule_date int64, bedid int64, scheduletype int64, orgid int64) error {
 
 	schedule := models.XtSchedule{}

service/stock_service.go

@@ -5707,3 +5707,15 @@ func ModeFyDrugWarehouseMin(id int64, stock_min_number int64) error {
 	err = XTWriteDB().Model(&info).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", stock_min_number)).Error
 	return err
 }
+
+func GetAllHisDoctorAdviceById(drugid int64, patient_id int64, advicedate int64, orgid int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and advice_date = ? and execution_state = 1 and status = 1 and user_org_id = ?", drugid, patient_id, advicedate, orgid).Find(&advice).Error
+	return advice, err
+}
+
+func GetAllDrugFlowById(drugid int64, patient_id int64, advicedate int64, orgid int64) (info []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ? and status = 1", drugid, patient_id, advicedate, orgid).Find(&info).Error
+	return info, err
+}

service/supply_service.go

@@ -0,0 +1,33 @@
+package service
+
+import "XT_New/models"
+
+func GetSupplyDrugList(orgid int64) (drug []*models.SpBaseDrug, err error) {
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Preload("DrugWarehouseInfo", "status = 1 and org_id = ?", orgid).Find(&drug).Error
+	return drug, err
+}
+
+func GetSupplyGoodList(orgid int64) (good []*models.SpGoodInformation, err error) {
+
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1")
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Preload("GoodWarehouseInfo", "status = 1 and org_id = ?", orgid).Find(&good).Error
+	return good, err
+}
+
+func GetSupplierList(orgid int64) (suppler []*models.SpSupplierName, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&suppler).Error
+	return suppler, err
+}

service/warhouse_service.go

@@ -798,6 +798,8 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
+	fmt.Println("库存1", stock_number)
+	fmt.Println("c出库数量", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -915,14 +917,14 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			ProductDate:             warehouse.ProductDate,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Count:                   deliver_number,
+			Count:                   stock_number,
 			RetailPrice:             advice.RetailPrice,
 			Price:                   advice.Price,
 			WarehouseInfoId:         warehouse.ID,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
 		}
-		warehouseOutInfo.Count = prescribingNumber
+		warehouseOutInfo.Count = stock_number
 
 		warehouseOutInfo.CountUnit = advice.CountUnit
 
@@ -938,7 +940,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			Number:                  warehouse.Number,
 			ProductDate:             advice.ProductDate,
 			ExpireDate:              advice.ExpiryDate,
-			Count:                   deliver_number,
+			Count:                   stock_number,
 			Price:                   advice.Price,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
@@ -965,7 +967,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		}
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
-
+		fmt.Println("剩余库存323323223232323232323323223", prescribingNumber_two_temp)
 		advice.CountUnit = drup.MinUnit
 
 		AutoDrugDeliverInfo(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
@@ -2422,7 +2424,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
 			WarehouseInfoId:         warehouse.ID,
-			Count:                   deliver_number,
+			Count:                   stock_number,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
 		}
@@ -2434,7 +2436,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			Number:                  warehouse.Number,
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
-			Count:                   deliver_number,
+			Count:                   stock_number,
 			Price:                   min_price,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
@@ -2469,7 +2471,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			RecordTime:              advice.RecordDate,
 			OrgId:                   orgID,
 			DrugId:                  advice.DrugId,
-			Count:                   deliver_number,
+			Count:                   stock_number,
 			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			AdviceId:                advice.ID,