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

.idea/vcs.xml

@@ -7,6 +7,5 @@
   </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/src/golang.org/x/sync" vcs="Git" />
   </component>
 </project>

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode =dev
 #dev/prod
 

controllers/data_api_controller.go

@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/dialysis_api_controller.go

@@ -107,6 +107,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/schedule/settlenewdoctoradvice", &DialysisApiController{}, "Get:SettleNewDoctorAdvice")
 
 	beego.Router("/api/schedule/excutiondoctoradvicebyid", &DialysisApiController{}, "Get:ExcutionDoctorAdviceById")
+
+	beego.Router("/api/patient/getdialysisadvicetoday", &DialysisApiController{}, "Get:GetDialysisAdviceToday")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -321,6 +323,7 @@ func (c *DialysisApiController) PostPrescription() {
 	water_machine := c.GetString("water_machine")
 	add_amount, _ := c.GetFloat("add_amount")
 	reduce_amount, _ := c.GetFloat("reduce_amount")
+	dialysis_remark := c.GetString("dialysis_remark")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -428,6 +431,7 @@ func (c *DialysisApiController) PostPrescription() {
 		WaterMachine:               water_machine,
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
+		DialysisRemark:             dialysis_remark,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -659,6 +663,7 @@ func (c *DialysisApiController) PostSoulution() {
 	water_machine := c.GetString("water_machine")
 	add_amount, _ := c.GetFloat("add_amount")
 	reduce_amount, _ := c.GetFloat("reduce_amount")
+	dialysis_remark := c.GetString("dialysis_remark")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -778,6 +783,7 @@ func (c *DialysisApiController) PostSoulution() {
 		WaterMachine:               water_machine,
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
+		DialysisRemark:             dialysis_remark,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -948,6 +954,7 @@ func (c *DialysisApiController) PostSoulution() {
 		OxygenTime:                 oxygen_time,
 		PreImpulse:                 preImpules,
 		SolutionStatus:             1,
+		DialysisRemark:             dialysis_remark,
 	}
 
 	//针对河间咸得
@@ -2955,13 +2962,22 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
-	if adminUserInfo.CurrentOrgId != 10101 {
+	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 && adminUserInfo.CurrentOrgId != 10345 {
 		dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 		patientInfo.TotalDialysis = dialysis_count
 	}
-	if adminUserInfo.CurrentOrgId == 10101 {
-		dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-		patientInfo.TotalDialysis = dialysis_count
+	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10345 {
+
+		if xttime <= 1672416000 {
+			dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+			patientInfo.TotalDialysis = dialysis_count
+		}
+
+		if xttime >= 1672502400 {
+			dialysis_count, _ := service.GetDialysisOrderCountTwo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+			patientInfo.TotalDialysis = dialysis_count
+		}
+
 	}
 
 	//相关操作对应的操作人
@@ -4805,7 +4821,8 @@ func (this *DialysisApiController) ExcutionDoctorAdvice() {
 					prescribing_number = parseIntPrescribingNumber
 				}
 				sum_out_count += prescribing_number
-				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(it.DrugId, orgId)
+				houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(it.DrugId, orgId, houseConfig.DrugStorehouseOut)
 				//库存不足
 				if sum_out_count > drugStockOut.FlushCount {
 					this.ServeSuccessJSON(map[string]interface{}{
@@ -4952,7 +4969,8 @@ func (this *DialysisApiController) ExcutionDoctorAdvice() {
 					prescribing_number = parseIntPrescribingNumber
 				}
 				sum_out_count += prescribing_number
-				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(it.DrugId, orgId)
+				houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(it.DrugId, orgId, houseConfig.DrugStorehouseOut)
 				//库存不足
 				if sum_out_count > drugStockOut.FlushCount {
 					this.ServeSuccessJSON(map[string]interface{}{
@@ -5209,8 +5227,8 @@ func (this *DialysisApiController) ExcutionDoctorAdviceById() {
 		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
 			prescribing_number = parseIntPrescribingNumber
 		}
-
-		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId)
+		houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId, houseConfig.DrugStorehouseOut)
 		//库存不足
 		if prescribing_number > drugStockOut.FlushCount {
 			this.ServeSuccessJSON(map[string]interface{}{
@@ -5349,7 +5367,8 @@ func (this *DialysisApiController) ExcutionDoctorAdviceById() {
 		if advice.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
 			prescribing_number = parseIntPrescribingNumber
 		}
-		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId)
+		houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+		drugStockOut, _ := service.GetDrugSumOutCountByDrugId(advice.DrugId, orgId, houseConfig.DrugStorehouseOut)
 		//库存不足
 		if prescribing_number > drugStockOut.FlushCount {
 			this.ServeSuccessJSON(map[string]interface{}{
@@ -5442,3 +5461,34 @@ func (this *DialysisApiController) ExcutionDoctorAdviceById() {
 	return
 
 }
+
+func (this *DialysisApiController) GetDialysisAdviceToday() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type, _ := this.GetInt64("partion_type")
+
+	start_time := this.GetString("selected_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
+
+	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
+	_, config := service.FindXTHisRecordByOrgId(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":   list,
+			"drug":   drug,
+			"config": config,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/dialysis_record_api_controller.go

@@ -1009,6 +1009,24 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
 	//更新患者表排班备注
 	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, patientID, schedule_remark)
+
+	////统计该患者总次数
+	//dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.CurrentOrgId, patientID)
+	//
+	//service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
+
+	if adminUserInfo.CurrentOrgId != 10101 && adminUserInfo.CurrentOrgId != 10445 && adminUserInfo.CurrentOrgId != 3877 && adminUserInfo.CurrentOrgId != 10345 {
+		//统计该患者总次数
+		dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.CurrentOrgId, patientID)
+		service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
+	}
+
+	if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10345 {
+		//统计该患者总次数
+		dialysisCount, _ := service.GetDialysisTotalCountOne(adminUserInfo.CurrentOrgId, patientID)
+		service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, dialysisCount.Count)
+	}
+
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 	redis := service.RedisClient()
 	//清空key 值

controllers/gobal_config_api_controller.go

@@ -2231,7 +2231,7 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 
 	list, err := service.GetSingleOrderDetail(id, orgId)
-	drugoutlist, _ := service.GetDrugWarehouseOutDetailSeventy(id, orgId)
+	drugoutlist, _ := service.GetDrugWarehouseOutDetailNighty(id, orgId)
 	dealerList, err := service.GetAllDealerList(orgId)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	drugFlowList, _ := service.GetDrugStockFlowDetail(start_time, orgId)

controllers/his_api_controller.go

@@ -988,6 +988,8 @@ func (c *HisApiController) CreateHisPrescription() {
 	//耗材保存处方出库
 	goodOutConfig, _ := service.FindGoodOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 
+	settleConfig, _ := service.FindeDrugSettleConfigById(c.GetAdminUserInfo().CurrentOrgId)
+
 	//已发药和已收费限制逻辑
 	isMidicine := false
 	isCharge := false
@@ -1048,7 +1050,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	}
 	//已发药和已收费限制逻辑
 
-	if drugStockConfig.IsOpen == 1 {
+	if drugStockConfig.IsOpen == 1 || settleConfig.IsOpen == 1 {
 		//校验库存总量
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
@@ -1564,6 +1566,97 @@ func (c *HisApiController) CreateHisPrescription() {
 		}
 	}
 
+	//校验耗材库存
+	if goodOutConfig.IsOpen == 1 {
+
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+
+					items := item.(map[string]interface{})
+					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+						projects := items["project"].([]interface{})
+						if len(projects) > 0 {
+
+							for _, project := range projects {
+								var project_id int64
+								var project_type int64
+								var totals float64
+								var project_name string
+								var parsetotal int64
+								var id int64
+								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
+									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
+								}
+								if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
+									project_type = int64(project.(map[string]interface{})["type"].(float64))
+								}
+								if project.(map[string]interface{})["total"] != nil || reflect.TypeOf(project.(map[string]interface{})["total"]).String() == "string" {
+									total, _ := project.(map[string]interface{})["total"].(string)
+									totals, _ = strconv.ParseFloat(total, 64)
+								}
+
+								if project.(map[string]interface{})["project_name"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_name"]).String() == "string" {
+									project_name = project.(map[string]interface{})["project_name"].(string)
+
+								}
+								if project_type == 3 {
+
+									//查找该耗材的出库记录
+									goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSevenEight(project_id, patient_id, recordDateTime)
+
+									if len(goodWarehouseInfo) == 0 {
+										//查询耗材库存
+										list, _ := service.GetGoodWarehouseInfoSevenTen(project_id, storeConfig.StorehouseOutInfo)
+										var stock_count int64
+										for _, it := range list {
+											stock_count += it.StockCount
+										}
+										stock_counts := strconv.FormatInt(stock_count, 10)
+										stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
+										if totals > stock_total_count {
+											c.ServeDynamicFailJsonSend(project_name + "库存不足")
+											return
+										}
+									}
+
+									if len(goodWarehouseInfo) > 0 {
+										//查询该患者耗材的历史数据
+										ordProject, _ := service.GetHisProjectPrescriptionByPatientIdOne(id)
+										count, _ := strconv.ParseInt(ordProject.Count, 10, 64)
+										//数量发生改变
+										if parsetotal != count {
+											//如果现在的数量大于历史数量，就要看库存是否足够
+											if parsetotal > count {
+
+												//查询耗材所有库存
+												list, _ := service.GetGoodWarehouseInfoSevenTen(project_id, storeConfig.StorehouseOutInfo)
+												var stock_count int64
+												for _, it := range list {
+													stock_count += it.StockCount
+												}
+
+												//库存不足
+												if (parsetotal - count) > stock_count {
+													c.ServeDynamicFailJsonSend(project_name + "库存不足")
+													return
+												}
+											}
+										}
+									}
+
+								}
+
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	//不使用耗材保存处方出库
 	if goodOutConfig.IsOpen != 1 {
 		if stockConfig.IsOpen == 1 {
@@ -2190,15 +2283,22 @@ func (c *HisApiController) CreateHisPrescription() {
 
 			//查询今日耗材出库数量
 			hisgoodlist, _ := service.GetHisGoodList(patient_id, recordDateTime, adminInfo.CurrentOrgId)
+
 			for _, item := range hisgoodlist {
 				//查询耗材最后一次出库记录
 				wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(item.ProjectId, patient_id, recordDateTime, item.ID)
+				fmt.Println("hh23h232323o23o23o2o32o23o2o3o2o23o32o23o2o323o23o23o23o23o23o")
+				//查询默认出库仓库库存
+				storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 				if len(wareOut) > 0 {
+
 					for _, it := range wareOut {
 						//回退库存
 						service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
 						//删除出库记录
 						service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
+						//出库数量减少
+						service.UpdateSumCount(it.OrgId, storeConfig.StorehouseOutInfo, it.ProjectId, it.Count)
 					}
 				}
 
@@ -2214,8 +2314,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 				operation_time := time.Now().Unix()
 				creater := c.GetAdminUserInfo().AdminUser.Id
-				//查询默认出库仓库库存
-				storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+
 				recordDateStr := time.Now().Format("2006-01-02")
 				recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 				nowtime := recordDate.Unix()
@@ -2243,6 +2342,7 @@ func (c *HisApiController) CreateHisPrescription() {
 				goodObj, _ := service.GetGoodInformationByGoodIdThirty(item.ProjectId)
 				houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 				parseIntCount, _ := strconv.ParseInt(item.Count, 10, 64)
+
 				dialyPrepareOne := models.DialysisBeforePrepare{
 					GoodTypeId:   goodObj.GoodTypeId,
 					GoodId:       item.ProjectId,
@@ -2256,21 +2356,24 @@ func (c *HisApiController) CreateHisPrescription() {
 					StorehouseId: houseConfig.StorehouseOutInfo,
 					ProjectId:    item.ID,
 				}
+				goodinfo, _ := service.GetGoodInformationByGoodIdThirty(item.ProjectId)
+				if goodinfo.IsUser == 2 || goodinfo.IsUser == 0 {
+					service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
 
-				service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater)
+					//查询剩余库存
+					goodList, _ := service.GetAllGoodSumCount(item.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo)
+					var sum_count int64
+					for _, item := range goodList {
+						sum_count += item.StockCount
+					}
 
-				//查询剩余库存
-				goodList, _ := service.GetAllGoodSumCount(item.ProjectId, adminInfo.CurrentOrgId)
-				var sum_count int64
-				for _, item := range goodList {
-					sum_count += item.StockCount
-				}
+					//更新剩余库存
+					service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.CurrentOrgId, sum_count)
 
-				//更新剩余库存
-				service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.ProjectId, adminInfo.CurrentOrgId, sum_count)
+					//耗材
+					service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
+				}
 
-				//耗材
-				service.UpdateGoodSumCountSeven(sum_count, item.ProjectId, adminInfo.CurrentOrgId)
 			}
 		}
 	}
@@ -2573,10 +2676,11 @@ func (c *HisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
 	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
-	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
+	drugOutConfig, _ := service.FindDrugOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 	//耗材保存处方出库
 	goodOutConfig, _ := service.FindGoodOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 	//已收费和已发药限制逻辑
@@ -2833,7 +2937,7 @@ func (c *HisApiController) DeletePrescription() {
 
 							if prescribingNumber >= dialysisInfo.Count {
 								//删除出库表
-								service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
+								service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId, item.ID)
 							}
 
 							//更新库存
@@ -2917,7 +3021,6 @@ func (c *HisApiController) DeletePrescription() {
 				}
 			}
 
-			fmt.Println("goodOutConfig.IsOpen23232332233232232323232323", goodOutConfig.IsOpen)
 			//保存耗材出库
 			if goodOutConfig.IsOpen == 1 {
 
@@ -2968,159 +3071,156 @@ func (c *HisApiController) DeletePrescription() {
 					for _, it := range goodList {
 						flush_count += it.StockCount
 					}
-					fmt.Println("nfo.Count342232332323223232323", info.Count)
-					fmt.Println("total_count0999923923932923", total_count)
+					fmt.Println("历史出库数据", info.Count)
+					fmt.Println("出库数量", total_count)
 					if info.ID > 0 {
-						if info.Count >= total_count {
-
-							//回退库存
-							service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, item.ProjectId)
-							cancelStockInfo := models.CancelStockInfo{
-								GoodId:          item.ProjectId,
-								CancelStockId:   cancel.ID,
-								GoodTypeId:      good.GoodTypeId,
-								Count:           prescribingNumber,
-								Price:           info.Price,
-								Total:           0,
-								ProductDate:     info.ProductDate,
-								ExpiryDate:      info.ExpiryDate,
-								Ctime:           time.Now().Unix(),
-								Status:          1,
-								OrgId:           c.GetAdminUserInfo().CurrentOrgId,
-								OrderNumber:     cancel.OrderNumber,
-								Type:            0,
-								Dealer:          deaerler.DealerName,
-								Manufacturer:    manufacturer.ManufacturerName,
-								Number:          info.Number,
-								RegisterAccount: "",
-								Remark:          "",
-								WarehouseInfoId: info.WarehouseInfotId,
-								PatientId:       info.PatientId,
-								RecordDate:      info.SysRecordTime,
-								StorehouseId:    houseConfig.StorehouseOutInfo,
-								IsCheck:         1,
-							}
-
-							service.CreateCancelStockInfoOne(&cancelStockInfo)
-
-							cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
-
-							flow := models.VmStockFlow{
-								WarehousingId:           info.WarehouseInfotId,
-								GoodId:                  item.ProjectId,
-								Number:                  info.Number,
-								LicenseNumber:           info.LicenseNumber,
-								Count:                   prescribingNumber,
-								UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-								PatientId:               item.PatientId,
-								SystemTime:              info.SysRecordTime,
-								ConsumableType:          7,
-								IsSys:                   0,
-								WarehousingOrder:        "",
-								WarehouseOutId:          info.WarehouseOutId,
-								WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-								IsEdit:                  0,
-								CancelStockId:           cancel.ID,
-								CancelOrderNumber:       cancel.OrderNumber,
-								Manufacturer:            manufacturer.ID,
-								Dealer:                  0,
-								Creator:                 c.GetAdminUserInfo().CurrentOrgId,
-								UpdateCreator:           0,
-								Status:                  1,
-								Ctime:                   time.Now().Unix(),
-								Mtime:                   0,
-								Price:                   info.Price,
-								WarehousingDetailId:     info.WarehouseInfotId,
-								WarehouseOutDetailId:    info.ID,
-								CancelOutDetailId:       cancelInfo.ID,
-								ProductDate:             info.ProductDate,
-								ExpireDate:              info.ExpiryDate,
-								StorehouseId:            houseConfig.StorehouseOutInfo,
-								OverCount:               flush_count,
-							}
-							service.CreateStockFlowOne(flow)
-
-							//退库数量增加
-							service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
-							//出库数量减少
-							service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, total_count)
 
+						//回退库存
+						service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, item.ProjectId)
+						cancelStockInfo := models.CancelStockInfo{
+							GoodId:          item.ProjectId,
+							CancelStockId:   cancel.ID,
+							GoodTypeId:      good.GoodTypeId,
+							Count:           prescribingNumber,
+							Price:           info.Price,
+							Total:           0,
+							ProductDate:     info.ProductDate,
+							ExpiryDate:      info.ExpiryDate,
+							Ctime:           time.Now().Unix(),
+							Status:          1,
+							OrgId:           c.GetAdminUserInfo().CurrentOrgId,
+							OrderNumber:     cancel.OrderNumber,
+							Type:            0,
+							Dealer:          deaerler.DealerName,
+							Manufacturer:    manufacturer.ManufacturerName,
+							Number:          info.Number,
+							RegisterAccount: "",
+							Remark:          "",
+							WarehouseInfoId: info.WarehouseInfotId,
+							PatientId:       info.PatientId,
+							RecordDate:      info.SysRecordTime,
+							StorehouseId:    houseConfig.StorehouseOutInfo,
+							IsCheck:         1,
 						}
 
-						if info.Count < total_count {
-							//回退库存
-							service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, item.ProjectId)
-							cancelStockInfo := models.CancelStockInfo{
-								GoodId:          item.ProjectId,
-								CancelStockId:   cancel.ID,
-								GoodTypeId:      good.GoodTypeId,
-								Count:           info.Count,
-								Price:           info.Price,
-								Total:           0,
-								ProductDate:     info.ProductDate,
-								ExpiryDate:      info.ExpiryDate,
-								Ctime:           time.Now().Unix(),
-								Status:          1,
-								OrgId:           c.GetAdminUserInfo().CurrentOrgId,
-								OrderNumber:     cancel.OrderNumber,
-								Type:            0,
-								Dealer:          deaerler.DealerName,
-								Manufacturer:    manufacturer.ManufacturerName,
-								Number:          info.Number,
-								RegisterAccount: "",
-								Remark:          "",
-								WarehouseInfoId: info.WarehouseInfotId,
-								PatientId:       info.PatientId,
-								RecordDate:      info.SysRecordTime,
-								StorehouseId:    houseConfig.StorehouseOutInfo,
-								IsCheck:         1,
-							}
-
-							service.CreateCancelStockInfoOne(&cancelStockInfo)
-
-							cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
-
-							flow := models.VmStockFlow{
-								WarehousingId:           info.WarehouseInfotId,
-								GoodId:                  item.ProjectId,
-								Number:                  info.Number,
-								LicenseNumber:           info.LicenseNumber,
-								Count:                   info.Count,
-								UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-								PatientId:               item.PatientId,
-								SystemTime:              info.SysRecordTime,
-								ConsumableType:          7,
-								IsSys:                   0,
-								WarehousingOrder:        "",
-								WarehouseOutId:          info.WarehouseOutId,
-								WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-								IsEdit:                  0,
-								CancelStockId:           cancel.ID,
-								CancelOrderNumber:       cancel.OrderNumber,
-								Manufacturer:            manufacturer.ID,
-								Dealer:                  0,
-								Creator:                 c.GetAdminUserInfo().CurrentOrgId,
-								UpdateCreator:           0,
-								Status:                  1,
-								Ctime:                   time.Now().Unix(),
-								Mtime:                   0,
-								Price:                   info.Price,
-								WarehousingDetailId:     info.WarehouseInfotId,
-								WarehouseOutDetailId:    info.ID,
-								CancelOutDetailId:       cancelInfo.ID,
-								ProductDate:             info.ProductDate,
-								ExpireDate:              info.ExpiryDate,
-								StorehouseId:            houseConfig.StorehouseOutInfo,
-								OverCount:               flush_count,
-							}
-							service.CreateStockFlowOne(flow)
+						service.CreateCancelStockInfoOne(&cancelStockInfo)
 
-							//退库数量增加
-							service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, info.Count)
-							//出库数量减少
-							service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, info.Count)
+						cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
 
+						flow := models.VmStockFlow{
+							WarehousingId:           info.WarehouseInfotId,
+							GoodId:                  item.ProjectId,
+							Number:                  info.Number,
+							LicenseNumber:           info.LicenseNumber,
+							Count:                   prescribingNumber,
+							UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+							PatientId:               item.PatientId,
+							SystemTime:              info.SysRecordTime,
+							ConsumableType:          7,
+							IsSys:                   0,
+							WarehousingOrder:        "",
+							WarehouseOutId:          info.WarehouseOutId,
+							WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+							IsEdit:                  0,
+							CancelStockId:           cancel.ID,
+							CancelOrderNumber:       cancel.OrderNumber,
+							Manufacturer:            manufacturer.ID,
+							Dealer:                  0,
+							Creator:                 c.GetAdminUserInfo().CurrentOrgId,
+							UpdateCreator:           0,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							Mtime:                   0,
+							Price:                   info.Price,
+							WarehousingDetailId:     info.WarehouseInfotId,
+							WarehouseOutDetailId:    info.ID,
+							CancelOutDetailId:       cancelInfo.ID,
+							ProductDate:             info.ProductDate,
+							ExpireDate:              info.ExpiryDate,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
+							OverCount:               flush_count,
 						}
+						service.CreateStockFlowOne(flow)
+
+						//退库数量增加
+						service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
+						//出库数量减少
+						service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, total_count)
+
+						//if info.Count < total_count {
+						//	//回退库存
+						//	service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, item.ProjectId)
+						//	cancelStockInfo := models.CancelStockInfo{
+						//		GoodId:          item.ProjectId,
+						//		CancelStockId:   cancel.ID,
+						//		GoodTypeId:      good.GoodTypeId,
+						//		Count:           info.Count,
+						//		Price:           info.Price,
+						//		Total:           0,
+						//		ProductDate:     info.ProductDate,
+						//		ExpiryDate:      info.ExpiryDate,
+						//		Ctime:           time.Now().Unix(),
+						//		Status:          1,
+						//		OrgId:           c.GetAdminUserInfo().CurrentOrgId,
+						//		OrderNumber:     cancel.OrderNumber,
+						//		Type:            0,
+						//		Dealer:          deaerler.DealerName,
+						//		Manufacturer:    manufacturer.ManufacturerName,
+						//		Number:          info.Number,
+						//		RegisterAccount: "",
+						//		Remark:          "",
+						//		WarehouseInfoId: info.WarehouseInfotId,
+						//		PatientId:       info.PatientId,
+						//		RecordDate:      info.SysRecordTime,
+						//		StorehouseId:    houseConfig.StorehouseOutInfo,
+						//		IsCheck:         1,
+						//	}
+						//
+						//	service.CreateCancelStockInfoOne(&cancelStockInfo)
+						//
+						//	cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
+						//
+						//	flow := models.VmStockFlow{
+						//		WarehousingId:           info.WarehouseInfotId,
+						//		GoodId:                  item.ProjectId,
+						//		Number:                  info.Number,
+						//		LicenseNumber:           info.LicenseNumber,
+						//		Count:                   info.Count,
+						//		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+						//		PatientId:               item.PatientId,
+						//		SystemTime:              info.SysRecordTime,
+						//		ConsumableType:          7,
+						//		IsSys:                   0,
+						//		WarehousingOrder:        "",
+						//		WarehouseOutId:          info.WarehouseOutId,
+						//		WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+						//		IsEdit:                  0,
+						//		CancelStockId:           cancel.ID,
+						//		CancelOrderNumber:       cancel.OrderNumber,
+						//		Manufacturer:            manufacturer.ID,
+						//		Dealer:                  0,
+						//		Creator:                 c.GetAdminUserInfo().CurrentOrgId,
+						//		UpdateCreator:           0,
+						//		Status:                  1,
+						//		Ctime:                   time.Now().Unix(),
+						//		Mtime:                   0,
+						//		Price:                   info.Price,
+						//		WarehousingDetailId:     info.WarehouseInfotId,
+						//		WarehouseOutDetailId:    info.ID,
+						//		CancelOutDetailId:       cancelInfo.ID,
+						//		ProductDate:             info.ProductDate,
+						//		ExpireDate:              info.ExpiryDate,
+						//		StorehouseId:            houseConfig.StorehouseOutInfo,
+						//		OverCount:               flush_count,
+						//	}
+						//	service.CreateStockFlowOne(flow)
+						//
+						//	//退库数量增加
+						//	service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, info.Count)
+						//	//出库数量减少
+						//	service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, info.Count)
+						//
+						//}
 
 						//查询已出库数量
 						dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
@@ -3132,7 +3232,7 @@ func (c *HisApiController) DeletePrescription() {
 
 						if prescribingNumber >= dialysisInfo.Count {
 							//删除出库表
-							service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
+							service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId, item.ID)
 						}
 
 						goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
@@ -3178,7 +3278,7 @@ func (c *HisApiController) DeletePrescription() {
 		}
 
 	} else {
-		if drugStockConfig.IsOpen == 1 {
+		if drugOutConfig.IsOpen == 1 {
 			if len(advices) > 0 {
 				for _, item := range advices {
 					creater := c.GetAdminUserInfo().AdminUser.Id
@@ -3199,7 +3299,9 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
 	advice, _ := service.GetHisDoctorAdvicesById(id)
 
-	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+
+	drugOutConfig, _ := service.FindDrugOutConfigById(c.GetAdminUserInfo().CurrentOrgId)
 
 	//已收费和已发药的限制逻辑
 	isCharge := false
@@ -3281,7 +3383,8 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 				service.DrugAutoAddCancelInfo(&advice, creater)
 			}
 		} else {
-			if drugStockConfig.IsOpen == 1 {
+
+			if drugOutConfig.IsOpen == 1 {
 
 				//查询是否在处方中出库
 				openConfig, _ := service.GetDrugOpenConfigOne(c.GetAdminUserInfo().CurrentOrgId)
@@ -3570,7 +3673,7 @@ func (c *HisApiController) DeleteProject() {
 
 					if prescribingNumber >= dialysisInfo.Count {
 						//删除出库表
-						service.DeleteAutoRedeceDetailTen(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
+						service.DeleteAutoRedeceDetailTen(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id)
 					}
 
 					//更新剩余库存
@@ -3897,7 +4000,7 @@ func (c *HisApiController) DeleteProject() {
 
 				if prescribingNumber >= dialysisInfo.Count {
 					//删除出库表
-					service.DeleteAutoRedeceDetailTen(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
+					service.DeleteAutoRedeceDetailTen(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id)
 				}
 
 				//更新剩余库存
@@ -5843,6 +5946,7 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 
 			for _, info := range prescriptionsOne {
+
 				if info.Type == 1 {
 					hisAdvice = append(hisAdvice, info.HisDoctorAdviceInfo...)
 				}
@@ -5866,9 +5970,10 @@ func (c *HisApiController) GetUploadInfo() {
 
 			//判断
 			for _, itemOne := range infos {
+
 				for _, itemTwo := range hisAdvice {
 					if itemOne.DrugId == itemTwo.DrugId {
-						itemTwo.Child = append(itemTwo.ChildDoctorAdvice, itemOne)
+						itemTwo.Child = append(itemTwo.Child, itemOne)
 					}
 				}
 			}
@@ -5889,10 +5994,13 @@ func (c *HisApiController) GetUploadInfo() {
 					if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
 						prescribing_number = parseIntPrescribingNumber
 					}
+
 					sum_out_count += prescribing_number
 				}
-				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId)
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId, houseConfig.DrugStorehouseOut)
 
+				fmt.Println("sum_out_count233232323232wo", sum_out_count)
+				fmt.Println("drugStockOut.FlushCount", drugStockOut.FlushCount)
 				if sum_out_count > drugStockOut.FlushCount {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":  "2",
@@ -5901,11 +6009,11 @@ func (c *HisApiController) GetUploadInfo() {
 					return
 				}
 			}
-
+			fmt.Println("newGoods99999988882os", newGoods)
 			for _, itemOne := range newGoods {
 				for _, item := range newGoodOne {
-					if itemOne.ProjectId == item.ProjectId {
-						item.ChildNewDialysisBeforePrepareGoods = append(item.ChildNewDialysisBeforePrepareGoods, item)
+					if itemOne.GoodId == item.GoodId {
+						item.ChildNewDialysisBeforePrepareGoods = append(item.ChildNewDialysisBeforePrepareGoods, itemOne)
 					}
 				}
 			}
@@ -5913,11 +6021,10 @@ func (c *HisApiController) GetUploadInfo() {
 			for _, item := range newGoodOne {
 				var sum_out_count_one int64
 				good, _ := service.GetGoodInformationByGoodIdOne(item.GoodId)
-
 				for _, itemOne := range item.ChildNewDialysisBeforePrepareGoods {
 					sum_out_count_one += itemOne.Count
 				}
-				list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId)
+				list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
 				fmt.Println("sum_out_count_one", sum_out_count_one)
 				fmt.Println("list.FlushCount", list.FlushCount)
 				if sum_out_count_one > list.FlushCount {
@@ -6177,22 +6284,23 @@ func (c *HisApiController) GetUploadInfo() {
 
 				for _, item := range infoList {
 					medical, _ := service.GetBaseDrugMedical(item.DrugId)
-					//药品出库
-					service.HisSettleDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item, order.ID)
-					//查询默认仓库
-					storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-					//查询默认仓库剩余多少库存
-					var sum_count int64
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					for _, its := range stockInfo {
-						if its.MaxUnit == medical.MaxUnit {
-							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+					if medical.IsUse == 2 {
+						//药品出库
+						service.HisSettleDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item, order.ID)
+						//查询默认仓库
+						storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+						//查询默认仓库剩余多少库存
+						var sum_count int64
+						stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+						for _, its := range stockInfo {
+							if its.MaxUnit == medical.MaxUnit {
+								its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+							}
+							sum_count += its.StockMaxNumber + its.StockMinNumber
 						}
-						sum_count += its.StockMaxNumber + its.StockMinNumber
+						service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+						service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 					}
-					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-
 				}
 				orgId := c.GetAdminUserInfo().CurrentOrgId
 
@@ -6250,20 +6358,22 @@ func (c *HisApiController) GetUploadInfo() {
 							Status:       1,
 							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
+						goodInfo, _ := service.GetGoodInformationByGoodIdThirty(item.GoodId)
+						//非零用
+						if goodInfo.IsUser == 2 || goodInfo.IsUser == 0 {
+							service.ConsumableSettleDelivery(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, &dialyPrepareOne, &lastOut, adminUser.AdminUser.Id, order.ID)
+							//查询剩余库存
+							goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
+							var sum_count int64
+							for _, item := range goodList {
+								sum_count += item.StockCount
+							}
+							service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.CurrentOrgId, sum_count)
 
-						//err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
-
-						service.ConsumableSettleDelivery(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, &dialyPrepareOne, &lastOut, adminUser.AdminUser.Id, order.ID)
-						//查询剩余库存
-						goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminUser.CurrentOrgId)
-						var sum_count int64
-						for _, item := range goodList {
-							sum_count += item.StockCount
+							//耗材
+							service.UpdateGoodSumCountSeven(sum_count, item.GoodId, adminUser.CurrentOrgId)
 						}
-						service.UpdateGoodFlushCount(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.CurrentOrgId, sum_count)
 
-						//耗材
-						service.UpdateGoodSumCountSeven(sum_count, item.GoodId, adminUser.CurrentOrgId)
 					}
 				}
 
@@ -6433,7 +6543,8 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 							sum_out_count += prescribing_number
 						}
-						drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId)
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
+						drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId, houseConfig.DrugStorehouseOut)
 
 						if sum_out_count > drugStockOut.FlushCount {
 							c.ServeSuccessJSON(map[string]interface{}{
@@ -6459,7 +6570,7 @@ func (c *HisApiController) GetUploadInfo() {
 						for _, itemOne := range item.ChildNewDialysisBeforePrepareGoods {
 							sum_out_count_one += itemOne.Count
 						}
-						list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId)
+						list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
 						fmt.Println("sum_out_count_one", sum_out_count_one)
 						fmt.Println("list.FlushCount", list.FlushCount)
 						if sum_out_count_one > list.FlushCount {
@@ -6534,7 +6645,6 @@ func (c *HisApiController) Refund() {
 			infos = append(infos, &info.HisDoctorAdviceInfo)
 		}
 		if info.ProjectId > 0 && info.AdviceId == 0 {
-			fmt.Println("info232323233232233", info.PatientId)
 			if info.HisPrescriptionProject.Type == 3 {
 				var good models.DialysisBeforePrepareGoods
 				var newGood models.NewDialysisBeforePrepareGoods
@@ -6545,6 +6655,7 @@ func (c *HisApiController) Refund() {
 				good.StorehouseId = houseConfig.StorehouseOutInfo
 				good.ProjectId = info.HisPrescriptionProject.ID
 				good.PatientId = info.PatientId
+				good.OrderId = order_id
 				goods = append(goods, &good)
 
 				newGood.GoodId = info.HisPrescriptionProject.VMGoodInfo.ID
@@ -6556,6 +6667,7 @@ func (c *HisApiController) Refund() {
 				newGood.RecordDate = order.SettleAccountsDate
 				newGood.UserOrgId = order.UserOrgId
 				newGood.PatientId = info.PatientId
+				newGood.OrderId = order_id
 				newGoods = append(newGoods, &newGood)
 			}
 		}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1385,6 +1385,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	water_machine := c.GetString("water_machine")
 	add_amount, _ := c.GetFloat("add_amount")
 	reduce_amount, _ := c.GetFloat("reduce_amount")
+	dialysis_remark := c.GetString("dialysis_remark")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1497,6 +1498,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		WaterMachine:               water_machine,
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
+		DialysisRemark:             dialysis_remark,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1842,7 +1844,10 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
-		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
+		if adminUserInfo.Org.Id != 10445 {
+			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
+		}
+
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
 	}
@@ -2043,6 +2048,7 @@ func (c *DialysisAPIController) Finish() {
 		redis.Set(keyOne, "", time.Second)
 		//结束时候透析次数加1
 		service.UpdateSolutionByPatientId(id)
+
 		dialysisOrder.Stage = 2
 		dialysisOrder.FinishNurse = nurseID
 		dialysisOrder.FinishCreator = adminUserInfo.AdminUser.Id
@@ -2339,6 +2345,19 @@ func (this *DialysisAPIController) StartDialysis() {
 
 		createErr := service.MobileCreateDialysisOrder(adminUserInfo.Org.Id, patientID, dialysisRecord)
 		service.UpdateMobilePatient(adminUserInfo.Org.Id, patientID, schedule_remark)
+
+		if adminUserInfo.Org.Id != 10101 && adminUserInfo.Org.Id != 10445 && adminUserInfo.Org.Id != 3877 && adminUserInfo.Org.Id != 10345 {
+			//统计该患者总次数
+			dialysisCount, _ := service.GetDialysisTotalCount(adminUserInfo.Org.Id, patientID)
+			service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.Org.Id, dialysisCount.Count)
+		}
+
+		if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10345 {
+			//统计该患者总次数
+			dialysisCount, _ := service.GetDialysisTotalCountOne(adminUserInfo.Org.Id, patientID)
+			service.UpdateDialysisOrder(patientID, recordDate.Unix(), adminUserInfo.Org.Id, dialysisCount.Count)
+		}
+
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
 		redis.Set(key, "", time.Second)
@@ -2633,6 +2652,7 @@ func (c *DialysisAPIController) PostSolution() {
 	drhy_water := c.GetString("drhy_water")
 	dry_water_hour := c.GetString("dry_water_hour")
 	water_machine := c.GetString("water_machine")
+	dialysis_remark := c.GetString("dialysis_remark")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2746,6 +2766,7 @@ func (c *DialysisAPIController) PostSolution() {
 		WaterMachine:               water_machine,
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
+		DialysisRemark:             dialysis_remark,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2844,6 +2865,7 @@ func (c *DialysisAPIController) PostSolution() {
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		PreImpulse:                 impulse,
 		SolutionStatus:             1,
+		DialysisRemark:             dialysis_remark,
 	}
 
 	//针对河间咸的
@@ -6722,7 +6744,7 @@ func ConsumablesDeliveryDeleteNew(orgID int64, record_time int64, good_yc *model
 	//扣减出库数量
 	service.ModifyAddGoodSumCount(houseConfig.StorehouseOutInfo, delete_count, orgID, good_yc.GoodId)
 	//查询剩余库存
-	goodList, _ := service.GetAllGoodSumCount(good_yc.GoodId, orgID)
+	goodList, _ := service.GetAllGoodSumCount(good_yc.GoodId, orgID, houseConfig.StorehouseOutInfo)
 	var sum_count int64
 	for _, item := range goodList {
 		sum_count += item.StockCount
@@ -7165,7 +7187,8 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 				}
 				sum_out_count += prescribing_number
 			}
-			drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId)
+			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId, houseConfig.DrugStorehouseOut)
 
 			//库存不足
 			if sum_out_count > drugStockOut.FlushCount {
@@ -7285,7 +7308,8 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 					}
 					sum_out_count += prescribing_number
 				}
-				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId)
+				houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+				drugStockOut, _ := service.GetDrugSumOutCountByDrugId(item.DrugId, orgId, houseConfig.DrugStorehouseOut)
 
 				//库存不足
 				if sum_out_count > drugStockOut.FlushCount {
@@ -7627,6 +7651,7 @@ func (this *DialysisAPIController) CheckSchedule() {
 		if schedule.ID == 0 {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"status": 0,
+				"msg":    "请求失败",
 			})
 
 		} else {
@@ -7647,6 +7672,7 @@ func (this *DialysisAPIController) CheckSchedule() {
 					} else {
 						this.ServeSuccessJSON(map[string]interface{}{
 							"status": 0,
+							"msg":    "",
 						})
 					}
 				}
@@ -7663,6 +7689,7 @@ func (this *DialysisAPIController) CheckSchedule() {
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"status": 0,
+			"msg":    "",
 		})
 
 	}

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2869,3 +2869,29 @@ func (this *NewDialysisApiController) GetTreateSummary() {
 		return
 	}
 }
+
+func (this *NewDialysisApiController) CommitDialysisOrder() {
+
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+
+	//查询所有患者
+
+	list, err := service.GetAllPatientScheduleList(org_id)
+
+	for _, item := range list {
+		//查询所有患者的2022年12月31日以前的上机记录
+		orderList, _ := service.GetAllDialysiOrderList(item.ID, org_id)
+		for _, it := range orderList {
+			dialysOrder, _ := service.GetDialysisTotalCountThree(it.UserOrgId, it.PatientId, it.DialysisDate)
+			service.UpdateDialysisOrderSix(it.PatientId, it.DialysisDate, it.UserOrgId, dialysOrder.Count)
+		}
+	}
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -166,6 +166,8 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getvascularaccessdetail", &NewDialysisApiController{}, "Get:GetVascularAccessDetail")
 	beego.Router("/m/api/patient/getalldoctorlist", &NewDialysisApiController{}, "Get:GetAllDoctorList")
 	beego.Router("/m/api/patient/gettreatesummay", &NewDialysisApiController{}, "Get:GetTreateSummary")
+	//脚本
+	beego.Router("/m/api/patient/commitdialysisOrder", &NewDialysisApiController{}, "Get:CommitDialysisOrder")
 
 	//His相关
 	beego.Router("/m/api/hispatientlist/get", &MobileHisApiController{}, "Get:GetHisPatientList")

controllers/patient_api_controller.go

@@ -4526,10 +4526,7 @@ func (c *PatientApiController) GetRemindPatientList() {
 	limit, _ := c.GetInt64("limit", 10)
 	adminUserInfo := c.GetAdminUserInfo()
 	total, patients, _ := service.GetAllWaitRemindPatient(adminUserInfo.CurrentOrgId, page, limit)
-	fmt.Println("机构ID2222222222222", c.GetAdminUserInfo().CurrentOrgId)
-
 	_, errcode := service.GetOrgFollowIsExist(c.GetAdminUserInfo().CurrentOrgId)
-	fmt.Println("机构ID2222222222222", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		information, err := service.GetAdminUserRoleInformation(0)
 		if err != nil {

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -81,14 +81,24 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			item.Summer = summerVM
 
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				item.Count = list.Count
 			}
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
-				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
+				if item.ScheduleDate <= 1640966400 {
+					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = listOne.Count
+				}
+
+				if item.ScheduleDate >= 1672502400 {
+					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = listOne.Count
+				}
 
-				item.Patient.TotalDialysis = listOne.Count
-				item.Count = listOne.Count
 			}
 		}
 		if getScheduleErr != nil {
@@ -117,18 +127,32 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 {
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
 				item.Count = list.Count
 			}
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 {
-				listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
+				//listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+				//item.Patient.TotalDialysis = listOne.Count
+				//item.Count = listOne.Count
+
+				if item.ScheduleDate <= 1640966400 {
+					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
+
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = listOne.Count
+				}
+
+				if item.ScheduleDate >= 1672502400 {
+					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
-				item.Patient.TotalDialysis = listOne.Count
-				item.Count = listOne.Count
+					item.Patient.TotalDialysis = listOne.Count
+					item.Count = listOne.Count
+				}
 			}
 		}
 		if getScheduleErr != nil {

controllers/schedule_api_controller.go

@@ -63,6 +63,7 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/schedule/weekpanelone", &ScheduleApiController{}, "Get:GetWeekPanelsOne")
 	beego.Router("/api/schedule/schedulesone", &ScheduleApiController{}, "Get:GetScheduleOne")
+	beego.Router("/api/schedule/scheduletwo", &ScheduleApiController{}, "Get:GetScheduleTwo")
 	beego.Router("/api/schedule/postscheduletemplate", &ScheduleApiController{}, "Get:SaveScheduleTemplate")
 	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
@@ -72,7 +73,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/getpatientscheduletemplate", &ScheduleApiController{}, "Get:GetPatientScheduleTempalate")
 	beego.Router("/api/schedule/getsolutionschedule", &ScheduleApiController{}, "Get:GetSolutionSchedule")
 
-	beego.Router("/api/schedule/smartpatientsch", &ScheduleApiController{}, "Get:GetPatientSch")
+	beego.Router("/api/schedule/smartpatientsch", &ScheduleApiController{}, "Get:GetPatient")
 	beego.Router("/api/schedule/smartpatientschtemplate", &ScheduleApiController{}, "Get:GetPatientSchTemplate")
 
 	beego.Router("/api/patient/smartpatientsch", &ScheduleApiController{}, "Get:GetPatientSmartSch")
@@ -83,6 +84,8 @@ func ScheduleApiRegistRouters() {
 
 	beego.Router("/api/smartsch/batch", &ScheduleApiController{}, "Post:BatchPostSmartSch")
 
+	beego.Router("/api/smartsch/get", &ScheduleApiController{}, "Get:GetSmartSch")
+
 }
 func (c *ScheduleApiController) BatchPostSmartSch() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -119,6 +122,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 				sch_id := int64(items["sch_id"].(float64))
 				if sch_id > 0 { //修改排班信息
 					schedule, _ = service.GetScheduleTwo(adminInfo.CurrentOrgId, sch_id)
+					fmt.Println("2222222")
 
 					if items["mode_id"] == nil || reflect.TypeOf(items["mode_id"]).String() != "float64" {
 						utils.ErrorLog("mode_id")
@@ -381,7 +385,10 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 				} else { //新的排班信息
 
+					fmt.Println("111111111")
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
+						fmt.Println("33333333")
+
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
 					}
@@ -400,6 +407,15 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						return
 					}
 					schedule.ScheduleDate = theTime.Unix()
+					//existSch,_ := service.GetScheduleByDate(c.GetAdminUserInfo().CurrentOrgId,schedule.ScheduleDate,patient_id)
+					//
+					//if existSch.ID > 0{
+					//	fmt.Println("555555555")
+					//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					//	return
+					//
+					//}
+
 					timeNow := time.Now().Format("2006-01-02")
 					if timeNow > scheduleDate {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
@@ -468,7 +484,10 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					sch, _ := service.GetScheduleByZoneAndBed(adminInfo.CurrentOrgId, partitionId, bedId, schedule.ScheduleDate, schedule.ScheduleType)
 
-					if sch.ID > 0 {
+					fmt.Println(sch.PatientId)
+					fmt.Println(schedule.PatientId)
+
+					if sch.ID > 0 && sch.PatientId != patient_id {
 						week_type, _ := items["week_type"].(string)
 						week_name, _ := items["week_name"].(string)
 
@@ -540,7 +559,32 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 			}
 		}
 	}
+	////删除数据
+	if dataBody["del_schs"] != nil && reflect.TypeOf(dataBody["del_schs"]).String() == "[]interface {}" {
 
+		schs, _ := dataBody["del_schs"].([]interface{})
+		if len(schs) > 0 {
+			for _, item := range schs {
+				items := item.(map[string]interface{})
+				if items["sch_id"] == nil || reflect.TypeOf(items["sch_id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				var schedule models.Schedule
+				sch_id := int64(items["sch_id"].(float64))
+				if sch_id > 0 { //修改排班信息
+					schedule, _ = service.GetScheduleTwo(adminInfo.CurrentOrgId, sch_id)
+					schedule.Status = 0
+					service.SaveSch(schedule)
+				}
+
+				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
+
+			}
+		}
+	}
+	////修改或保存数据
 	if dataBody["smart_schs"] != nil && reflect.TypeOf(dataBody["smart_schs"]).String() == "[]interface {}" {
 
 		schs, _ := dataBody["smart_schs"].([]interface{})
@@ -658,33 +702,34 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePointScheduleExist)
 						return
 					}
-
+					var DialysisMachineName string
 					so, _ := service.GetDialysisSolutionTwo(adminInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 					filedRecordOne, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器")
 					filedRecordTwo, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "灌流器")
 					filedRecordThree, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器/灌流器")
 
 					if filedRecordOne.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialysisDialyszers
+						DialysisMachineName = so.DialysisDialyszers
 					}
 					if filedRecordThree.IsShow == 1 {
-						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						if len(DialysisMachineName) > 0 {
+							DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 						} else {
-							schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+							DialysisMachineName = so.DialyzerPerfusionApparatus
 
 						}
 					}
 					if filedRecordTwo.IsShow == 1 {
-						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						if len(DialysisMachineName) > 0 {
+							DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 						} else {
-							schedule.DialysisMachineName = so.DialysisIrrigation
+							DialysisMachineName = so.DialysisIrrigation
 
 						}
 					}
+					schedule.DialysisMachineName = DialysisMachineName
 
 					service.SaveSch(schedule)
 				} else { //新的排班信息
@@ -778,17 +823,11 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					sch, _ := service.GetScheduleByZoneAndBed(adminInfo.CurrentOrgId, partitionId, bedId, schedule.ScheduleDate, schedule.ScheduleType)
 
-					if sch.ID > 0 {
+					if sch.ID > 0 && sch.PatientId != patient_id {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorSchedualcRepeatBed)
 						return
 					}
-
-					schedule.ModeId = modeId
-					schedule.PatientId = patient_id
-					schedule.CreatedTime = time.Now().Unix()
-					schedule.UpdatedTime = time.Now().Unix()
-					schedule.Status = 1
-					schedule.UserOrgId = adminInfo.CurrentOrgId
+					var DialysisMachineName string
 
 					so, _ := service.GetDialysisSolutionTwo(adminInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 					filedRecordOne, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器")
@@ -796,48 +835,98 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					filedRecordThree, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器/灌流器")
 
 					if filedRecordOne.IsShow == 1 {
-						schedule.DialysisMachineName = so.DialysisDialyszers
+						DialysisMachineName = so.DialysisDialyszers
 					}
 					if filedRecordThree.IsShow == 1 {
 						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+							DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 						} else {
-							schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+							DialysisMachineName = so.DialyzerPerfusionApparatus
 
 						}
 					}
 					if filedRecordTwo.IsShow == 1 {
-						if len(schedule.DialysisMachineName) > 0 {
-							schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						if len(DialysisMachineName) > 0 {
+							DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 						} else {
-							schedule.DialysisMachineName = so.DialysisIrrigation
+							DialysisMachineName = so.DialysisIrrigation
 
 						}
 					}
+					schedule.DialysisMachineName = DialysisMachineName
+
+					//判断当前保存的患者是否已经有排班
+					existSchedule, _ := service.GetScheduleByDate(adminInfo.CurrentOrgId, schedule.ScheduleDate, schedule.PatientId)
+					if existSchedule.ID > 0 {
+						existSchedule.ModeId = modeId
+						existSchedule.BedId = schedule.BedId
+						existSchedule.PartitionId = schedule.PartitionId
+						existSchedule.ScheduleType = schedule.ScheduleType
+						existSchedule.DialysisMachineName = schedule.DialysisMachineName
+						service.SaveSmartSch(existSchedule)
 
-					daySchedule, err := service.GetDaySchedule(adminInfo.CurrentOrgId, theTime.Unix(), theTime.Unix(), patient_id)
-					if daySchedule.ID > 0 {
-						daySchedule.ModeId = schedule.ModeId
-						daySchedule.ScheduleType = schedule.ScheduleType
-						daySchedule.PartitionId = schedule.PartitionId
-						daySchedule.BedId = schedule.BedId
-						daySchedule.DialysisMachineName = schedule.DialysisMachineName
-						service.SaveSch(daySchedule)
 					} else {
-						service.CreateSchedule(&schedule)
+						schedule.ModeId = modeId
+						schedule.PatientId = patient_id
+						schedule.CreatedTime = time.Now().Unix()
+						schedule.UpdatedTime = time.Now().Unix()
+						schedule.Status = 1
+						schedule.UserOrgId = adminInfo.CurrentOrgId
+
+						var DialysisMachineName string
+						so, _ := service.GetDialysisSolutionTwo(adminInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
+						filedRecordOne, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器")
+						filedRecordTwo, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "灌流器")
+						filedRecordThree, _ := service.FindFiledBy(adminInfo.CurrentOrgId, "透析器/灌流器")
+
+						if filedRecordOne.IsShow == 1 {
+							DialysisMachineName = so.DialysisDialyszers
+						}
+						if filedRecordThree.IsShow == 1 {
+							if len(DialysisMachineName) > 0 {
+								DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+
+							} else {
+								DialysisMachineName = so.DialyzerPerfusionApparatus
+
+							}
+						}
+						if filedRecordTwo.IsShow == 1 {
+							if len(DialysisMachineName) > 0 {
+								DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
+
+							} else {
+								DialysisMachineName = so.DialysisIrrigation
+
+							}
+						}
+						schedule.DialysisMachineName = DialysisMachineName
+						//schedule.DialysisMachineName = schedule.DialysisMachineName
+						daySchedule, _ := service.GetDaySchedule(adminInfo.CurrentOrgId, theTime.Unix(), theTime.Unix(), patient_id)
+						if daySchedule.ID > 0 {
+							daySchedule.ModeId = schedule.ModeId
+							daySchedule.ScheduleType = schedule.ScheduleType
+							daySchedule.PartitionId = schedule.PartitionId
+							daySchedule.BedId = schedule.BedId
+							daySchedule.DialysisMachineName = schedule.DialysisMachineName
+							service.SaveSch(daySchedule)
+						} else {
+							service.CreateSchedule(&schedule)
+						}
 					}
 				}
+
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "保存成功",
 				})
-
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
 
 			}
 		}
 	}
+
 }
 func HandleRedis(org_id int64, sch_date int64) {
 	redis := service.RedisClient()
@@ -861,7 +950,25 @@ func HandleRedis(org_id int64, sch_date int64) {
 
 }
 
-func (c *ScheduleApiController) GetPatientSch() {
+func (c *ScheduleApiController) GetSmartSch() {
+	patient_id, _ := c.GetInt64("patient_id")
+	fmt.Println("~~~~~~")
+	fmt.Println(patient_id)
+	fmt.Println("~~~~~~")
+
+	adminUserInfo := c.GetAdminUserInfo()
+	sch, err := service.GetSmartSchPatientByPatientID(adminUserInfo.CurrentOrgId, patient_id)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"sch": sch,
+	})
+}
+
+func (c *ScheduleApiController) GetPatient() {
 	keyWord := c.GetString("keyword")
 	adminUserInfo := c.GetAdminUserInfo()
 	patient, err := service.GetSmartSchPatientByKeyWord(adminUserInfo.CurrentOrgId, keyWord)
@@ -876,6 +983,7 @@ func (c *ScheduleApiController) GetPatientSch() {
 }
 
 func (c *ScheduleApiController) GetPatientSchTemplate() {
+	//patient_id, _ := c.GetInt64("patient_id",0)
 	keyWord := c.GetString("keyword")
 	adminUserInfo := c.GetAdminUserInfo()
 	patient, err := service.GetSmartSchTemplatePatientByKeyWord(adminUserInfo.CurrentOrgId, keyWord)
@@ -1264,32 +1372,34 @@ func (c *ScheduleApiController) CreateSchedule() {
 	schedule.UserOrgId = adminUserInfo.CurrentOrgId
 	schedule.IsExport = 5
 
+	var DialysisMachineName string
 	so, _ := service.GetDialysisSolutionTwo(adminUserInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 	filedRecordOne, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器")
 	filedRecordTwo, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "灌流器")
 	filedRecordThree, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器/灌流器")
 
 	if filedRecordOne.IsShow == 1 {
-		schedule.DialysisMachineName = so.DialysisDialyszers
+		DialysisMachineName = so.DialysisDialyszers
 	}
 	if filedRecordThree.IsShow == 1 {
-		if len(schedule.DialysisMachineName) > 0 {
-			schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+		if len(DialysisMachineName) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 		} else {
-			schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+			DialysisMachineName = so.DialyzerPerfusionApparatus
 
 		}
 	}
 	if filedRecordTwo.IsShow == 1 {
-		if len(schedule.DialysisMachineName) > 0 {
-			schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+		if len(DialysisMachineName) > 0 {
+			DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 		} else {
-			schedule.DialysisMachineName = so.DialysisIrrigation
+			DialysisMachineName = so.DialysisIrrigation
 
 		}
 	}
+	schedule.DialysisMachineName = DialysisMachineName
 
 	bed, _ := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, schedule.BedId)
 	if bed == nil {
@@ -1494,28 +1604,29 @@ func (c *ScheduleApiController) ChangeSchedule() {
 		filedRecordOne, _ := service.FindFiledBy(adminINfo.CurrentOrgId, "透析器")
 		filedRecordTwo, _ := service.FindFiledBy(adminINfo.CurrentOrgId, "灌流器")
 		filedRecordThree, _ := service.FindFiledBy(adminINfo.CurrentOrgId, "透析器/灌流器")
-
+		var DialysisMachineName string
 		if filedRecordOne.IsShow == 1 {
-			schedule.DialysisMachineName = so.DialysisDialyszers
+			DialysisMachineName = so.DialysisDialyszers
 		}
 		if filedRecordThree.IsShow == 1 {
 			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+				DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 			} else {
-				schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+				DialysisMachineName = so.DialyzerPerfusionApparatus
 
 			}
 		}
 		if filedRecordTwo.IsShow == 1 {
-			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
 
 			} else {
-				schedule.DialysisMachineName = so.DialysisIrrigation
+				DialysisMachineName = so.DialysisIrrigation
 
 			}
 		}
+		schedule.DialysisMachineName = DialysisMachineName
 
 		order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule.ScheduleDate, schedule.PatientId)
 		if err != nil {
@@ -2418,32 +2529,35 @@ func (this *ScheduleApiController) ExportSchedule() {
 			sch.Status = 1
 			sch.UserOrgId = this.GetAdminUserInfo().CurrentOrgId
 			sch.IsExport = 1
+
+			var DialysisMachineName string
 			so, _ := service.GetDialysisSolutionTwo(sch.UserOrgId, sch.PatientId, sch.ModeId)
 			filedRecordOne, _ := service.FindFiledBy(sch.UserOrgId, "透析器")
 			filedRecordTwo, _ := service.FindFiledBy(sch.UserOrgId, "灌流器")
 			filedRecordThree, _ := service.FindFiledBy(sch.UserOrgId, "透析器/灌流器")
 
 			if filedRecordOne.IsShow == 1 {
-				sch.DialysisMachineName = so.DialysisDialyszers
+				DialysisMachineName = so.DialysisDialyszers
 			}
 			if filedRecordThree.IsShow == 1 {
-				if len(sch.DialysisMachineName) > 0 {
-					sch.DialysisMachineName = sch.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 				} else {
-					sch.DialysisMachineName = so.DialyzerPerfusionApparatus
+					DialysisMachineName = so.DialyzerPerfusionApparatus
 
 				}
 			}
 			if filedRecordTwo.IsShow == 1 {
-				if len(sch.DialysisMachineName) > 0 {
-					sch.DialysisMachineName = sch.DialysisMachineName + "," + so.DialysisIrrigation
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = sch.DialysisMachineName + "," + so.DialysisIrrigation
 
 				} else {
-					sch.DialysisMachineName = so.DialysisIrrigation
+					DialysisMachineName = so.DialysisIrrigation
 
 				}
 			}
+			sch.DialysisMachineName = DialysisMachineName
 
 			schedules = append(schedules, &sch)
 		}
@@ -2455,21 +2569,29 @@ func (this *ScheduleApiController) ExportSchedule() {
 			date, _ := utils.ParseTimeStringToTime("2006-01-02", schedule_date)
 			clear_schedule_date := date.Unix() //根据日期去清除，该日期未来的排班数据
 
+			service.UpdateScheduleByExport(this.GetAdminUserInfo().CurrentOrgId, clear_schedule_date)
+
 			if err == nil {
 				for _, item := range schedules {
 					if item.ScheduleDate > clear_schedule_date {
 						//查询该患者是否转出获取死亡
+						fmt.Println("11111323242423")
 
 						//查找当天日期是否存在
 						_, errcode := service.GetTodayScheduleIsExistOne(item.PatientId, item.ScheduleDate, item.UserOrgId)
 						if errcode == gorm.ErrRecordNotFound {
 							//查询该床位是否有患者
+							fmt.Println("errcodes")
 							sch, errcodes := service.GetPatientByBed(item.ScheduleDate, item.BedId, item.ScheduleType, item.UserOrgId)
+							fmt.Println("errcodes")
+							fmt.Println(errcodes)
+							fmt.Println(sch)
 
 							if errcodes == gorm.ErrRecordNotFound {
+								fmt.Println("1111111")
 								service.CreateSchedule(item)
 							} else if errcodes == nil {
-
+								fmt.Println("1111222222222")
 								//清除当天该床位已有的患者
 								service.ModeFyScheduleById(sch.ScheduleDate, sch.BedId, sch.ScheduleType, sch.UserOrgId)
 								service.CreateSchedule(item)
@@ -2477,15 +2599,17 @@ func (this *ScheduleApiController) ExportSchedule() {
 
 						} else if errcode == nil {
 							schedule := models.XtSchedule{
-								PartitionId:  item.PartitionId,
-								BedId:        item.BedId,
-								PatientId:    item.PatientId,
-								ScheduleDate: item.ScheduleDate,
-								ScheduleType: item.ScheduleType,
-								ScheduleWeek: item.ScheduleWeek,
-								ModeId:       item.ModeId,
-								Status:       1,
+								PartitionId:         item.PartitionId,
+								BedId:               item.BedId,
+								PatientId:           item.PatientId,
+								ScheduleDate:        item.ScheduleDate,
+								ScheduleType:        item.ScheduleType,
+								ScheduleWeek:        item.ScheduleWeek,
+								ModeId:              1,
+								Status:              1,
+								DialysisMachineName: item.DialysisMachineName,
 							}
+							fmt.Println("1111222222223333333333333333332")
 
 							service.UpdateScheduleByOrgIdOne(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
 						}
@@ -3321,32 +3445,35 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 			CreatedTime:  time.Now().Unix(),
 		}
 
+		var DialysisMachineName string
+
 		so, _ := service.GetDialysisSolutionTwo(adminUserInfo.CurrentOrgId, schedule.PatientId, schedule.ModeId)
 		filedRecordOne, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器")
 		filedRecordTwo, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "灌流器")
 		filedRecordThree, _ := service.FindFiledBy(adminUserInfo.CurrentOrgId, "透析器/灌流器")
 
 		if filedRecordOne.IsShow == 1 {
-			schedule.DialysisMachineName = so.DialysisDialyszers
+			DialysisMachineName = so.DialysisDialyszers
 		}
 		if filedRecordThree.IsShow == 1 {
-			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 			} else {
-				schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+				DialysisMachineName = so.DialyzerPerfusionApparatus
 
 			}
 		}
 		if filedRecordTwo.IsShow == 1 {
-			if len(schedule.DialysisMachineName) > 0 {
-				schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+			if len(DialysisMachineName) > 0 {
+				DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 			} else {
-				schedule.DialysisMachineName = so.DialysisIrrigation
+				DialysisMachineName = so.DialysisIrrigation
 
 			}
 		}
+		schedule.DialysisMachineName = DialysisMachineName
 
 		err = service.AddPatientSchedule(&schedule)
 
@@ -3868,6 +3995,72 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	return
 }
 
+func (c *ScheduleApiController) GetScheduleTwo() {
+
+	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
+	patitionIdStr := c.GetString("patitionid")
+
+	ids := strings.Split(patitionIdStr, ",")
+
+	schedule_type, _ := c.GetInt64("schedule_type")
+
+	adminInfo := c.GetAdminUserInfo()
+	weekDateStr := c.GetString("week_date")
+	WeekDayIds := strings.Split(weekDateStr, ",")
+
+	thisTime := time.Now()
+	today := thisTime.Format("2006-01-02")
+	if week < 1 || week > 4 {
+		week = 2
+	}
+	if week == 1 {
+		thisTime = thisTime.AddDate(0, 0, -7)
+	} else if week == 3 {
+		thisTime = thisTime.AddDate(0, 0, 7)
+	} else if week == 4 {
+		thisTime = thisTime.AddDate(0, 0, 14)
+	}
+
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	weekTitle := make([]string, 0)
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		indexYear, indexMonthTime, indexDay := theDay.Date()
+		indexMonth := int(indexMonthTime)
+		indexWeek := strconv.Itoa(indexYear) + "." + strconv.Itoa(indexMonth) + "." + strconv.Itoa(indexDay)
+		weekTitle = append(weekTitle, indexWeek)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
+	weekStartDay := thisTime.AddDate(0, 0, weekStart)
+	weekEndDay := thisTime.AddDate(0, 0, weekEnd)
+	weekStartTime := weekStartDay.Format("2006-01-02") + " 00:00:00"
+	weekEndTime := weekEndDay.Format("2006-01-02") + " 23:59:59"
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+	weekStartPoint := theStarTime.Unix()
+	weekEndPoint := theEndTime.Unix()
+
+	schdules, _ := service.GetWeekScheduleThree(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type, WeekDayIds)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"days":      days,
+		"weekTitle": weekTitle,
+		"schdules":  schdules,
+		"today":     today,
+	})
+	return
+}
+
 func (c *ScheduleApiController) SaveScheduleTemplate() {
 
 	template_id, _ := c.GetInt64("template_id")
@@ -3917,7 +4110,6 @@ func (c *ScheduleApiController) ChangeFuncPrint() {
 	}
 
 	_, errcode := service.GetDataPrintByOrgId(orgId)
-	fmt.Println("errcode222234444555556t66", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		service.CreateDataPrint(&dataPrint)
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -4030,32 +4222,34 @@ func (c *ScheduleApiController) SynchroSchedule() {
 				UpdatedTime:  0,
 			}
 
+			var DialysisMachineName string
 			so, _ := service.GetDialysisSolutionTwo(c.GetAdminUserInfo().CurrentOrgId, schedule.PatientId, schedule.ModeId)
 			filedRecordOne, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器")
 			filedRecordTwo, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "灌流器")
 			filedRecordThree, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器/灌流器")
 
 			if filedRecordOne.IsShow == 1 {
-				schedule.DialysisMachineName = so.DialysisDialyszers
+				DialysisMachineName = so.DialysisDialyszers
 			}
 			if filedRecordThree.IsShow == 1 {
-				if len(schedule.DialysisMachineName) > 0 {
-					schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 				} else {
-					schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+					DialysisMachineName = so.DialyzerPerfusionApparatus
 
 				}
 			}
 			if filedRecordTwo.IsShow == 1 {
-				if len(schedule.DialysisMachineName) > 0 {
-					schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+				if len(DialysisMachineName) > 0 {
+					DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 				} else {
-					schedule.DialysisMachineName = so.DialysisIrrigation
+					DialysisMachineName = so.DialysisIrrigation
 
 				}
 			}
+			schedule.DialysisMachineName = DialysisMachineName
 
 			service.CreatePatientSchedule(&schedule)
 		}
@@ -4119,32 +4313,35 @@ func (c *ScheduleApiController) SynchroSchedule() {
 					CreatedTime:  time.Now().Unix(),
 					UpdatedTime:  0,
 				}
+
+				var DialysisMachineName string
 				so, _ := service.GetDialysisSolutionTwo(c.GetAdminUserInfo().CurrentOrgId, schedule.PatientId, schedule.ModeId)
 				filedRecordOne, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器")
 				filedRecordTwo, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "灌流器")
 				filedRecordThree, _ := service.FindFiledBy(c.GetAdminUserInfo().CurrentOrgId, "透析器/灌流器")
 
 				if filedRecordOne.IsShow == 1 {
-					schedule.DialysisMachineName = so.DialysisDialyszers
+					DialysisMachineName = so.DialysisDialyszers
 				}
 				if filedRecordThree.IsShow == 1 {
-					if len(schedule.DialysisMachineName) > 0 {
-						schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialyzerPerfusionApparatus
+					if len(DialysisMachineName) > 0 {
+						DialysisMachineName = DialysisMachineName + "," + so.DialyzerPerfusionApparatus
 
 					} else {
-						schedule.DialysisMachineName = so.DialyzerPerfusionApparatus
+						DialysisMachineName = so.DialyzerPerfusionApparatus
 
 					}
 				}
 				if filedRecordTwo.IsShow == 1 {
 					if len(schedule.DialysisMachineName) > 0 {
-						schedule.DialysisMachineName = schedule.DialysisMachineName + "," + so.DialysisIrrigation
+						DialysisMachineName = DialysisMachineName + "," + so.DialysisIrrigation
 
 					} else {
-						schedule.DialysisMachineName = so.DialysisIrrigation
+						DialysisMachineName = so.DialysisIrrigation
 
 					}
 				}
+				schedule.DialysisMachineName = DialysisMachineName
 				service.CreatePatientSchedule(&schedule)
 			}
 		}

controllers/schedule_template_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -19,7 +20,30 @@ func PatientScheduleTemplateAPIControllerRegistRouters() {
 
 	beego.Router("/api/patients/list", &PatientScheduleTemplateAPIController{}, "get:GetPatientList")
 
+	beego.Router("/api/schedule/update_schtemplate", &PatientScheduleTemplateAPIController{}, "post:UpdateSchedulesTemplate")
+	beego.Router("/api/schtemplate_device/get", &ScheduleApiController{}, "Get:GetTemplateDevicesNumbers")
+
 	// beego.Router("/api/test", &TestCtr{}, "get:Test")
+
+}
+func (c *ScheduleApiController) GetTemplateDevicesNumbers() {
+	sch_type, _ := c.GetInt("sch_type", 0)
+	zone_id, _ := c.GetInt64("zone_id", 0)
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	template_id, _ := c.GetInt64("template_id", 0)
+
+	weekday, _ := c.GetInt64("weekday")
+
+	deviceNumbers, getDeviceNumbersErr := service.GetAllAvaildTemplateDeviceNumbersByZone(c.GetAdminUserInfo().CurrentOrgId, weekday, sch_type, zone_id, patient_id, template_id)
+	if getDeviceNumbersErr != nil {
+		c.ErrorLog("获取所有床位失败：%v", getDeviceNumbersErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"devices": deviceNumbers,
+	})
+
 }
 
 // type TestCtr struct {
@@ -189,6 +213,7 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 		return
 	}
 	templateMode.Week = int64(week_time)
+	templateMode.OriginalWeek = int64(week_time)
 
 	if mode != templateMode.Mode {
 		if templateMode.Mode == 0 { // 0 -> 1 或 0 -> 2  则直接清除下四周的排班
@@ -422,6 +447,10 @@ func (this *PatientScheduleTemplateAPIController) SetMode() {
 			service.UpdateTemplateItemWeek(templates[3].OrgID, templates[3].ID, week_time+3)
 		}
 
+	} else {
+		fmt.Println("~~~~~~~~")
+		service.UpdateTemplateItemModeWeek(adminUserInfo.CurrentOrgId, templateMode.ID, templateMode.OriginalWeek)
+
 	}
 
 	this.ServeSuccessJSON(nil)
@@ -619,14 +648,17 @@ func (this *PatientScheduleTemplateAPIController) UpdateSchedules() {
 		return
 	}
 
-	newItems, getTemplateItemsErr := service.GetOrgPatientScheduleTemplateItemsByTemplateID(adminUserInfo.CurrentOrgId)
+	//newItems, getTemplateItemsErr := service.GetAllPatientScheduleTemplateItemsWithoutPatientByTemplateID(adminUserInfo.CurrentOrgId)
+	templates, getTemplateItemsErr := service.GetOrgPatientScheduleTemplateItems(adminUserInfo.CurrentOrgId)
+
+	//newItems, getTemplateItemsErr := service.GetAllPatientScheduleTemplateItemsWithoutPatientByTemplateID(adminUserInfo.CurrentOrgId)
 	if getTemplateItemsErr != nil {
 		this.ErrorLog("获取排班模板排班失败：%v", getTemplateItemsErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"items": newItems,
+		"items": templates,
 	})
 }
 
@@ -648,3 +680,109 @@ func (this *PatientScheduleTemplateAPIController) GetPatientList() {
 	})
 
 }
+
+type ParamModelEditSchedule struct {
+	ID             int64  `json:"sch_id"`
+	DeviceNumberID int64  `json:"jihao_id"`
+	PatientID      int64  `json:"patient_id"`
+	Mode           int64  `json:"mode_id"`
+	Weekday        int64  `json:"schedule_week"`
+	TimeType       int64  `json:"time_type"`
+	TemplateID     int64  `json:"t_id"`
+	Title          string `json:"title"`
+}
+
+func (this *PatientScheduleTemplateAPIController) UpdateSchedulesTemplate() {
+	addOrEditSchedulesJSON := this.GetString("edit_schs")
+	//delSchedulesJSON := this.GetString("del_schs")
+
+	fmt.Println(addOrEditSchedulesJSON)
+	var addOrEditSchedules []*ParamModelEditSchedule
+	//var delSchedules []*ParamModelEditSchedule
+
+	parseErr := json.Unmarshal([]byte(addOrEditSchedulesJSON), &addOrEditSchedules)
+	//parseDelErr := json.Unmarshal([]byte(delSchedulesJSON), &delSchedules)
+
+	fmt.Println(parseErr)
+	if parseErr != nil {
+		this.ErrorLog("解析增加编辑排班的数组参数失败：%v", parseErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	//if parseDelErr != nil {
+	//	this.ErrorLog("解析删除排班的数组参数失败：%v", parseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+
+	for _, item := range addOrEditSchedules {
+
+		if item.ID > 0 { //已经存在的数据
+			src_template, _ := service.GetScheduleTemplateItem(item.ID)
+			src_template.DeviceNumberID = item.DeviceNumberID
+			src_template.TimeType = int8(item.TimeType)
+			src_template.TreatMode = item.Mode
+			//service.SaveSchTemplateItem(src_template)
+			fmt.Println("11111")
+		} else {
+			schItemTwo, _ := service.GetScheduleTemplateTwo(this.GetAdminUserInfo().CurrentOrgId, item.TemplateID, item.Weekday, item.PatientID)
+			fmt.Println("222222")
+
+			if schItemTwo.ID > 0 { //当天存在排班，存在则为修改
+				fmt.Println("333333333")
+				src_template, _ := service.GetScheduleTemplateItem(schItemTwo.ID)
+				src_template.DeviceNumberID = item.DeviceNumberID
+				src_template.TimeType = int8(item.TimeType)
+				src_template.TreatMode = item.Mode
+				service.SaveSchTemplateItem(src_template)
+
+			} else {
+				schItem, _ := service.GetScheduleTemplateOne(this.GetAdminUserInfo().CurrentOrgId, item.DeviceNumberID, item.TemplateID, item.Weekday)
+
+				if schItem.ID == 0 { //床位未被占用
+
+					var template models.PatientScheduleTemplateItem
+					template.TreatMode = item.Mode
+					template.TemplateID = int64(item.TemplateID)
+					template.TimeType = int8(item.TimeType)
+					template.DeviceNumberID = item.DeviceNumberID
+					template.CreateTime = time.Now().Unix()
+					template.ModifyTime = time.Now().Unix()
+					template.OrgID = this.GetAdminUserInfo().CurrentOrgId
+					template.PatientID = item.PatientID
+					template.Weekday = int8(item.Weekday)
+					template.Status = 1
+					service.SaveSchTemplateItem(template)
+
+				} else { //床位被占用 1.被自己占用，2。被别人占用
+					//fmt.Println("555555555")
+
+					if schItem.PatientID != 0 && schItem.PatientID == item.PatientID { //当天该患者已经存在排班则设为修改操作
+						//fmt.Println("66666")
+						src_template, _ := service.GetScheduleTemplateItem(schItem.ID)
+						src_template.DeviceNumberID = item.DeviceNumberID
+						src_template.TimeType = int8(item.TimeType)
+						src_template.TreatMode = item.Mode
+						service.SaveSchTemplateItem(src_template)
+
+					} else if schItem.PatientID != 0 && schItem.PatientID != item.PatientID { //当天该床位被其他人占用，则无法保存
+						//fmt.Println("7777777")
+						json := make(map[string]interface{})
+						json["msg"] = item.Title + "周" + strconv.FormatInt(item.Weekday, 10) + "的床位已经有人排班,无法保存"
+						json["state"] = 0
+						this.Data["json"] = json
+						this.ServeJSON()
+						break
+					}
+				}
+
+			}
+
+		}
+	}
+
+	templates, _ := service.GetOrgPatientScheduleTemplateItems(this.GetAdminUserInfo().CurrentOrgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"items": templates,
+	})
+}

controllers/secondary_order_api_contorller.go

@@ -1397,118 +1397,6 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 		}
 	}
 
-	//获取所有的入库仓库
-	//druglist, _ := service.GetDrugWarehouseInfoStorehouseList(orgId)
-	//for _, item := range druglist {
-	//	//查询该药品该仓库是否有数据
-	//	drug, _ := service.GetDrugStockCout(item.DrugId, item.StorehouseId, item.OrgId)
-	//
-	//	//查询该仓库该药品的入库数量
-	//	medical, _ := service.GetBaseDrugMedical(item.DrugId)
-	//
-	//	var sum_in_count int64
-	//	var flush_count int64
-	//	var sum_out_count int64
-	//	var cancel_out_count int64
-	//	//查询入库数量和剩余库存
-	//	infolist, _ := service.GetDrugWarehouseInfoByStorehouseId(item.StorehouseId, item.DrugId, item.OrgId)
-	//	for _, it := range infolist {
-	//		if it.MaxUnit == medical.MaxUnit {
-	//			it.WarehousingCount = it.WarehousingCount * medical.MinNumber
-	//			it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
-	//		}
-	//		sum_in_count += it.WarehousingCount
-	//		flush_count += it.StockMaxNumber + it.StockMinNumber
-	//	}
-	//
-	//	//获取出库数量
-	//	outinfolist, _ := service.GetDrugFlowStockOutCount(item.StorehouseId, item.DrugId, item.OrgId)
-	//	for _, it := range outinfolist {
-	//		if it.MaxUnit == medical.MaxUnit {
-	//			it.Count = it.Count * medical.MinNumber
-	//		}
-	//		sum_out_count += it.Count
-	//	}
-	//
-	//	//获取退库数量
-	//	cancelinfolist, _ := service.GetDrugFlowStockCancelCount(item.StorehouseId, item.DrugId, item.OrgId)
-	//	for _, it := range cancelinfolist {
-	//		if it.MaxUnit == medical.MaxUnit {
-	//			it.Count = it.Count * medical.MinNumber
-	//		}
-	//		cancel_out_count += it.Count
-	//	}
-	//
-	//	//新增
-	//	if drug.ID == 0 {
-	//		drugstock := models.XtDrugStockCount{
-	//			UserOrgId:      orgId,
-	//			StorehouseId:   item.StorehouseId,
-	//			SumInCount:     sum_in_count,
-	//			SumOutCount:    sum_out_count - cancel_out_count,
-	//			SumCancelCount: cancel_out_count,
-	//			DrugId:         item.DrugId,
-	//			Ctime:          time.Now().Unix(),
-	//			Mtime:          0,
-	//			Status:         1,
-	//			FlushCount:     flush_count,
-	//			SumActOutCount: sum_out_count,
-	//		}
-	//		service.CreateDrugStockCount(drugstock)
-	//	}
-	//}
-	//
-	////获取入库数量
-	//
-	//
-	//
-	//////获取入库数据
-	//goodlist, _ := service.GetSendGoodInformation(orgId)
-	//for _, it := range goodlist {
-	//	//查询是否有数据
-	//	_, errcode := service.GetStockFlush(it.StorehouseId, it.GoodId, it.OrgId)
-	//	//获取总退库数量
-	//	var cancel_count int64
-	//	var out_count int64
-	//	var act_count int64
-	//	//退库总数量
-	//	cancellist, _ := service.GetAllCancelCount(it.StorehouseId, it.GoodId, it.OrgId)
-	//	for _, item := range cancellist {
-	//		cancel_count += item.Count
-	//	}
-	//	//出库总数量
-	//	outlist, _ := service.GetAllStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-	//	for _, item := range outlist {
-	//		out_count += item.Count
-	//	}
-	//
-	//	//实际出库总数量
-	//	actlist, _ := service.GetActStockOutCount(it.StorehouseId, it.GoodId, it.OrgId)
-	//	for _, item := range actlist {
-	//		act_count += item.Count
-	//	}
-	//
-	//	if errcode == gorm.ErrRecordNotFound {
-	//		good := models.XtGoodStockCount{
-	//			UserOrgId:        it.OrgId,
-	//			GoodId:           it.GoodId,
-	//			StorehouseId:     it.StorehouseId,
-	//			Status:           1,
-	//			Ctime:            time.Now().Unix(),
-	//			Mtime:            0,
-	//			StockInCount:     it.WarehousingCount,
-	//			StockOutCount:    out_count - cancel_count,
-	//			StockCancelCount: cancel_count,
-	//			FlushCount:       it.StockCount,
-	//			StockActOutCount: act_count,
-	//		}
-	//		service.CreateGoodCountSix(good)
-	//	}
-	//	if errcode == nil {
-	//		service.UpdateGoodCountSend(it.WarehousingCount, it.StockCount, out_count, it.StorehouseId, it.GoodId, it.OrgId, cancel_count, act_count)
-	//	}
-	//}
-
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": 1,
 	})
@@ -1547,6 +1435,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 	for _, item := range list {
 		//药品
 		if item.IsSource == 1 {
+
 			medical, _ := service.GetBaseDrugMedical(item.ProjectId)
 			//查询该仓库的药品库存是否满足调出数量
 			drugInfoList, _ := service.GetDrugWarehouseInfoByStoreHouseIdOne(item.ProjectId, item.StorehouseInId, item.UserOrgId, item.ID)
@@ -1568,6 +1457,7 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 			}
 
 			if total_count > total {
+
 				goodObj, _ := service.GetDrugByGoodId(item.ProjectId)
 				storehouse, _ := service.FindStoreHouseByStorehouseId(item.StorehouseInId, item.UserOrgId)
 				this.ServeSuccessJSON(map[string]interface{}{
@@ -1639,38 +1529,177 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 				total_count = item.Count
 			}
 
+			fmt.Println("total_count2332232333233223", total_count)
+			fmt.Println("totoal2323232332322332", total)
 			if total_count <= total {
 
-				//回退库存,查询该订单出库记录
-				drugOutList, _ := service.GetStoreDrugWarehouseOutList(item.ProjectId, item.ID, item.UserOrgId)
-				for _, it := range drugOutList {
-
-					if medical.MaxUnit == it.CountUnit && medical.MaxUnit != medical.MinUnit {
-						//回退库存
-						service.ModifyDrugStoreWarehouseInfo(it.WarehouseInfoId, it.Count)
-					}
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				creater := this.GetAdminUserInfo().AdminUser.Id
+				drug_total, _ := service.FindAllDrugWarehouseOut(orgId)
+				recordDateStr := time.Now().Format("2006-01-02")
+				recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+				record_date := recordDate.Unix()
+				drug_total = drug_total + 1
+				drug_warehousing_out_order := strconv.FormatInt(orgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+				number, _ := strconv.ParseInt(drug_warehousing_out_order, 10, 64)
+				number = number + drug_total
+				drug_warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+				operation_time := time.Now().Unix()
+
+				drugWarehouseOut := models.DrugWarehouseOut{
+					WarehouseOutOrderNumber: drug_warehousing_out_order,
+					OperationTime:           operation_time,
+					OrgId:                   orgId,
+					Creater:                 creater,
+					Ctime:                   time.Now().Unix(),
+					Status:                  1,
+					WarehouseOutTime:        record_date,
+					Type:                    2,
+					StorehouseId:            item.StorehouseInId,
+					SecondWarehouseId:       item.WarehouseId,
+					IsSys:                   12,
+					IsCheck:                 1,
+				}
+				_, drugerrcodes := service.GetDrugWarehouseBySyS(orgId, 12, item.WarehouseId, record_date)
 
-					if medical.MaxUnit == it.CountUnit && medical.MaxUnit == medical.MinUnit {
-						//回退库存
-						service.ModifyDrugStoreWarehouseInfo(it.WarehouseInfoId, it.Count)
-					}
+				if drugerrcodes == gorm.ErrRecordNotFound {
+					service.AddSigleDrugWarehouseOut(&drugWarehouseOut)
+				}
 
-					if medical.MinUnit == it.CountUnit && medical.MaxUnit != medical.MinUnit {
+				drugOut, _ := service.GetLastDrugWarehouseOutById(12, item.WarehouseId, orgId, record_date)
 
-						service.ModifyDrugStoreWarehouseInfoOne(it.WarehouseInfoId, it.Count)
-					}
+				warehouseOutInfo := &models.DrugWarehouseOutInfo{
+					WarehouseOutOrderNumber: drugOut.WarehouseOutOrderNumber,
+					WarehouseOutId:          drugOut.ID,
+					DrugId:                  item.ProjectId,
+					Count:                   item.Count,
+					Price:                   medical.RetailPrice,
+					TotalPrice:              0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Remark:                  item.Remake,
+					OrgId:                   orgId,
+					Type:                    2,
+					Manufacturer:            0,
+					Dealer:                  0,
+					RetailPrice:             item.MinPrice,
+					RetailTotalPrice:        0,
+					CountUnit:               item.SencondUnit,
+					ExpiryDate:              0,
+					ProductDate:             0,
+					Number:                  "",
+					BatchNumber:             "",
+					IsSys:                   0,
+					WarehouseInfoId:         0,
+					StorehouseId:            item.StorehouseInId,
+					SecondWarehouseInfoId:   item.ID,
+					IsCheck:                 1,
+				}
+				drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
+
+				drug_in_total, _ := service.FindAllWarehouseTotalOne(orgId)
+				drug_in_total = drug_in_total + 1
+
+				warehousing_order := "YPRKD" + strconv.FormatInt(orgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(drug_in_total, 10)
+
+				drug_warehousing := models.DrugWarehouse{
+					WarehousingOrder:  warehousing_order,
+					OperationTime:     operation_time,
+					OrgId:             orgId,
+					Creater:           creater,
+					Ctime:             time.Now().Unix(),
+					Status:            1,
+					WarehousingTime:   record_date,
+					Type:              1,
+					StorehouseId:      item.StorehouseOutId,
+					IsSys:             13,
+					SecondWarehouseId: item.WarehouseId,
+					IsCheck:           1,
+				}
 
-					//查询入库单
-					storeWareing, _ := service.GetStoreDrugWarehouseById(item.WarehouseId, it.OrgId)
-					//删除入库单
-					service.DeleteStoreWarehousingId(storeWareing.ID, storeWareing.OrgId, item.ProjectId)
+				//查询该调拨单是否有生成入库单
+				_, drugerrcodess := service.GetDrugWarehouseingBySys(13, item.WarehouseId, orgId, record_date)
+				if drugerrcodess == gorm.ErrRecordNotFound {
+					service.CreateDrugWaresing(drug_warehousing)
+				}
 
-					//查询出单
-					storeWarehouseOut, _ := service.GetStoreDrugWarehouseOutById(it.WarehouseOutId, it.OrgId)
+				drugInfoObj, _ := service.GetLastDrugWarehouseBySys(13, item.WarehouseId, orgId, record_date)
+
+				drugwarehouseInfo := &models.DrugWarehouseInfo{
+					WarehousingOrder:      drugInfoObj.WarehousingOrder,
+					WarehousingId:         drugInfoObj.ID,
+					DrugId:                item.ProjectId,
+					Number:                "",
+					ProductDate:           0,
+					ExpiryDate:            0,
+					WarehousingCount:      0,
+					Price:                 0,
+					TotalPrice:            0,
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Remark:                "",
+					OrgId:                 orgId,
+					Type:                  2,
+					Manufacturer:          0,
+					Dealer:                0,
+					StockMaxNumber:        0,
+					RetailTotalPrice:      0,
+					BatchNumber:           "",
+					MaxUnit:               "",
+					MinUnit:               "",
+					RetailPrice:           0,
+					StorehouseId:          item.StorehouseOutId,
+					SecondWarehouseInfoId: item.ID,
+					IsCheck:               1,
+				}
+				fmt.Println("尽力发的233223323232")
+				service.AutoDrugDeliverInfoTwelve(orgId, item.Count, &drugWarehouseOut, &drup, warehouseOutInfo, drugwarehouseInfo)
 
-					//删除出库单
-					service.DeleteStoreWarehouseOut(storeWarehouseOut.ID, storeWarehouseOut.OrgId, item.ProjectId)
+				//查询默认仓库
+				storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+				//更新字典里面的库存
+				stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.ProjectId)
+				var sum_count int64
+				for _, its := range stockInfo {
+					baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+					if its.MaxUnit == baseDrug.MaxUnit {
+						its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+					}
+					sum_count += its.StockMaxNumber + its.StockMinNumber
 				}
+				service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
+
+				//回退库存,查询该订单出库记录
+				//drugOutList, _ := service.GetStoreDrugWarehouseOutList(item.ProjectId, item.ID, item.UserOrgId)
+				//for _, it := range drugOutList {
+				//
+				//	if medical.MaxUnit == it.CountUnit && medical.MaxUnit != medical.MinUnit {
+				//		//回退库存
+				//		service.ModifyDrugStoreWarehouseInfo(it.WarehouseInfoId, it.Count)
+				//	}
+				//
+				//	if medical.MaxUnit == it.CountUnit && medical.MaxUnit == medical.MinUnit {
+				//		//回退库存
+				//		service.ModifyDrugStoreWarehouseInfo(it.WarehouseInfoId, it.Count)
+				//	}
+				//
+				//	if medical.MinUnit == it.CountUnit && medical.MaxUnit != medical.MinUnit {
+				//
+				//		service.ModifyDrugStoreWarehouseInfoOne(it.WarehouseInfoId, it.Count)
+				//	}
+				//
+				//	//查询入库单
+				//	//storeWareing, _ := service.GetStoreDrugWarehouseById(item.WarehouseId, it.OrgId)
+				//	//删除入库单
+				//	//service.DeleteStoreWarehousingId(storeWareing.ID, storeWareing.OrgId, item.ProjectId)
+				//
+				//	//查询出单
+				//	//storeWarehouseOut, _ := service.GetStoreDrugWarehouseOutById(it.WarehouseOutId, it.OrgId)
+				//
+				//	//删除出库单
+				// 	//service.DeleteStoreWarehouseOut(storeWarehouseOut.ID, storeWarehouseOut.OrgId, item.ProjectId)
+				//}
 
 			}
 
@@ -1716,21 +1745,140 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 			//满足调拨
 			if item.Count <= total {
 
-				//回退库存,查询该订单出库记录
-				outList, _ := service.GetStoreWarehouseOutList(item.ProjectId, item.ID, item.UserOrgId)
-				for _, it := range outList {
-					//回退库存
-					service.ModifyStoreWarehouseById(it.WarehouseInfotId, it.Count)
-
-					//获取入库单
-					storeWareing, _ := service.GetStoreWarehouseById(item.WarehouseId, it.OrgId)
-					//删除入库单 入库流水
-					service.ModifyStoreWarehouse(storeWareing.ID, storeWareing.OrgId, item.ProjectId)
-					//获取出库单
-					storeWarehouseOut, _ := service.GetStoreWarehouseOutById(it.WarehouseOutId, it.OrgId)
-					//删除出库单
-					service.ModifyWarehouseOut(storeWarehouseOut.ID, storeWarehouseOut.OrgId, item.ProjectId)
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := service.FindAllWarehouseOut(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 = "CKD" + strconv.FormatInt(number, 10)
+				operation_time := time.Now().Unix()
+				creater := this.GetAdminUserInfo().AdminUser.Id
+				recordDateStr := time.Now().Format("2006-01-02")
+				recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+				record_date := recordDate.Unix()
+
+				totals, _ := service.FindAllWarehouseTotal(orgId)
+				totals = totals + 1
+				warehousing_order := "RKD" + strconv.FormatInt(orgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(totals, 10)
+				//创建出库单
+				goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
+				warehouseOut := models.WarehouseOut{
+					WarehouseOutOrderNumber: warehousing_out_order,
+					OperationTime:           operation_time,
+					OrgId:                   orgId,
+					Creater:                 creater,
+					Ctime:                   time.Now().Unix(),
+					Status:                  1,
+					WarehouseOutTime:        record_date,
+					Type:                    1,
+					StorehouseId:            item.StorehouseInId,
+					IsSys:                   12,
+					SecondWarehouseId:       item.WarehouseId,
+					IsCheck:                 1,
+				}
+
+				//查询今日是否存在调拨出库
+				_, errcodes := service.FindStockOutByIsSysSix(orgId, 12, record_date, item.WarehouseId)
+				if errcodes == gorm.ErrRecordNotFound {
+					service.AddSigleWarehouseOut(&warehouseOut)
+				}
+
+				out, _ := service.GetLastWarehouseOutBySys(12, orgId, record_date, item.WarehouseId)
+				warehouseOutInfo := &models.WarehouseOutInfo{
+					WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+					WarehouseOutId:          out.ID,
+					GoodId:                  item.ProjectId,
+					GoodTypeId:              goodObj.GoodTypeId,
+					Count:                   item.Count,
+					Price:                   item.MinPrice,
+					TotalPrice:              0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Remark:                  item.Remake,
+					OrgId:                   orgId,
+					Type:                    1,
+					Manufacturer:            0,
+					Number:                  "",
+					ExpiryDate:              0,
+					ProductDate:             0,
+					Dealer:                  0,
+					LicenseNumber:           "",
+					WarehouseInfotId:        0,
+					StorehouseId:            item.StorehouseInId,
+					SecondWarehouseInfoId:   item.ID,
+					IsCheck:                 1,
+				}
+
+				//入库操作
+				warehousing := models.Warehousing{
+					WarehousingOrder:  warehousing_order,
+					OperationTime:     operation_time,
+					OrgId:             orgId,
+					Creater:           creater,
+					Ctime:             time.Now().Unix(),
+					Status:            1,
+					WarehousingTime:   record_date,
+					Type:              1,
+					StorehouseId:      item.StorehouseOutId,
+					IsSys:             12,
+					SecondWarehouseId: item.WarehouseId,
+					IsCheck:           1,
+				}
+				//查询该调拨单是否有生成入库单
+				_, errcodess := service.GetWarehouseBySecondWarehouseId(12, item.WarehouseId, orgId, record_date)
+				if errcodess == gorm.ErrRecordNotFound {
+					service.AddSigleWarehouse(&warehousing)
 				}
+				infoObj, _ := service.GetLastWarehouseById(12, item.WarehouseId, orgId, record_date)
+
+				warehouseInfo := &models.WarehousingInfo{
+					WarehousingOrder:      infoObj.WarehousingOrder,
+					WarehousingId:         infoObj.ID,
+					GoodId:                item.ProjectId,
+					Number:                "",
+					GoodTypeId:            goodObj.GoodTypeId,
+					ProductDate:           0,
+					ExpiryDate:            0,
+					WarehousingCount:      item.Count,
+					Price:                 goodObj.BuyPrice,
+					TotalPrice:            0,
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Remark:                item.Remake,
+					OrgId:                 orgId,
+					Type:                  1,
+					Manufacturer:          0,
+					StockCount:            item.Count,
+					Dealer:                0,
+					LicenseNumber:         "",
+					PackingPrice:          item.MinPrice,
+					StorehouseId:          item.StorehouseOutId,
+					SecondWarehouseInfoId: item.ID,
+					IsCheck:               1,
+				}
+
+				//出库逻辑
+				parseDateErr := service.ConsumablesDeliveryTwelve(orgId, record_date, warehouseOutInfo, &warehouseOut, item.Count, creater, warehouseInfo)
+				fmt.Println(parseDateErr)
+
+				//回退库存,查询该订单出库记录
+				//outList, _ := service.GetStoreWarehouseOutList(item.ProjectId, item.ID, item.UserOrgId)
+				//for _, it := range outList {
+				//	//回退库存
+				//	service.ModifyStoreWarehouseById(it.WarehouseInfotId, it.Count)
+				//
+				//	//获取入库单
+				//	//storeWareing, _ := service.GetStoreWarehouseById(item.WarehouseId, it.OrgId)
+				//	//删除入库单 入库流水
+				//	//service.ModifyStoreWarehouse(storeWareing.ID, storeWareing.OrgId, item.ProjectId)
+				//	//获取出库单
+				//	//storeWarehouseOut, _ := service.GetStoreWarehouseOutById(it.WarehouseOutId, it.OrgId)
+				//	//删除出库单
+				//	//service.ModifyWarehouseOut(storeWarehouseOut.ID, storeWarehouseOut.OrgId, item.ProjectId)
+				//}
 			}
 
 			//查询默认仓库

controllers/self_drug_api_congtroller.go

@@ -3410,7 +3410,6 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	for _, it := range drug {
 		var sum_count int64
 		var limit_count int64
-		fmt.Println("it233323323232323223", it.DrugName)
 		drugInfo, _ := service.GetDrugWarehouseInfoName(it.ID, orgId)
 		for _, item := range drugInfo {
 

controllers/stock_in_api_controller.go

@@ -154,6 +154,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
 	beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
 
+	beego.Router("/api/stock/getnewgoodwarehouseinfo", &StockManagerApiController{}, "Get:GetNewGoodWarehouseInfo")
+
 }
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -663,6 +665,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				manufacturer := int64(items["manufacturer"].(float64))
 				dealer := int64(items["dealer"].(float64))
 				license_number, _ := items["license_number"].(string)
+				register_number, _ := items["register_number"].(string)
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -694,6 +697,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
 						IsCheck:          2,
+						RegisterNumber:   register_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -721,6 +725,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						LicenseNumber:    license_number,
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
+						RegisterNumber:   register_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -745,6 +750,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						ConsumableType:      1,
 						WarehousingDetailId: warehouseInfo.ID,
 						StorehouseId:        storehouse_id,
+						RegisterNumber:      register_number,
 					}
 
 					stockFlow = append(stockFlow, flow)
@@ -7801,3 +7807,54 @@ func (this *StockManagerApiController) GetInvetoryWarehouseInfoList() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (this *StockManagerApiController) GetNewGoodWarehouseInfo() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	keywords := this.GetString("keywords")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	var goodids []int64
+	//查询商品名称
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetGoodInforByGoodName(keywords, orgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+			//入库详情但里面查询
+		}
+	}
+
+	list, _ := service.GetNewGoodWarehouseInfo(startTime, endTime, orgId, goodids, storehouse_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+		//"manufacturerList": manufacturerList,
+		//"dealerList":       dealerList,
+	})
+}

main.go

@@ -15,7 +15,7 @@ func main() {
 
 	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
-	//service.AutoClearSchedules()
+	//	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
 	//service.BeginAutoCreateDrugJob()
 	//service.BeginAutoCreateStockJob()

models/dialysis.go

@@ -849,6 +849,7 @@ type DialysisOrder struct {
 	NucleinDate                int64         `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
 	ScheduleRemark             string        `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	OrderRemark                string        `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
+	DialysisTotal              int64         `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -1096,6 +1097,7 @@ type DialysisBeforePrepareGoods struct {
 	ProjectId         int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrderId           int64  `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 type NewDialysisBeforePrepareGoods struct {
@@ -1111,6 +1113,7 @@ type NewDialysisBeforePrepareGoods struct {
 	UserOrgId                          int64                            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	ChildNewDialysisBeforePrepareGoods []*NewDialysisBeforePrepareGoods `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"child"`
 	PatientId                          int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrderId                            int64                            `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 
 type OldDialysisBeforePrepareGoods struct {
@@ -1385,3 +1388,34 @@ type XtDialysisOrderSix struct {
 func (XtDialysisOrderSix) TableName() string {
 	return "xt_dialysis_order"
 }
+
+type HisDoctorAdviceFourty struct {
+	ID                    int64                    `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                    `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64                    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceDate            int64                    `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64                    `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string                   `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	PrescribingNumber     float64                  `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string                   `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	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"`
+	ParentId              int64                    `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64                    `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64                    `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64                    `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64                    `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckTime             int64                    `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64                    `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	ChildDoctorAdvice     []*HisDoctorAdviceFourty `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
+	IsCheck               int64                    `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64                    `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64                    `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	IsSettle              int64                    `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	Drug                  Drug                     `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+}
+
+func (HisDoctorAdviceFourty) TableName() string {
+	return "his_doctor_advice_info"
+}

models/drug_stock.go

@@ -587,3 +587,112 @@ type XtDrugWarehouseFlushInfo struct {
 func (XtDrugWarehouseFlushInfo) TableName() string {
 	return "xt_drug_warehouse_flush_info"
 }
+
+type DrugFlowNight struct {
+	ID                        int64             `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64             `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64             `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string            `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string            `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64             `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64             `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64             `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64             `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string            `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64             `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string            `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64             `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64             `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string            `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64             `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64             `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64             `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64             `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64             `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64           `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64             `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64             `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64             `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64             `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64             `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	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"`
+	LastStockMaxNumber        int64             `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64             `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	BaseDrugLibSeven          BaseDrugLibSeven  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	AdviceId                  int64             `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId         int64             `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64             `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64             `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64             `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64             `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64             `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice                 float64           `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string            `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64             `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	DrugWarehouseInfoOne      DrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId"json:"xt_drug_warehouse_info" `
+	IsRead                    int64             `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	IsCheck                   int64             `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount                 int64             `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	RetailPrice               float64           `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	OrderId                   int64             `gorm:"column:order_id" json:"order_id" form:"order_id"`
+}
+
+func (DrugFlowNight) TableName() string {
+	return "xt_drug_flow"
+}
+
+type DrugWarehouseOutInfoNight struct {
+	ID                      int64            `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64            `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64            `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64            `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64            `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string           `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64          `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64          `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64            `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64            `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64            `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64            `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64            `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64            `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string           `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64            `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string           `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64            `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64            `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64            `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64            `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64            `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64          `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64          `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string           `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string           `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64            `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64            `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64            `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64            `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64            `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64            `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64            `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64            `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64          `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string           `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64            `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsCheck                 int64            `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Drug                    BaseDrugLibSeven `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	OverCount               int64            `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64            `gorm:"column:order_id" json:"order_id" form:"order_id"`
+}
+
+func (DrugWarehouseOutInfoNight) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}

models/new_monitor.go

@@ -41,14 +41,15 @@ func (VMMonitorPatients) TableName() string {
 }
 
 type VMMonitorDialysisOrder struct {
-	ID           int64        `gorm:"column:id" json:"id"`
-	DialysisDate int64        `gorm:"column:dialysis_date" json:"dialysis_date"`
-	UserOrgId    int64        `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId    int64        `gorm:"column:patient_id" json:"patient_id"`
-	BedID        int64        `gorm:"column:bed_id" json:"bed_id"`
-	Status       int64        `gorm:"column:status" json:"status"`
-	DeviceNumber DeviceNumber `gorm:"ForeignKey:BedId" json:"device_number"`
-	StartTime    int64        `gorm:"column:start_time" json:"start_time"`
+	ID            int64        `gorm:"column:id" json:"id"`
+	DialysisDate  int64        `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId     int64        `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId     int64        `gorm:"column:patient_id" json:"patient_id"`
+	BedID         int64        `gorm:"column:bed_id" json:"bed_id"`
+	Status        int64        `gorm:"column:status" json:"status"`
+	DeviceNumber  DeviceNumber `gorm:"ForeignKey:BedId" json:"device_number"`
+	StartTime     int64        `gorm:"column:start_time" json:"start_time"`
+	DialysisTotal int64        `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
 }
 
 func (VMMonitorDialysisOrder) TableName() string {

models/patient_models.go

@@ -356,6 +356,7 @@ type DialysisPrescription struct {
 	WaterMachine               string        `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
 	AddAmount                  float64       `gorm:"column:add_amount" json:"add_amount" form:"add_amount"`
 	ReduceAmount               float64       `gorm:"column:reduce_amount" json:"reduce_amount" form:"reduce_amount"`
+	DialysisRemark             string        `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -562,6 +563,7 @@ type DialysisSolution struct {
 	MaxUltrafiltrationRate     float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 	PreImpulse                 float64 `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
 	SolutionStatus             int64   `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
+	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
 }
 
 func (DialysisSolution) TableName() string {

models/patient_schedule_template_models.go

@@ -9,6 +9,7 @@ type PatientScheduleTemplateMode struct {
 	CreateTime   int64 `gorm:"column:ctime" json:"-" form:"ctime"`
 	ModifyTime   int64 `gorm:"column:mtime" json:"-" form:"mtime"`
 	Week         int64 `gorm:"column:week" json:"-" form:"week"`
+	OriginalWeek int64 `gorm:"column:original_week" json:"original_week" form:"original_week"`
 }
 
 func (PatientScheduleTemplateMode) TableName() string {

models/schedule_models.go

@@ -523,3 +523,27 @@ type ScheduleTwentyOne struct {
 func (ScheduleTwentyOne) TableName() string {
 	return "xt_schedule"
 }
+
+type VmBloodScheduleOne struct {
+	ID              int64                      `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId     int64                      `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId           int64                      `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId       int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate    int64                      `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType    int64                      `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek    int64                      `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId          int64                      `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	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"`
+	DeviceNumber    *NewMDeviceNumberVM        `gorm:"ForeignKey:BedId" json:"device_number"`
+	SchedualPatient *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
+	XtDoctorAdvice  []*XtDoctorAdvice          `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_doctor_advice"`
+	HisDoctorAdvice []*HisDoctorAdviceFourty   `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_doctor_advice"`
+}
+
+func (VmBloodScheduleOne) TableName() string {
+	return "xt_schedule"
+}

models/smart_sch.go

@@ -6,7 +6,7 @@ type SmartSchPatient struct {
 	Name       string `gorm:"column:name" json:"name" form:"name"`
 	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
 
-	SmartSchedule []*SmartSchedule `gorm:"-" json:"sch"`
+	//SmartSchedule []*SmartSchedule `gorm:"-" json:"sch"`
 }
 
 func (SmartSchPatient) TableName() string {
@@ -27,22 +27,23 @@ func (SmartSchTemplatePatient) TableName() string {
 }
 
 type SmartSchedule struct {
-	ID                 int64              `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PartitionId        int64              `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId              int64              `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId          int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate       int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType       int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek       int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId             int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	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"`
-	DeviceZone         DeviceZone         `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber       DeviceNumber       `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	SmSchDialysisOrder SmSchDialysisOrder `json:"order" gorm:"foreignkey:BedId,PatientId,DialysisDate;AssociationForeignKey:BedId,PatientId,ScheduleDate;"`
+	ID                  int64              `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId           int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId         int64              `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId               int64              `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId           int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate        int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType        int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek        int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId              int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	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"`
+	DeviceZone          DeviceZone         `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber        DeviceNumber       `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	SmSchDialysisOrder  SmSchDialysisOrder `json:"order" gorm:"-"`
+	DialysisMachineName string             `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
 }
 
 func (SmartSchedule) TableName() string {

models/stock_models.go

@@ -152,7 +152,8 @@ func (WarehousingInfo) TableName() string {
 }
 
 type WarehousingInfoSeven struct {
-	StockCount int64 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StockCount   int64 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId int64 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (WarehousingInfoSeven) TableName() string {

service/device_service.go

@@ -391,11 +391,13 @@ func UpdateDeviceGroup(group *models.DeviceGroup) error {
 //////// 机号 Number
 
 type DeviceNumberVM struct {
-	ID     int64  `gorm:"column:id" json:"id"`
-	OrgID  int64  `gorm:"column:org_id" json:"-"`
-	Number string `gorm:"column:number" json:"number"`
-	ZoneID int64  `gorm:"column:zone_id" json:"zone_id"`
-	Status int64  `gorm:"column:status" json:"status" form:"status"`
+	ID      int64  `gorm:"column:id" json:"id"`
+	OrgID   int64  `gorm:"column:org_id" json:"-"`
+	Number  string `gorm:"column:number" json:"number"`
+	ZoneID  int64  `gorm:"column:zone_id" json:"zone_id"`
+	Status  int64  `gorm:"column:status" json:"status" form:"status"`
+	Sort    int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	GroupId int64  `gorm:"column:group_id" json:"group_id" form:"group_id"`
 }
 
 func (DeviceNumberVM) TableName() string {
@@ -834,3 +836,23 @@ func UpdateScheduleById(id int64, schedule models.Schedule) error {
 	err := XTWriteDB().Model(&models.Schedule{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
 	return err
 }
+
+func GetScheduleTemplateForDeviceNumber(orgID int64, deviceNumberID int64, template_id int64, week_type int64, time_type int64) (models.PatientScheduleTemplateItem, error) {
+	var item models.PatientScheduleTemplateItem
+	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ? AND time_type = ?", deviceNumberID, orgID, template_id, week_type, time_type).First(&item).Error
+	return item, err
+}
+
+//某模板下，某周几下，该床位是否有患者
+func GetScheduleTemplateOne(orgID int64, deviceNumberID int64, template_id int64, week_type int64) (models.PatientScheduleTemplateItem, error) {
+	var item models.PatientScheduleTemplateItem
+	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ?", deviceNumberID, orgID, template_id, week_type).First(&item).Error
+	return item, err
+}
+
+//某模板下，某周几下，是否有排班
+func GetScheduleTemplateTwo(orgID int64, template_id int64, week_type int64, patient_id int64) (models.PatientScheduleTemplateItem, error) {
+	var item models.PatientScheduleTemplateItem
+	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("patient_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ?", patient_id, orgID, template_id, week_type).First(&item).Error
+	return item, err
+}

service/dialysis_solution_service.go

@@ -216,9 +216,9 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id in
 
 }
 
-func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodSchedule, err error) {
+func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
 
-	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+	db := XTReadDB().Model(&models.VmBloodScheduleOne{}).Where("status = 1")
 
 	if scheduleDate > 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -235,8 +235,9 @@ func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id
 	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ?", orgID, scheduleDate).
-		Preload("HisDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ?", orgID, scheduleDate).
-		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+		Preload("HisDoctorAdvice", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1 and advice_date = ?", orgID, scheduleDate).Preload("Drug", "org_id =? and status = 1", orgID)
+		}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
 
 	return schedule, err
 
@@ -364,7 +365,6 @@ func SaveHisDialysis(orgid int64, ids []string) error {
 }
 
 func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64, ids []string) (schedule []*models.VmBloodScheduleTwo, total int64, err error) {
-	fmt.Println("ids23322332323232hhha", ids)
 	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
@@ -391,7 +391,7 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 			Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 					return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
-						return db.Where("user_org_id = ? and status = 1 and type = 3", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+						return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
 					})
 				})
 			})
@@ -405,7 +405,7 @@ func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page i
 			Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 					return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
-						return db.Where("user_org_id = ? and status = 1 and type = 3", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+						return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
 					})
 				})
 			}).Find(&schedule).Error
@@ -437,10 +437,22 @@ func GetHisDialysisGoodCount(orgID int64, schedule_type int64, partition_id int6
 		Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
 				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
-					return db.Where("user_org_id = ? and status = 1 and type = 3", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
 				})
 			})
 		}).Find(&schedule).Error
 
 	return schedule, err
 }
+
+func GeAdviceListToday(user_org_id int64, advice_date int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1 and advice_date = ?", user_org_id, advice_date).Find(&advice).Error
+	return advice, err
+}
+
+func GetHisAdviceListToday(user_org_id int64, advice_date int64) (advice []*models.HisDoctorAdviceFourty, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1 and advice_date = ?", user_org_id, advice_date).Preload("Drug", "org_id = ? and status=1", user_org_id).Find(&advice).Error
+	return advice, err
+}

service/gobal_config_service.go

@@ -902,6 +902,12 @@ func GetDrugWarehouseOutDetailSeventy(id int64, org_id int64) (info []*models.Dr
 	return info, err
 }
 
+func GetDrugWarehouseOutDetailNighty(id int64, org_id int64) (info []*models.DrugWarehouseOutInfoNight, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id in(?) and org_id = ? and status =1", id, org_id).Preload("Drug", "org_id = ? and status = 1", org_id).Find(&info).Error
+	return info, err
+}
+
 func GetDrugStockFlowDetail(record_time int64, orgid int64) (drugflow []*models.XtDrugAutomaticReduceDetail, err error) {
 
 	err = XTReadDB().Where("record_time = ? and org_id = ? and status = 1", record_time, orgid).Preload("XtBaseDrug", "status = 1").Find(&drugflow).Error
@@ -945,7 +951,7 @@ func GetDrugFlowList(id int64, orgid int64) (stockflow []*models.DrugFlow, err e
 	return stockflow, err
 }
 
-func GetDrugFlowListGroupById(id int64, orgid int64) (drugFlow []*models.DrugFlow, err error) {
+func GetDrugFlowListGroupById(id int64, orgid int64) (drugFlow []*models.DrugFlowNight, err error) {
 
 	err = XTReadDB().Where("warehouse_out_id in(?) and user_org_id = ? and status = 1", id, orgid).Group("warehousing_detail_id").Find(&drugFlow).Error
 	return drugFlow, err
@@ -953,7 +959,7 @@ func GetDrugFlowListGroupById(id int64, orgid int64) (drugFlow []*models.DrugFlo
 
 func GetDrugFlowListGroupByIdOne(id int64, orgid int64) (drugFlow []*models.DrugFlow, err error) {
 
-	err = XTReadDB().Where("warehouse_out_id in(?) and user_org_id = ? and status = 1", id, orgid).Group("batch_number").Find(&drugFlow).Error
+	err = XTReadDB().Where("warehouse_out_id in(?) and user_org_id = ? and status = 1", id, orgid).Group("warehousing_detail_id").Find(&drugFlow).Error
 	return drugFlow, err
 }
 

service/his_service.go

@@ -2676,19 +2676,19 @@ func GetHisOrderByIDThree(order_id int64) (order models.HisOrder, err error) {
 	return
 }
 
-func GetDrugSumOutCountByDrugId(drug_id int64, user_org_id int64) (models.XtDrugStockCount, error) {
+func GetDrugSumOutCountByDrugId(drug_id int64, user_org_id int64, storehouse_id int64) (models.XtDrugStockCount, error) {
 
 	drug := models.XtDrugStockCount{}
 
-	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and status = 1", drug_id, user_org_id).Find(&drug).Error
+	err := XTReadDB().Where("drug_id = ? and user_org_id = ? and status = 1 and storehouse_id =?", drug_id, user_org_id, storehouse_id).Find(&drug).Error
 
 	return drug, err
 }
 
-func GetStockGoodList(good_id int64, org_id int64) (models.XtGoodStockCount, error) {
+func GetStockGoodList(good_id int64, org_id int64, storehouse_id int64) (models.XtGoodStockCount, error) {
 
 	stockCount := models.XtGoodStockCount{}
-	err = XTReadDB().Where("good_id = ? and user_org_id = ? and status= 1", good_id, org_id).Find(&stockCount).Error
+	err = XTReadDB().Where("good_id = ? and user_org_id = ? and status= 1 and storehouse_id = ?", good_id, org_id, storehouse_id).Find(&stockCount).Error
 	return stockCount, err
 }
 

service/manage_center_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
@@ -210,6 +211,12 @@ func GetDrugAutoWarehouseOutEight(patient_id int64, advicedate int64, drugid int
 	return detail, err
 }
 
+func GetDrugAutoWarehouseOutTen(patient_id int64, advicedate int64, drugid int64, adviceid int64, warehouse_info_id int64) (models.DrugWarehouseOutInfo, error) {
+	detail := models.DrugWarehouseOutInfo{}
+	err = XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ? and warehouse_info_id = ?", patient_id, advicedate, drugid, adviceid, warehouse_info_id).Find(&detail).Error
+	return detail, err
+}
+
 func GetDrugAutoWarehouseOutNight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (night []*models.DrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&night).Error
@@ -430,11 +437,11 @@ func GetAllDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
 
 func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) error {
 
-	//查询该病人该药品是否有库存记录
+	//查询该批次病人该药品出库数据
 	info, _ := GetDrugAutoWarehouseOutEight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
-
 	list, _ := GetDrugAutoWarehouseOutNight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
 
+	fmt.Println("lsit233323232323233232332wo", list)
 	storeHouseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	//退库
 	drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
@@ -442,24 +449,35 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 	//如果剩余数量 + 退库数量 < 总入库数量
 	if len(list) > 0 {
 		for _, its := range list {
+			fmt.Println("its,23322323323223232332wo", its.WarehouseInfoId)
+
+			//查询该批次病人该药品出库数据
+			infos, _ := GetDrugAutoWarehouseOutTen(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID, its.WarehouseInfoId)
+			fmt.Println("info2332323232332233223wo", infos.Count)
 			//查询该药品出库批次总入库数量
-			druginfo, _ := GetDrugInfoSix(its.WarehouseInfoId, info.OrgId)
+			druginfo, _ := GetDrugInfoSix(its.WarehouseInfoId, infos.OrgId)
 
 			var out_count int64  //该批次出库库存
 			var sum_count int64  //该批次总库存
 			var over_count int64 //剩余数量
 
-			over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
-			if info.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-				out_count = info.Count * drug.MinNumber
+			if druginfo.MaxUnit != druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+			}
+			if druginfo.MaxUnit == druginfo.MinUnit {
+				over_count = druginfo.StockMaxNumber + druginfo.StockMinNumber
+			}
+
+			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = infos.Count * drug.MinNumber
 
 			}
-			if info.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-				out_count = info.Count
+			if infos.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+				out_count = infos.Count
 			}
 
-			if info.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-				out_count = info.Count
+			if infos.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+				out_count = infos.Count
 			}
 
 			if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
@@ -474,9 +492,12 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				sum_count = druginfo.WarehousingCount
 			}
 
+			fmt.Println("//剩余数量", over_count)
+			fmt.Println("该批出出库数量3223323232wo", out_count)
+			fmt.Println("g该批次总库存wowowoowow", sum_count)
 			if (over_count + out_count) <= sum_count {
 				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-
+					fmt.Print("itscoutn233232223999wi", its.Count)
 					//退库
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: its.Count,
@@ -490,7 +511,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 				}
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
+					fmt.Print("itscoutn999888", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -503,7 +524,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				}
 
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-
+					fmt.Print("itscoutnwohhhhwhw", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -892,7 +913,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater int64) error {
 
 	//查询已经出库数量
-	info, _ := GetWareOutInfo(good.GoodId, good.RecordDate, good.UserOrgId, good.PatientId)
+	info, _ := GetWareOutInfo(good.GoodId, good.RecordDate, good.UserOrgId, good.PatientId, good.OrderId)
 	if len(info) > 0 {
 		houseConfig, _ := GetAllStoreHouseConfig(good.UserOrgId)
 
@@ -1001,7 +1022,7 @@ func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater i
 			//出库数量减少
 			UpdateSumCount(good.UserOrgId, houseConfig.StorehouseOutInfo, good.GoodId, good.Count)
 			//删除出库表
-			DeleteAutoRedeceDetailTen(good.UserOrgId, item.PatientId, item.SysRecordTime, item.GoodId)
+			DeleteAutoRedeceDetailTenOne(good.UserOrgId, item.PatientId, item.SysRecordTime, item.GoodId, item.OrderId)
 
 			goodListOne, _ := GetSumGoodList(item.OrgId, houseConfig.StorehouseOutInfo, item.GoodId)
 			var flush_count int64

service/mobile_dialysis_service.go

@@ -2755,6 +2755,11 @@ func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (
 	return
 }
 
+func GetDialysisOrderCountTwo(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1672502400 and  dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	return
+}
+
 func GetFirstDateOfMonth(d time.Time) time.Time {
 	d = d.AddDate(0, 0, -d.Day()+1)
 	return GetZeroTime(d)
@@ -5188,3 +5193,32 @@ func UpdateMobilePatient(org_id int64, patient_id int64, schedule_remark string)
 	err = XTWriteDB().Model(models.XtPatientsNew{}).Where("user_org_id = ? and id = ? and status = 1", org_id, patient_id).Updates(map[string]interface{}{"schedule_remark": schedule_remark}).Error
 	return err
 }
+
+func GetDialysisTotalCount(org_id int64, patient_id int64) (models.BloodDialysisOrderCount, error) {
+
+	order := models.BloodDialysisOrderCount{}
+	db := XTReadDB().Table("xt_dialysis_order as o")
+
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
+
+	return order, err
+}
+
+func GetDialysisTotalCountOne(org_id int64, patient_id int64) (models.BloodDialysisOrderCount, error) {
+
+	order := models.BloodDialysisOrderCount{}
+	db := XTReadDB().Table("xt_dialysis_order as o")
+
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date>=1672502400 and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id).Scan(&order).Error
+
+	return order, err
+}
+
+func UpdateDialysisOrder(patient_id int64, dialysis_date int64, user_org_id int64, dialysis_total int64) (models.DialysisOrder, error) {
+
+	order := models.DialysisOrder{}
+
+	err := XTWriteDB().Model(&order).Where("patient_id = ? and dialysis_date = ? and user_org_id = ? and status = 1", patient_id, dialysis_date, user_org_id).Updates(map[string]interface{}{"dialysis_total": dialysis_total}).Error
+
+	return order, err
+}

service/new_stock_service.go

@@ -370,9 +370,9 @@ func UpdateLastAutoCount(id int64, count int64) error {
 	return err
 }
 
-func GetWareOutInfo(good_id int64, record_date int64, user_org_id int64, patient_id int64) (outinfo []*models.WarehouseOutInfo, err error) {
+func GetWareOutInfo(good_id int64, record_date int64, user_org_id int64, patient_id int64, order_id int64) (outinfo []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and status = 1 and patient_id = ?", good_id, record_date, user_org_id, patient_id).Find(&outinfo).Error
+	err = XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and status = 1 and patient_id = ? and order_id = ?", good_id, record_date, user_org_id, patient_id, order_id).Find(&outinfo).Error
 	return outinfo, err
 }
 

service/new_warehouse_service.go

@@ -50,7 +50,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		UpdateHisPrescriptionProjectStatus(goods.GoodId, record_time, orgID, patient_id)
 
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -312,7 +312,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		if errThree != nil {
 			return errThree
 		}
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -1457,7 +1457,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		//查询今日该药品该患者是否有出库数据
 		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-		fmt.Println("lastDrugOutInfowwowowowoowowowowowowowowo", lastDrugOutInfo.ID)
 		if lastDrugOutInfo.ID == 0 {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -1849,6 +1848,9 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 		}
 
+		fmt.Println("libai", out_count)
+		fmt.Println("cancel", cancel_count)
+		fmt.Println("deliver_number", deliver_number)
 		if deliver_number < (out_count - cancel_count) {
 			operation_time := time.Now().Unix()
 
@@ -1997,13 +1999,13 @@ func GetSigleDrugWarehouseOutInfo(patient_id int64, advice_date int64, orgid int
 func GetSigleDrugWarehouseOutInfoOne(patient_id int64, advice_date int64, orgid int64) (models.XtDrugWarehouseOutInfo, error) {
 
 	info := models.XtDrugWarehouseOutInfo{}
-	err = XTReadDB().Where("patient_id = ? and advice_date = ? and org_id = ? and status = 1", patient_id, advice_date, orgid).Find(&info).Error
+	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and org_id = ? and status = 1", patient_id, advice_date, orgid).Find(&info).Error
 	return info, err
 }
 
 func UpdateSingleDrugWarehouseOutInfoSix(patient_id int64, advice_date int64, orgid int64, info *models.DrugWarehouseOutInfo, advice_id int64) error {
 
-	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ?", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ? and status= 1", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
 	return err
 }
 
@@ -2069,6 +2071,12 @@ func FindDrugWarehouseOutInfoCount(drugid int64, patient_id int64, record_date i
 	return flow, err
 }
 
+func FindDrugSettleWarehouseOutInfoCount(drugid int64, patient_id int64, record_date int64, org_id int64, advice_id int64) (flow []*models.DrugFlow, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and system_time = ? and user_org_id = ? and consumable_type = 15 and status = 1 and advice_id = ?", drugid, patient_id, record_date, org_id, advice_id).Find(&flow).Error
+	return flow, err
+}
+
 func FindDrugCancelOutInfo(drugid int64, patient_id int64, record_date int64, org_id int64, advice_id int64) (flow []*models.DrugFlow, err error) {
 	err = XTReadDB().Where("drug_id = ? and patient_id = ? and system_time = ? and user_org_id = ? and consumable_type = 7 and status = 1 and advice_id = ?", drugid, patient_id, record_date, org_id, advice_id).Find(&flow).Error
 	return flow, err
@@ -2078,7 +2086,7 @@ func FindDrugCancelStock(return_date int64, org_id int64) (*models.DrugCancelSto
 
 	stock := models.DrugCancelStock{}
 	var err error
-	err = XTReadDB().Where("return_date = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
+	err = XTReadDB().Where("return_time = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -2091,7 +2099,7 @@ func FindDrugCancelStock(return_date int64, org_id int64) (*models.DrugCancelSto
 func FindLastDrugCancelStock(advice_date int64, org_id int64) (models.DrugCancelStock, error) {
 
 	cancelStock := models.DrugCancelStock{}
-	err := XTReadDB().Where("return_date = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
+	err := XTReadDB().Where("return_time = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
 	return cancelStock, err
 }
 
@@ -2122,15 +2130,19 @@ func UpdateHisPrescriptionProjectStatus(project_id int64, record_time int64, use
 }
 
 // 药品自动出库 递归方式
-func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
+func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, prescribingCount float64) (err error) {
 
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
+	var deliver_number_one int64 = 0
 	var stock_number int64 = 0
 
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
+	prescribingCount_temp := strconv.FormatFloat(math.Abs(prescribingCount), 'f', 0, 64)
+	prescribe_count, _ := strconv.ParseInt(prescribingCount_temp, 10, 64)
+
 	var drug_price float64
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
@@ -2140,6 +2152,14 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 	}
 
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
+		deliver_number_one = prescribe_count * drup.MinNumber
+
+	} else {
+		deliver_number_one = prescribe_count
+
+	}
+
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
@@ -2157,7 +2177,8 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
+
+	if lastWarehouse.StockMinNumber >= drup.MinNumber && lastWarehouse.MaxUnit != lastWarehouse.MinUnit {
 		var stockMax int64
 		var stockMin int64
 		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
@@ -2169,7 +2190,6 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
-
 		return err
 	}
 	// 将该批次的剩余库存数量转换为拆零数量
@@ -2191,6 +2211,8 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 	}
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	fmt.Println("剩余库存2332233223232323", stock_number)
+	fmt.Println("出库数量233232332323232", deliver_number)
 	if stock_number >= deliver_number {
 
 		var maxNumber int64 = 0
@@ -2228,41 +2250,83 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		warehouse.Mtime = time.Now().Unix()
 
-		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
-		fmt.Println("max_number232232332232322wo", maxNumber)
-		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
+		//fmt.Println("minnU目标而332322323323233223323223我", minNumber)
+		//fmt.Println("max_number232232332232322wo", maxNumber)
+		//fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
 
-		if warehouse.StockMinNumber < minNumber {
+		if warehouse.MaxUnit != warehouse.MinUnit {
+			if warehouse.StockMinNumber < minNumber {
 
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			if warehouse.MaxUnit != warehouse.MinUnit {
-				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-			}
-		} else {
-			if minNumber > 0 {
-				if (warehouse.StockMinNumber - minNumber) >= 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+				if warehouse.MaxUnit != warehouse.MinUnit {
+					warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 				}
+			} else {
+				if minNumber > 0 {
+					if (warehouse.StockMinNumber - minNumber) >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					}
 
-			}
+				}
 
-			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
-				if warehouse.StockMinNumber > 0 {
-					if warehouse.StockMinNumber-deliver_number >= 0 {
+				if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+					if warehouse.StockMinNumber > 0 {
+						if warehouse.StockMinNumber-deliver_number >= 0 {
+							warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+						}
+
+					}
+
+				}
+
+				if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+					if (warehouse.StockMinNumber - deliver_number) >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 					}
 
 				}
 
 			}
-
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) >= 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		if warehouse.MinUnit == warehouse.MaxUnit {
+			//fmt.Println("minNUMBER233223233223322323",minNumber)
+			//fmt.Println("warehouse.StockMinNumber",warehouse.StockMinNumber)
+			//fmt.Println("warehouse.StockMaxNumber",warehouse.StockMaxNumber)
+			if warehouse.StockMaxNumber > 0 && warehouse.StockMinNumber == 0 && warehouse.StockMaxNumber >= minNumber {
+				warehouse.StockMaxNumber = warehouse.StockMaxNumber - minNumber
+
 			}
 
+			if warehouse.StockMaxNumber == 0 && warehouse.StockMinNumber > 0 && warehouse.StockMinNumber >= minNumber {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			}
+
+			if warehouse.StockMaxNumber > 0 && warehouse.StockMinNumber > 0 && (warehouse.StockMaxNumber+warehouse.StockMinNumber) > minNumber {
+
+				var out_false int64 = 0
+				if warehouse.StockMinNumber >= minNumber {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					out_false = 1
+				}
+				fmt.Println("out_false233223233223wo", out_false)
+				if warehouse.StockMinNumber < minNumber && out_false == 0 {
+
+					var over_total int64
+					over_total = warehouse.StockMinNumber
+					warehouse.StockMinNumber = 0
+					warehouse.StockMaxNumber = warehouse.StockMaxNumber - (minNumber - over_total)
+				}
+			}
+
+			//if warehouse.StockMaxNumber < minNumber && warehouse.StockMaxNumber < minNumber && (warehouse.StockMaxNumber + warehouse.StockMinNumber) > minNumber {
+			//  var over_count int64
+			//  over_count = warehouse.StockMinNumber
+			//  warehouse.StockMinNumber = 0
+			//  warehouse.StockMaxNumber = warehouse.StockMaxNumber - (minNumber -over_count)
+			//
+			//}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -2323,7 +2387,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		//查询今日该药品该患者是否有出库数据
 		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-
+		fmt.Println("lastDrugOutInfo0000000293293292392392393293239239", lastDrugOutInfo)
 		if lastDrugOutInfo.ID == 0 {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -2338,7 +2402,10 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			if lastDrugOutInfo.CountUnit == drup.MinUnit {
 				his_count = lastDrugOutInfo.Count
 			}
+			fmt.Println("deliver_numberwode8888888823832832832832832832823823-------------------------", deliver_number)
+			fmt.Println("his_countnide-------------------------------------------------------", his_count)
 			if deliver_number != his_count {
+				//warehouseOutInfo.Count = deliver_number_one
 				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
 				if errThree != nil {
 					return errThree
@@ -2349,7 +2416,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		var out_count int64
 		var cancel_count int64
 		//查询出库数据
-		infoCountList, _ := FindDrugWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		infoCountList, _ := FindDrugSettleWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
 		//查询退库数据
 		cancelInfoList, _ := FindDrugCancelOutInfo(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
 		for _, item := range infoCountList {
@@ -2360,11 +2427,11 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_number", deliver_number)
+		fmt.Println("deliver_number_one", deliver_number)
 		fmt.Println("out_count", out_count)
 		fmt.Println("cancel_count", cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		if deliver_number > (out_count - cancel_count) {
+		if deliver_number_one > (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 				WarehouseOutId:          warehouseout.ID,
@@ -2372,7 +2439,46 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+				Count:                   deliver_number_one - (out_count - cancel_count), //按最小单位计算,
+				Price:                   warehouse.RetailPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				BatchNumber:             warehouse.BatchNumber,
+				MaxUnit:                 drup.MinUnit,
+				ConsumableType:          15,
+				IsEdit:                  1,
+				Creator:                 advice.ExecutionStaff,
+				IsSys:                   1,
+				PatientId:               advice.PatientId,
+				SystemTime:              advice.AdviceDate,
+				WarehousingDetailId:     warehouse.ID,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            storeConfig.DrugStorehouseOut,
+				WarehouseOutDetailId:    lastDrugOutInfo.ID,
+				OverCount:               sum_count,
+				AdviceId:                advice.ID,
+				LastPrice:               warehouse.Price,
+				OrderId:                 warehouseout.OrderId,
+			}
+
+			CreateDrugFlowOne(drugflow)
+			//出库数量相加
+			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
+		}
+
+		if deliver_number == (out_count - cancel_count) {
+			drugflow := models.DrugFlow{
+				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+				WarehouseOutId:          warehouseout.ID,
+				DrugId:                  advice.DrugId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   deliver_number, //按最小单位计算,
 				Price:                   warehouse.RetailPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
@@ -2404,7 +2510,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		}
 
 		//如果本次出库数据小于历史出库数据 新增1条退库流水
-		if deliver_number < (out_count - cancel_count) {
+		if deliver_number_one < (out_count - cancel_count) {
 
 			operation_time := time.Now().Unix()
 
@@ -2438,9 +2544,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 			manufactureName, _ := GetManufactureById(warehouse.Manufacturer)
 			dealer, _ := GetDealerById(warehouse.Dealer)
-			cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+			//cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
 			cancelStockInfo := models.DrugCancelStockInfo{
-				OrderNumber:      cancelInfo.OrderNumber,
+				OrderNumber:      lastDrugCancelStock.OrderNumber,
 				CancelStockId:    lastDrugCancelStock.ID,
 				DrugId:           advice.DrugId,
 				Count:            (out_count - cancel_count) - deliver_number,
@@ -2475,14 +2581,14 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 				UserOrgId:               advice.UserOrgId,
 				PatientId:               advice.PatientId,
 				SystemTime:              advice.AdviceDate,
-				ConsumableType:          16,
+				ConsumableType:          7,
 				IsSys:                   0,
 				WarehousingOrder:        "",
 				WarehouseOutId:          0,
 				WarehouseOutOrderNumber: "",
 				IsEdit:                  0,
 				CancelStockId:           cancelStock.ID,
-				CancelOrderNumber:       cancelStock.OrderNumber,
+				CancelOrderNumber:       lastDrugCancelStock.OrderNumber,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
 				Creator:                 advice.ExecutionStaff,
@@ -2612,17 +2718,21 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			OrderId:                 warehouseout.OrderId,
 		}
 		//查询是否存在出库数据
-		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
-		if errCode == gorm.ErrRecordNotFound {
+
+		lastDrugOutInfoTwo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+		//_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
+		//fmt.Println("errcoedee232233223233232323232323233223232323322323232323232323",errCode)
+		if lastDrugOutInfoTwo.ID == 0 {
 
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
 				return errOne
 			}
 		}
-		if errCode == nil {
+		if lastDrugOutInfoTwo.ID > 0 {
 
 			lastDrugOutInfo, _ := GetSigleDrugWarehouseOutInfoOne(advice.PatientId, advice.AdviceDate, orgID)
+			fmt.Println("中国人民肌肤32323223332332232322323喔", lastDrugOutInfo)
 			var his_count int64
 			if lastDrugOutInfo.CountUnit == drup.MaxUnit {
 				his_count = lastDrugOutInfo.Count * drup.MinNumber
@@ -2630,7 +2740,10 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			if lastDrugOutInfo.CountUnit == drup.MinUnit {
 				his_count = lastDrugOutInfo.Count
 			}
+			fmt.Println("deliver_number3232323232wowooww", deliver_number)
+			fmt.Println("his_count99999992i2222wo", his_count)
 			if deliver_number != his_count {
+
 				errThree := UpdateSingleDrugWarehouseOutInfoSix(advice.PatientId, advice.AdviceDate, orgID, warehouseOutInfo, advice.ID)
 				if errThree != nil {
 					return errThree
@@ -2670,7 +2783,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		var out_count int64
 		var cancel_count int64
 		//查询出库数据
-		infoCountList, _ := FindDrugWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
+		infoCountList, _ := FindDrugSettleWarehouseOutInfoCount(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
 		//查询退库数据
 		cancelInfoList, _ := FindDrugCancelOutInfo(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID)
 		for _, item := range infoCountList {
@@ -2681,6 +2794,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 			cancel_count += item.Count
 		}
 
+		fmt.Println("出库数量", deliver_number)
+		fmt.Println("out_coutn233232322323wo", cancel_count)
+		fmt.Println("out_count99988233232", out_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number > (out_count - cancel_count) {
 
@@ -2722,6 +2838,7 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 		}
 
 		if deliver_number < (out_count - cancel_count) {
+			fmt.Println("即那里3232232323")
 			operation_time := time.Now().Unix()
 
 			ctime := time.Now().Unix()
@@ -2791,14 +2908,14 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 				UserOrgId:               advice.UserOrgId,
 				PatientId:               advice.PatientId,
 				SystemTime:              advice.AdviceDate,
-				ConsumableType:          16,
+				ConsumableType:          7,
 				IsSys:                   0,
 				WarehousingOrder:        "",
 				WarehouseOutId:          0,
 				WarehouseOutOrderNumber: "",
 				IsEdit:                  0,
 				CancelStockId:           cancelStock.ID,
-				CancelOrderNumber:       cancelStock.OrderNumber,
+				CancelOrderNumber:       lastDrugCancelStock.OrderNumber,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
 				Creator:                 advice.ExecutionStaff,
@@ -2834,8 +2951,9 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
+		fmt.Println("剩余库存9999999233232", overPlusNumber)
 
-		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+		HisSettleDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, prescribingCount)
 	}
 
 	return

service/patient_schedule_template_service.go

@@ -925,3 +925,32 @@ func GetOrgPatientScheduleTemplateModeTwo(orgID int64) (models.PatientScheduleTe
 	err := readDb.Model(&models.PatientScheduleTemplateMode{}).Where("org_id = ? AND status = 1", orgID).First(&mode).Error
 	return mode, err
 }
+
+func GetAllPatientScheduleTemplateItemsWithoutPatientByTemplateID(orgID int64) ([]*models.PatientScheduleTemplateItem, error) {
+	var items []*models.PatientScheduleTemplateItem
+	err := readDb.Raw("select item.id,item.org_id,item.template_id,item.device_number_id,item.patient_id,item.treat_mode,item.weekday,item.time_type,item.status,item.status,item.ctime,item.mtime from xt_patient_schedule_template_item as item left join xt_patients as patient on item.patient_id = patient.id where item.org_id = ? AND item.status = 1 and patient.lapseto = 1 and patient.status = 1", orgID).Scan(&items).Error
+	// err := readDb.
+	// 	Model(&models.PatientScheduleTemplateItem{}).
+	// 	Where("org_id = ? AND template_id = ? AND status = 1", orgID, templateID).
+	// 	Find(&items).
+	// 	Error
+	if err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+func GetScheduleTemplateItem(id int64) (item models.PatientScheduleTemplateItem, err error) {
+	err = readDb.Model(&models.PatientScheduleTemplateItem{}).Where("id = ?", id).First(&item).Error
+	return
+}
+
+func SaveSchTemplateItem(item models.PatientScheduleTemplateItem) (err error) {
+	err = writeDb.Save(&item).Error
+	return
+}
+
+func UpdateTemplateItemModeWeek(orgID int64, id int64, week_time int64) {
+	readDb.Model(&models.PatientScheduleTemplateMode{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"original_week": week_time, "week": week_time})
+	return
+}

service/patient_service.go

@@ -2517,7 +2517,7 @@ func GetAllPatientListByListOne(orgID int64) (patients []*models.VMMonitorPatien
 	patient_info_str, _ := redis.Get(key).Result()
 
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1", orgID).Find(&patients).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
@@ -2738,3 +2738,8 @@ func GetAllSchedulesByPatientInfo(org_id int64, patient_id int64, mode_id int64)
 	}
 	return record, nil
 }
+
+func UpdateScheduleByExport(org_id int64, shcheduledate int64) error {
+	err := XTWriteDB().Model(models.XtSchedule{}).Where("user_org_id = ? and schedule_date > ?", org_id, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/patientmanage_service.go

@@ -1879,3 +1879,36 @@ func DeleteHospitalSummary(id []string) error {
 	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id in (?) and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetAllPatientScheduleList(org_id int64) (patient []*models.PatientsThirty, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1", org_id).Find(&patient).Error
+
+	return patient, err
+}
+
+func GetAllDialysiOrderList(patient_id int64, org_id int64) (order []*models.DialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and status= 1 and dialysis_date<=1672416000", patient_id, org_id).Find(&order).Error
+
+	return order, err
+}
+
+func GetDialysisTotalCountThree(org_id int64, patient_id int64, dialysis_date int64) (models.BloodDialysisOrderCount, error) {
+
+	order := models.BloodDialysisOrderCount{}
+	db := XTReadDB().Table("xt_dialysis_order as o")
+
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule as x on x.patient_id = o.patient_id where o.status =1 and o.user_org_id = ? and o.patient_id = ? and o.dialysis_date<=? and  x.schedule_date = o.dialysis_date and x.status = 1 ", org_id, patient_id, dialysis_date).Scan(&order).Error
+
+	return order, err
+}
+
+func UpdateDialysisOrderSix(patient_id int64, dialysis_date int64, user_org_id int64, dialysis_total int64) (models.DialysisOrder, error) {
+
+	order := models.DialysisOrder{}
+
+	err := XTWriteDB().Model(&order).Where("patient_id = ? and dialysis_date = ? and user_org_id = ? and status = 1", patient_id, dialysis_date, user_org_id).Updates(map[string]interface{}{"dialysis_total": dialysis_total}).Error
+
+	return order, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -215,6 +215,7 @@ type PrescriptionVM struct {
 	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
 	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
 	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
+	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
 }
 
 func (PrescriptionVM) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -57,7 +57,7 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 		return nil, err
 	}
 	for _, item := range schedules {
-		if orgID != 10101 {
+		if orgID != 10101 && orgID != 10445 {
 			dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
 
 			item.Patient.TotalDialysis = dialysis_count
@@ -227,6 +227,12 @@ func GetDialysisOrderCountEight(orgID int64, patient_id int64, recordDate int64)
 	return order, err
 }
 
+func GetDialysisOrderCountNight(orgID int64, patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date>=1672502400 and dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ? and user_org_id = ?", recordDate, patient_id, orgID).Scan(&order).Error
+	return order, err
+}
+
 func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	err = p_service.XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error

service/schedule_service.go

@@ -36,7 +36,9 @@ func GetSchedulePartitionPanelTwo(orgID int64, schIDs []string) (partitions []*m
 		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
 	}
 	if len(schIDs) > 0 {
-		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1 and zone_id in(?)", orgID, schIDs).Where("org_id=? and status=1 and id in(?)", orgID, schIDs).Find(&partitions).Error
+		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", func(db *gorm.DB) *gorm.DB {
+			return db.Where("org_id=? and status=1 and zone_id in (?)", orgID, schIDs).Order("sort desc")
+		}).Where("org_id=? and status=1 and id in(?)", orgID, schIDs).Find(&partitions).Error
 	}
 
 	return
@@ -112,7 +114,6 @@ func GetWeekScheduleOne(orgID int64, start, end int64, partionid int64, schedule
 func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.Schedule, err error) {
 
 	db := readDb.Table("xt_schedule as s")
-	fmt.Println("schIds2222222")
 	if len(schIds) > 0 {
 		db = db.Where("s.partition_id in (?)", schIds)
 	}
@@ -128,6 +129,28 @@ func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, schedule
 	return
 }
 
+func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.Schedule, err error) {
+
+	db := readDb.Table("xt_schedule as s")
+
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	if len(WeekDayIds) > 0 {
+		db = db.Where("s.schedule_week in(?)", WeekDayIds)
+	}
+	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time,s.dialysis_machine_name, p.name as patient").
+		Order("updated_time asc").
+		Find(&schedules).Error
+	return
+}
+
 func GetDaySchedule(orgID, start, end, patientID int64) (schedule models.Schedule, err error) {
 	err = readDb.Model(&models.Schedule{}).Where("user_org_id=? and patient_id=? and schedule_date>=? and schedule_date<=? and status=1", orgID, patientID, start, end).First(&schedule).Error
 	return
@@ -259,7 +282,7 @@ func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, mod
 }
 
 func UpdateScheduleByOrgIdOne(patientid int64, scheduledate int64, orgid int64, sch *models.XtSchedule) error {
-	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix(), "dialysis_machine_name": sch.DialysisMachineName}).Error
 	return err
 }
 
@@ -300,12 +323,36 @@ func UpdateScheduleOne(id int64, schedule models.Schedule) error {
 //参数一：当前操作的患者的排班     参数二被替换床位对应的排班
 func UpdateScheduleTwo(schone models.Schedule, schtwo models.Schedule) {
 	utx := XTWriteDB()
-	var tempPatientID int64
-	var tempPatientIDTwo int64
-	tempPatientID = schone.PatientId
-	tempPatientIDTwo = schtwo.PatientId
-	schone.PatientId = tempPatientIDTwo
-	schtwo.PatientId = tempPatientID
+	//床位
+	var tempBedID int64
+	var tempBedIDTwo int64
+
+	//分區
+	var tempPID int64
+	var tempPIDTwo int64
+
+	//上下午
+	var tempTypeID int64
+	var tempTypeTwo int64
+
+	tempBedID = schone.BedId
+	tempBedIDTwo = schtwo.BedId
+
+	tempPID = schone.PartitionId
+	tempPIDTwo = schtwo.PartitionId
+
+	tempTypeID = schone.ScheduleType
+	tempTypeTwo = schtwo.ScheduleType
+
+	schone.BedId = tempBedIDTwo
+	schtwo.BedId = tempBedID
+
+	schone.PartitionId = tempPIDTwo
+	schtwo.PartitionId = tempPID
+
+	schone.ScheduleType = tempTypeTwo
+	schtwo.ScheduleType = tempTypeID
+
 	utx.Save(&schone)
 	utx.Save(&schtwo)
 

service/self_drug_service.go

@@ -1516,7 +1516,7 @@ func GetGoodPatientList(orgid int64, keyword string) (patient []*models.XtPatien
 
 func GetWarehouseOutDetailByPatientIdOne(orgid int64, patient_id int64, startime int64, endtime int64, limit int64, page int64) (info []*models.WarehouseOutInfo, total int64, err error) {
 
-	db := XTReadDB().Model(&info).Where("status = 1 and is_sys = 1")
+	db := XTReadDB().Model(&info).Where("status = 1 and (is_sys = 1 or is_sys = 5)")
 	offset := (page - 1) * limit
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
@@ -1536,7 +1536,7 @@ func GetWarehouseOutDetailByPatientIdOne(orgid int64, patient_id int64, startime
 
 func GetWarehouseOutDetailByPatientId(orgid int64, patient_id int64, startime int64, endtime int64) (info []*models.WarehouseOutInfo, err error) {
 
-	db := XTReadDB().Model(&info).Where("status = 1 and is_sys = 1")
+	db := XTReadDB().Model(&info).Where("status = 1 and (is_sys = 1 or is_sys =5)")
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}

service/smart_sch.go

@@ -15,21 +15,41 @@ func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*model
 		err = db.Find(&patient).Error
 	}
 
-	for _, item := range patient {
-		var sch []*models.SmartSchedule
-		now := time.Now()
+	//for _, item := range patient {
+	//	var sch []*models.SmartSchedule
+	//	now := time.Now()
+	//
+	//	offset := int(time.Monday - now.Weekday())
+	//	if offset > 0 {
+	//		offset = -6
+	//	}
+	//
+	//	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	//	readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, item.ID, weekStart.Unix()).
+	//		Preload("DeviceZone", "status = 1").
+	//		Preload("SmSchDialysisOrder", "status = 1").
+	//		Preload("DeviceNumber", "status = 1").Find(&sch)
+	//	item.SmartSchedule = sch
+	//}
 
-		offset := int(time.Monday - now.Weekday())
-		if offset > 0 {
-			offset = -6
-		}
+	return
+}
+
+func GetSmartSchPatientByPatientID(orgID int64, id int64) (sch []*models.SmartSchedule, err error) {
+	now := time.Now()
+	offset := int(time.Monday - now.Weekday())
+	if offset > 0 {
+		offset = -6
+	}
+	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
+	readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, id, weekStart.Unix()).
+		Preload("DeviceZone", "status = 1").
+		Preload("DeviceNumber", "status = 1").Find(&sch)
 
-		weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
-		readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, item.ID, weekStart.Unix()).
-			Preload("DeviceZone", "status = 1").
-			Preload("SmSchDialysisOrder", "status = 1").
-			Preload("DeviceNumber", "status = 1").Find(&sch)
-		item.SmartSchedule = sch
+	for _, item := range sch {
+		var order models.SmSchDialysisOrder
+		readDb.Model(&models.SmSchDialysisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND dialysis_date = ? AND bed_id = ?", orgID, item.PatientId, item.ScheduleDate, item.BedId).First(&order)
+		item.SmSchDialysisOrder = order
 	}
 
 	return
@@ -43,32 +63,31 @@ func GetSmartSchTemplatePatientByKeyWord(orgID int64, keywords string) (patient
 	} else {
 		err = db.Find(&patient).Error
 	}
-
-	for _, item := range patient {
-		mode, _ := GetOrgPatientScheduleTemplateModeTwo(item.UserOrgId)
-		if mode.ID > 0 {
-			if mode.Mode == 1 {
-				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 1)
-				item.XtPatientScheduleTemplateId = schs
-
-			} else if mode.Mode == 2 {
-				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 2)
-
-				item.XtPatientScheduleTemplateId = schs
-
-			} else if mode.Mode == 3 {
-				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 3)
-				item.XtPatientScheduleTemplateId = schs
-
-			} else if mode.Mode == 4 {
-
-				schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 4)
-				item.XtPatientScheduleTemplateId = schs
-
-			}
-		}
-
-	}
+	//for _, item := range patient {
+	//	mode, _ := GetOrgPatientScheduleTemplateModeTwo(item.UserOrgId)
+	//	if mode.ID > 0 {
+	//		if mode.Mode == 1 {
+	//			schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 1)
+	//			item.XtPatientScheduleTemplateId = schs
+	//
+	//		} else if mode.Mode == 2 {
+	//			schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 2)
+	//
+	//			item.XtPatientScheduleTemplateId = schs
+	//
+	//		} else if mode.Mode == 3 {
+	//			schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 3)
+	//			item.XtPatientScheduleTemplateId = schs
+	//
+	//		} else if mode.Mode == 4 {
+	//
+	//			schs, _ := GetSmartSchTemplatePatientByID(item.UserOrgId, item.ID, 4)
+	//			item.XtPatientScheduleTemplateId = schs
+	//
+	//		}
+	//	}
+	//
+	//}
 	return
 }
 
@@ -81,8 +100,13 @@ func GetSmartSchPatientByID(orgID int64, patient_id int64) (schs []*models.Smart
 	weekStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).AddDate(0, 0, offset)
 	err = readDb.Model(&models.SmartSchedule{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND schedule_date >= ?", orgID, patient_id, weekStart.Unix()).
 		Preload("DeviceZone", "status = 1").
-		Preload("SmSchDialysisOrder", "status = 1").
 		Preload("DeviceNumber", "status = 1").Find(&schs).Error
+
+	for _, item := range schs {
+		var order models.SmSchDialysisOrder
+		readDb.Model(&models.SmSchDialysisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND dialysis_date = ? AND bed_id = ?", orgID, item.PatientId, item.ScheduleDate, item.BedId).First(&order)
+		item.SmSchDialysisOrder = order
+	}
 	return
 }
 
@@ -118,3 +142,27 @@ func GetScheduleByZoneAndBed(org_id int64, partitionId int64, bed_id int64, sche
 	err = readDb.Model(&models.SmartSchedule{}).Where("bed_id = ? AND user_org_id = ? AND schedule_date = ? AND partition_id = ? AND schedule_type = ?  AND status = 1", bed_id, org_id, schedule_date, partitionId, sch_type).First(&sch).Error
 	return
 }
+
+func GetScheduleByDate(org_id int64, schedule_date int64, patient_id int64) (sch models.SmartSchedule, err error) {
+	err = readDb.Model(&models.SmartSchedule{}).Where(" user_org_id = ? AND schedule_date = ? AND status = 1 AND patient_id = ?", org_id, schedule_date, patient_id).First(&sch).Error
+	return
+}
+func SaveSmartSch(sch models.SmartSchedule) {
+	writeDb.Save(&sch)
+	return
+}
+
+func GetAllAvaildTemplateDeviceNumbersByZone(orgID int64, weekday int64, schedule_type int, zone_id int64, patient_id int64, template_id int64) ([]*DeviceNumberViewModel, error) {
+	var vms []*DeviceNumberViewModel = make([]*DeviceNumberViewModel, 0)
+	rows, err := readDb.Raw("SELECT n.*, z.name as zone_name FROM xt_device_number as n join xt_device_zone as z on z.id = n.zone_id AND z.id = ?   WHERE (n.org_id = ? AND n.status = 1) AND NOT EXISTS (Select * FROM xt_patient_schedule_template_item as s Where s.`weekday` = ? AND s.patient_id <> ?  AND  s.org_id = n.org_id AND s.`device_number_id` = n.id  AND s.`time_type` = ? AND s.status = 1 AND s.template_id = ?)", zone_id, orgID, weekday, patient_id, schedule_type, template_id).Rows()
+	defer rows.Close()
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		var vm DeviceNumberViewModel
+		readDb.ScanRows(rows, &vm)
+		vms = append(vms, &vm)
+	}
+	return vms, nil
+}

service/stock_service.go

@@ -3883,16 +3883,30 @@ func UpdateAutoGood(orgid int64, patient_id int64, recordtime int64, goodid int6
 	return err
 }
 
-func DeleteAutoRedeceDetailTen(orgid int64, patient_id int64, recordtime int64, goodid int64) error {
+func DeleteAutoRedeceDetailTen(orgid int64, patient_id int64, recordtime int64, goodid int64, project_id int64) error {
 
 	detail := models.BloodAutomaticReduceDetail{}
 	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? ", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
 	info := models.WarehouseOutInfo{}
-	err = XTWriteDB().Model(&info).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+	err = XTWriteDB().Model(&info).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1 and project_id = ?", orgid, patient_id, recordtime, goodid, project_id).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
 	prepare := models.DialysisBeforePrepare{}
 	err = XTWriteDB().Model(&prepare).Where("user_org_id = ? and patient_id = ? and record_date = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
 	flow := models.VmStockFlow{}
-	err = XTWriteDB().Model(&flow).Where("user_org_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"is_read": 1}).Error
+	err = XTWriteDB().Model(&flow).Where("user_org_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1 and project_id = ?", orgid, patient_id, recordtime, goodid, project_id).Updates(map[string]interface{}{"is_read": 1}).Error
+	return err
+
+}
+
+func DeleteAutoRedeceDetailTenOne(orgid int64, patient_id int64, recordtime int64, goodid int64, order_id int64) error {
+
+	detail := models.BloodAutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? ", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+	info := models.WarehouseOutInfo{}
+	err = XTWriteDB().Model(&info).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1 and order_id = ?", orgid, patient_id, recordtime, goodid, order_id).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+	prepare := models.DialysisBeforePrepare{}
+	err = XTWriteDB().Model(&prepare).Where("user_org_id = ? and patient_id = ? and record_date = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+	flow := models.VmStockFlow{}
+	err = XTWriteDB().Model(&flow).Where("user_org_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1 and order_id = ?", orgid, patient_id, recordtime, goodid, order_id).Updates(map[string]interface{}{"is_read": 1}).Error
 	return err
 
 }
@@ -4009,6 +4023,12 @@ func GetGoodWarehouseInfoSeven(good_id int64) (info []*models.WarehousingInfoSev
 	return info, err
 }
 
+func GetGoodWarehouseInfoSevenTen(good_id int64, storehouse_id int64) (info []*models.WarehousingInfoSeven, err error) {
+
+	err = readDb.Select("stock_count").Where("good_id = ? and status = 1 and stock_count<>0 and storehouse_id = ?", good_id, storehouse_id).Find(&info).Error
+	return info, err
+}
+
 func GetAllStockList(page int64, limit int64, startime int64, endtime int64, good_type int64, keyword string, orgid int64) (info []*models.VmWarehousingInfo, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -5072,6 +5092,12 @@ func GetStockFlowIsBatchNumberThree(patient_id int64, record_time int64, good_id
 	return flow, nil
 }
 
+func GetStockFlowIsBatchNumberFour(patient_id int64, record_time int64, good_id int64, project_id int64) (flow []*models.VmStockFlow, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and system_time = ? and good_id = ? and status = 1 and consumable_type =7 and project_id = ?", patient_id, record_time, good_id, project_id).Find(&flow).Error
+	return flow, nil
+}
+
 func GetWarehouseOutInfoIsExist(id int64) (*models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
@@ -8340,3 +8366,40 @@ func GetWarehouseOutInfoIsExistThree(good_id int64, patient_id int64, record_tim
 	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ?", good_id, record_time, patient_id, project_id).Find(&info).Error
 	return info, err
 }
+
+func GetWarehouseOutInfoIsExistSix(good_id int64, patient_id int64, record_time int64, project_id int64) (*models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	var err error
+	err = XTReadDB().Model(&info).Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ? and project_id = ?", good_id, record_time, patient_id, project_id).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func GetNewGoodWarehouseInfo(startime int64, endtime int64, orgid int64, good_id []int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status = 1")
+
+	if startime > 0 {
+		db = db.Where("ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(good_id) > 0 {
+		db = db.Where("good_id in(?)", good_id)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -7493,7 +7493,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			return errThree
 		}
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -7721,7 +7721,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		if errThree != nil {
 			return errThree
 		}
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -7936,7 +7936,8 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			return errThree
 		}
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(good_yc.GoodId, orgID)
+		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+		goodList, _ := GetAllGoodSumCount(good_yc.GoodId, orgID, houseConfig.StorehouseOutInfo)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -7947,7 +7948,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		} else {
 			delete_count = ware.Count
 		}
-		houseConfig, _ := GetAllStoreHouseConfig(orgID)
+
 		// 在出库记录表里记录退库详情
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -10209,6 +10210,7 @@ func AddWarehosingInfo(info *models.WarehousingInfo) error {
 // 药品出库 递归方式
 func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo, drugWarehouse *models.DrugWarehouseInfo) (err error) {
 
+	fmt.Println("尽力2333223333233323322332")
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -10222,8 +10224,10 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
 	//开启事物
-	storeConfig, _ := GetAllStoreHouseConfig(orgID)
-	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
+	//storeConfig, _ := GetAllStoreHouseConfig(orgID)
+	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
+	fmt.Println("lastWarehouse.StockMinNumber", lastWarehouse.StockMinNumber)
+	fmt.Println("drup.MinNumber", drup.MinNumber)
 	if lastWarehouse.StockMinNumber >= drup.MinNumber {
 		var stockMax int64
 		var stockMin int64
@@ -10244,6 +10248,8 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
+	fmt.Println("stock23233233232", stock_number)
+	fmt.Println("deliver_number", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -10328,6 +10334,8 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			maxNumber = prescribingNumber
 		}
 
+		//fmt.Println("warehouse.StockMaxNumber",warehouse.StockMaxNumber)
+		//fmt.Println("maxNumber9899923323232wo",maxNumber)
 		if warehouse.StockMaxNumber < maxNumber {
 
 			return errors.New("库存数量不足")
@@ -10347,22 +10355,11 @@ func AutoDrugDeliverInfoTwelve(orgID int64, prescribingNumber int64, warehouseou
 			warehouse.StockMinNumber = 0
 		}
 
+		fmt.Println("warehouse.StockMaxNumber323232323233232332", warehouse.StockMaxNumber)
 		if warehouse.StockMaxNumber < 0 {
 			return errors.New("库存数量不足")
 		}
 
-		////扣减库存
-		//if(warehouse.StockMaxNumber > 0){
-		//  var sum_count int64
-		//  sum_count = maxNumber * drup.MinNumber
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,sum_count,warehouse.OrgId,warehouse.RetailPrice)
-		//}
-		//if(warehouse.StockMinNumber > 0){
-		//  var sum_count int64
-		//  sum_count = minNumber
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,sum_count,warehouse.OrgId,warehouse.RetailPrice)
-		//}
-
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 
 		if errThree != nil {
@@ -11306,7 +11303,7 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 		}
 
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -11477,7 +11474,7 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 		}
 
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -11773,6 +11770,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			OverCount:               over_count,
 			RetailPrice:             retail_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
 		}
 		if warehouse.RetailPrice == 0 {
 			drugflow.Price = advice.Price
@@ -11840,6 +11838,7 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			RetailPrice:             retail_price, //手动出库出库价格
 			WarehousingId:           warehouse.ID,
 			WarehousingDetailId:     warehouse.ID,
+			SystemTime:              advice.SysRecordTime,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -11898,9 +11897,9 @@ func FindLastDrugWarehouseOutInfo(orgid int64) (models.DrugWarehouseOutInfo, err
 	return info, err
 }
 
-func GetAllGoodSumCount(goodid int64, orgid int64) (info []*models.WarehousingInfo, err error) {
+func GetAllGoodSumCount(goodid int64, orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0", goodid, orgid).Find(&info).Error
+	err = XTReadDB().Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0 and storehouse_id = ?", goodid, orgid, storehouse_id).Find(&info).Error
 	return info, err
 }
 
@@ -12220,7 +12219,7 @@ func HisSettleDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctor
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
+			HisSettleDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
 
 		} else {
 			return errors.New("药品信息不存在")
@@ -12265,6 +12264,9 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 	stock_number = warehouse.StockCount
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+
+	fmt.Println("stock_numnber233232232323", stock_number)
+	fmt.Println("deliver_nmuberwooeooo2oo23", deliver_number)
 	if stock_number >= deliver_number {
 		maxNumber = goods.Count
 		warehouse.StockCount = warehouse.StockCount - maxNumber
@@ -12291,7 +12293,7 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 		}
 
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -12496,7 +12498,7 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 		}
 
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -12531,7 +12533,7 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 			RegisterNumber:          warehouse.RegisterNumber,
 			OrderId:                 order_id,
 		}
-		OutInfo.Count = goods.Count
+		OutInfo.Count = stock_number
 
 		AddSigleWarehouseOutInfo(OutInfo)
 
@@ -12636,7 +12638,17 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 
 	goods.Count = deliver_number - stock_number
 	prepare := &models.DialysisBeforePrepare{
-		Count: deliver_number - stock_number,
+		Count:        deliver_number - stock_number,
+		GoodTypeId:   goods.GoodTypeId,
+		GoodId:       goods.GoodId,
+		PatientId:    goods.PatientId,
+		RecordDate:   goods.RecordDate,
+		UserOrgId:    orgID,
+		Ctime:        time.Now().Unix(),
+		Creater:      goods.Creater,
+		CommdityCode: goods.CommdityCode,
+		Status:       1,
+		StorehouseId: goods.StorehouseId,
 	}
 	ConsumableSettleDelivery(orgID, patient_id, record_time, prepare, warehouseOut, creator, order_id)
 
@@ -12644,12 +12656,12 @@ func ConsumableSettleDelivery(orgID int64, patient_id int64, record_time int64,
 }
 
 //保存处方出库
-func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, creator int64) (err error) {
+func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, creator int64, count int64) (err error) {
 
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
-	fmt.Println("223323233233223233223233223woo", goods.Count)
+
 	deliver_number = goods.Count
 
 	// 根据先进先出原则，查询最先入库的批次，进行出库
@@ -12676,6 +12688,8 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 
 	stock_number = warehouse.StockCount
 
+	fmt.Println("sotck_number233223322o", stock_number)
+	fmt.Println("deliver_number", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		maxNumber = goods.Count
@@ -12703,7 +12717,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		}
 
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
@@ -12760,9 +12774,9 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 			RegisterNumber:          warehouse.RegisterNumber,
 		}
 		fmt.Println("goods.count2323232233232233232322332322332", goods.Count)
-		OutInfo.Count = goods.Count
+		OutInfo.Count = count
 
-		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		_, errcodes := GetWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(OutInfo)
 			if errOne != nil {
@@ -12771,7 +12785,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		} else if errcodes == nil {
 
 			outInfoOne, _ := GetWarehouseOutInfoIsExistThree(goods.GoodId, patient_id, record_time, goods.ProjectId)
-			if goods.Count != outInfoOne.Count {
+			if count != outInfoOne.Count {
 				UpdatedWarehouseOutInfo(OutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId)
 			}
 
@@ -12780,6 +12794,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		lastOut, _ := FindWarehouseOutInfoByPatientIdTwo(patient_id, record_time, goods.GoodId, orgID, goods.ProjectId)
 		//查询已经出库的数据
 		flowGood, _ := GetStockFlowIsBatchNumberSix(patient_id, record_time, goods.GoodId, goods.ProjectId)
+		fmt.Println("flowgood23323223323222323wo", flowGood)
 		var out_count int64
 		var out_count_one int64
 		for _, item := range flowGood {
@@ -12787,22 +12802,23 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		}
 
 		//查询退库数据
-		flowGoodTwo, _ := GetStockFlowIsBatchNumberThree(patient_id, record_time, goods.GoodId)
+		flowGoodTwo, _ := GetStockFlowIsBatchNumberFour(patient_id, record_time, goods.GoodId, goods.ProjectId)
 		for _, item := range flowGoodTwo {
 			out_count_one += item.Count
 		}
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		fmt.Println("goods_count233232323223", goods.Count)
-		fmt.Println("out_count - out_count_one", out_count-out_count_one)
-		if goods.Count > (out_count - out_count_one) {
+		fmt.Println("out_count23323233232wo", out_count)
+		fmt.Println("goods_count233232323223", count)
+		fmt.Println("out_count - out_count_one", out_count_one)
+		if count > (out_count - out_count_one) {
 
 			stockFlow := models.VmStockFlow{
 				WarehousingId:           warehouse.ID,
 				GoodId:                  goods.GoodId,
 				Number:                  warehouse.Number,
 				LicenseNumber:           warehouse.LicenseNumber,
-				Count:                   goods.Count - out_count + out_count_one,
+				Count:                   count - out_count + out_count_one,
 				UserOrgId:               orgID,
 				PatientId:               goods.PatientId,
 				SystemTime:              record_time,
@@ -12878,7 +12894,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 
 		//如果本次出库数据小于历史出库数据 新增1条退库流水
 
-		if goods.Count < (out_count - out_count_one) {
+		if count < (out_count - out_count_one) {
 
 			operation_time := time.Now().Unix()
 
@@ -12914,7 +12930,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				GoodId:          goods.GoodId,
 				CancelStockId:   cancel.ID,
 				GoodTypeId:      goods.GoodTypeId,
-				Count:           out_count - out_count_one - goods.Count,
+				Count:           out_count - out_count_one - count,
 				Price:           warehouse.PackingPrice,
 				Total:           0,
 				ProductDate:     warehouse.ProductDate,
@@ -12948,7 +12964,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				GoodId:                  goods.GoodId,
 				Number:                  warehouse.Number,
 				LicenseNumber:           warehouse.LicenseNumber,
-				Count:                   out_count - out_count_one - goods.Count,
+				Count:                   out_count - out_count_one - count,
 				UserOrgId:               orgID,
 				PatientId:               patient_id,
 				SystemTime:              record_time,
@@ -12988,6 +13004,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 
 			//退库数量增加
 			UpdateSumAddCancelCount(orgID, goods.GoodId, goods.StorehouseId, flow.Count)
+			ModifyAddGoodSumCount(goods.StorehouseId, flow.Count, orgID, goods.GoodId)
 		}
 
 		//添加入库ID
@@ -13054,11 +13071,12 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		}
 
 		//查询剩余库存
-		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID)
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
 		var sum_count int64
 		for _, item := range goodList {
 			sum_count += item.StockCount
 		}
+		fmt.Println("剩余库存", sum_count)
 
 		OutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -13088,9 +13106,9 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 			OverCount:               sum_count,
 			RegisterNumber:          warehouse.RegisterNumber,
 		}
-		OutInfo.Count = goods.Count
+		OutInfo.Count = stock_number
 
-		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		_, errcodes := GetWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(OutInfo)
 			if errOne != nil {
@@ -13099,7 +13117,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		} else if errcodes == nil {
 
 			outInfoOne, _ := GetWarehouseOutInfoIsExistThree(goods.GoodId, patient_id, record_time, goods.ProjectId)
-			if goods.Count != outInfoOne.Count {
+			if count != outInfoOne.Count {
 				UpdatedWarehouseOutInfo(OutInfo, goods.GoodId, patient_id, record_time, goods.ProjectId)
 			}
 
@@ -13117,8 +13135,10 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		for _, item := range flowGoodTwo {
 			out_count_one += item.Count
 		}
+		fmt.Println("出库数量", stock_number)
+		fmt.Println("历史出库数据", out_count-out_count_one)
 		//如果出库数量 大于 历史出库数据 新增1条流水
-		if goods.Count > out_count-out_count_one {
+		if count > out_count-out_count_one {
 			stockFlow := models.VmStockFlow{
 				WarehousingId:           warehouse.ID,
 				GoodId:                  goods.GoodId,
@@ -13201,7 +13221,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		}
 
 		//退库
-		if goods.Count < out_count-out_count_one {
+		if count < out_count-out_count_one {
 
 			operation_time := time.Now().Unix()
 
@@ -13237,7 +13257,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				GoodId:          goods.GoodId,
 				CancelStockId:   cancel.ID,
 				GoodTypeId:      goods.GoodTypeId,
-				Count:           out_count - out_count_one - goods.Count,
+				Count:           out_count - out_count_one - count,
 				Price:           warehouse.PackingPrice,
 				Total:           0,
 				ProductDate:     warehouse.ProductDate,
@@ -13271,7 +13291,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				GoodId:                  goods.GoodId,
 				Number:                  warehouse.Number,
 				LicenseNumber:           warehouse.LicenseNumber,
-				Count:                   out_count - goods.Count,
+				Count:                   out_count - count,
 				UserOrgId:               orgID,
 				PatientId:               patient_id,
 				SystemTime:              record_time,
@@ -13311,6 +13331,8 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 
 			//退库数量增加
 			UpdateSumAddCancelCount(orgID, goods.GoodId, goods.StorehouseId, flow.Count)
+			//实际出库减少
+			ModifyAddGoodSumCount(goods.StorehouseId, flow.Count, orgID, goods.GoodId)
 		}
 
 		errWarehouse := UpdateGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count)
@@ -13335,9 +13357,20 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 
 	goods.Count = deliver_number - stock_number
 	prepare := &models.DialysisBeforePrepare{
-		Count: deliver_number - stock_number,
+		Count:        deliver_number - stock_number,
+		GoodTypeId:   goods.GoodTypeId,
+		GoodId:       goods.GoodId,
+		PatientId:    goods.PatientId,
+		RecordDate:   goods.RecordDate,
+		UserOrgId:    orgID,
+		Ctime:        time.Now().Unix(),
+		Creater:      creator,
+		Status:       1,
+		StorehouseId: goods.StorehouseId,
+		ProjectId:    goods.ProjectId,
 	}
-	ConsumablePrescriptionDelivery(orgID, patient_id, record_time, prepare, warehouseOut, creator)
+	fmt.Println("剩余出库数量", prepare.Count)
+	ConsumablePrescriptionDelivery(orgID, patient_id, record_time, prepare, warehouseOut, creator, count)
 
 	return nil
 }