历史排班

controllers/base_api_controller.go

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

controllers/dialysis_api_controller.go

@@ -148,6 +148,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getpatientrecordlist", &DialysisApiController{}, "Get:GetPatientRecordList")
 
 	beego.Router("/api/patient/getdialysistotalcount", &DialysisApiController{}, "Get:GetDialysisTotalCount")
+
+	beego.Router("/api/schedule/getdialysisproject", &DialysisApiController{}, "Get:GetDialysisProject")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -2670,6 +2672,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 				if adminUserInfo.CurrentOrgId == 10579 {
 					newprescribe.Modifier = 0
+					newprescribe.PrescriptionDoctor = 0
+					newprescribe.Creater = 0
 				}
 				err := service.AddSigleRecord(&newprescribe)
 
@@ -2748,6 +2752,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 					if adminUserInfo.CurrentOrgId == 10579 {
 						newprescribe.Modifier = 0
+						newprescribe.PrescriptionDoctor = 0
+						newprescribe.Creater = 0
 					}
 					err := service.AddSigleRecord(&newprescribe)
 					//记录日志
@@ -2793,6 +2799,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.Modifier = adminUserInfo.AdminUser.Id
 					if adminUserInfo.CurrentOrgId == 10579 {
 						newprescribe.Modifier = 0
+						newprescribe.PrescriptionDoctor = 0
+						newprescribe.Creater = 0
 					}
 					err := service.AddSigleRecord(&newprescribe)
 					//记录日志
@@ -2984,6 +2992,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			if adminUserInfo.CurrentOrgId == 10579 {
 				newprescribe.Modifier = 0
+				newprescribe.PrescriptionDoctor = 0
+				newprescribe.Creater = 0
 			}
 			err := service.AddSigleRecord(&newprescribe)
 			//记录日志
@@ -3059,6 +3069,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Status = 1
 				if adminUserInfo.CurrentOrgId == 10579 {
 					newprescribe.Modifier = 0
+					newprescribe.PrescriptionDoctor = 0
+					newprescribe.Creater = 0
 				}
 				err := service.AddSigleRecord(&newprescribe)
 				//记录日志
@@ -7044,6 +7056,34 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 	}
 }
 
+func (this *DialysisApiController) GetDialysisProject() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(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.GetDialysisProjectSchedulistTen(orgId, schedule_type, ids, startTime.Unix())
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
 func (this *DialysisApiController) GetMobileScheduleList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId

controllers/dialysis_record_api_controller.go

@@ -249,6 +249,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		recordDateStr = time.Now().Format("2006-01-02")
 	}
 	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
 	if parseDateErr != nil {
 		this.ErrorLog("日期(%v)解析错误：%v", recordDateStr, parseDateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -434,15 +435,18 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
-		fmt.Println("his_advicses--------------------222222", his_advices)
+
 	}
 	//查询是否是开起
 	adviceConfig, _ := service.FindAdviceSettingById(adminInfo.CurrentOrgId)
 	if adviceConfig.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
-		fmt.Println("his_advicses--------------------", his_advices)
 	}
 
+	lastMonitor, _ := service.GetLastMonitor(patientID, date.Unix(), adminInfo.CurrentOrgId)
+
+	firstMonitor, _ := service.GetFirstMonitorOne(patientID, date.Unix(), adminInfo.CurrentOrgId)
+
 	_, errcode := service.GetOrgFollowIsExist(adminInfo.CurrentOrgId)
 	if errcode == gorm.ErrRecordNotFound {
 		information, _ := service.GetAdminUserRoleInformation(0)
@@ -481,6 +485,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"dryWeightList":               dryWeightList,
 			"docList":                     allDoctor,
 			"lastAcceptTreatment":         lastAcceptTreatment,
+			"firstMonitor":                firstMonitor,
+			"lastMonitor":                 lastMonitor,
 		}
 		this.ServeSuccessJSON(returnData)
 
@@ -521,6 +527,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"dryWeightList":               dryWeightList,
 			"docList":                     allDoctor,
 			"lastAcceptTreatment":         lastAcceptTreatment,
+			"firstMonitor":                firstMonitor,
+			"lastMonitor":                 lastMonitor,
 		}
 		this.ServeSuccessJSON(returnData)
 	}
@@ -1087,8 +1095,12 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				return
 			}
 		} else if schedule.ID > 0 && schedule.DialysisOrder.ID > 0 { //有排班且有上机记录
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
-			return
+
+			modityorder, _ := service.GetDayScheduleByOrder(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
+			if modityorder.ID > 0 && (schedule.PatientId != modityorder.PatientId) {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+				return
+			}
 		}
 	} else if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1949,6 +1961,8 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
+
+	fmt.Println("schedule-----------------------------", schedule)
 	daySchedule, _ := service.GetDaySchedule(adminUserInfo.CurrentOrgId, schedulestartTime, scheduleendTime, tempDialysisRecord.PatientId)
 
 	if daySchedule.BedId != bedID || daySchedule.ScheduleType != schedual_type {
@@ -1997,9 +2011,13 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 						return
 					}
 				}
-			} else if schedule.ID > 0 && schedule.DialysisOrder.ID > 0 { //有排班且有上机记录
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
-				return
+			} else if schedule.ID > 0 { //有排班且有上机记录
+				modityorder, _ := service.GetDayScheduleByOrder(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
+				if modityorder.ID > 0 && (schedule.PatientId != modityorder.PatientId) {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+					return
+				}
+
 			}
 		} else if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2061,6 +2079,8 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
 
+	service.UpdateScheduleByBedId(dialysisRecord.PatientId, dialysisRecord.DialysisDate, dialysisRecord.BedID, dialysisRecord.SchedualType, dialysisRecord.ZoneId)
+
 	order, _ := service.GetLastPatientOrder(record_id)
 
 	service.UpdateMobilePatient(adminUserInfo.CurrentOrgId, order.PatientId, schedule_remark)

controllers/his_api_controller.go

@@ -3175,7 +3175,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10598 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10610 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3424,9 +3424,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										}
 
-										//fmt.Println("is_user_total-----------------------------", is_user_total)
-										//fmt.Println("no_user_total-----------------------------", no_user_total)
-
 										if is_user_total != no_user_total {
 											//出库
 											if drug.IsUse == 2 {
@@ -3649,6 +3646,15 @@ func (c *HisApiController) CreateHisPrescription() {
 								tempTime := time.Unix(timestamp, 0)
 								timeFormat := tempTime.Format("20060102150405")
 								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
+
+								//查询改药品是否已经停用
+								base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+								if base.ID > 0 {
+									tx.Rollback()
+									c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+									return
+
+								}
 								service.CreateHisDoctorAdviceOne(&s, tx)
 
 								tx.Commit()
@@ -3732,47 +3738,25 @@ func (c *HisApiController) CreateHisPrescription() {
 								//
 								//}
 
-								service.CreateNewHisProjectTwo(&p, tx)
-								var randNum int
-								randNum = rand.Intn(10000) + 1000
-								timestamp := time.Now().Unix()
-								tempTime := time.Unix(timestamp, 0)
-								timeFormat := tempTime.Format("20060102150405")
-								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
-								service.CreateNewHisProjectTwo(&p, tx)
-
 								//查询保存耗材出库开关是否打开
 								if p.PatientId != 30038 {
 									if goodOutConfig.IsOpen == 1 {
 										//耗材出库
 										if p.Type == 3 {
-											lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
-											//查询历史出库数据
-											flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
 
-											var out_count_five int64
-											for _, item := range flowGood {
-												out_count_five += item.Count
-											}
-											parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
+											//对比当前数据和历史出库数据
 
-											//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
-											if out_count_five != parseIntCount {
-												//查询耗材最后一次出库记录
-												wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(p.ProjectId, patient_id, recordDateTime, lastHisProject.ID)
-												//查询默认出库仓库库存
-												storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
-												if len(wareOut) > 0 {
+											historyProject, _ := service.GetHistoryProject(p.PatientId, p.UserOrgId, p.RecordDate, p.ID, p.ProjectId, tx)
 
-													for _, it := range wareOut {
-														//回退库存
-														service.ModifyGoodWarehouseInfo(it.GoodId, it.WarehouseInfotId, it.OrgId, it.Count)
+											historyCount, _ := strconv.ParseInt(historyProject.Count, 10, 64)
 
-														//删除出库记录
-														service.DeleteGoodWarehouseOutInfo(it.GoodId, it.SysRecordTime, it.OrgId, it.ProjectId)
+											nowCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
-													}
-												}
+											//如果当前处方数量大于历史数据,则需要出库
+											if nowCount > historyCount {
+
+												var cha_count int64
+												cha_count = nowCount - historyCount
 
 												timeStr := time.Now().Format("2006-01-02")
 												timeArr := strings.Split(timeStr, "-")
@@ -3820,113 +3804,257 @@ func (c *HisApiController) CreateHisPrescription() {
 													PatientId:    p.PatientId,
 													RecordDate:   p.RecordDate,
 													UserOrgId:    adminInfo.CurrentOrgId,
-													Count:        parseIntCount,
+													Count:        cha_count,
 													Ctime:        time.Now().Unix(),
 													Creater:      creater,
 													Status:       1,
 													StorehouseId: houseConfig.StorehouseOutInfo,
-													ProjectId:    lastHisProject.ID,
+													ProjectId:    p.ID,
 												}
-												//判断是否是零用耗材(非零用)
-												if goodObj.IsUse == 2 || goodObj.IsUse == 0 {
-
-													//查询历史出库数据
-													flowGood, _ := service.GetNewStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
-													var out_count int64
-													for _, item := range flowGood {
-														out_count += item.Count
-													}
-													//如果历史数和当前数据不想等才进行退库出库
-													if out_count != parseIntCount {
-														service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
-
-														service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
-														detail := models.AutomaticReduceDetail{
-															WarehouseOutId:          0,
-															WarehouseOutOrderNumber: "",
-															PatientId:               p.PatientId,
-															Ctime:                   time.Now().Unix(),
-															Mtime:                   0,
-															Status:                  1,
-															RecordTime:              p.RecordDate,
-															OrgId:                   p.UserOrgId,
-															GoodId:                  p.ProjectId,
-															GoodTypeId:              0,
-															Count:                   parseIntCount,
-															Type:                    0,
-															ProjectId:               lastHisProject.ID,
-															StorehouseId:            0,
-														}
-
-														service.CreateNewAutoDetail(detail, tx)
-
-														//查询剩余库存
-														goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
-														var sum_count int64
-														for _, item := range goodList {
-															sum_count += item.StockCount
-														}
-
-														//更新剩余库存
-														service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
-
-														//耗材
-														service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
-
-													}
-													//判断是否是零用耗材(零用但是是出库耗材)
-													if goodObj.IsUse == 1 && goodObj.IsWarehouse == 1 {
+												//出库
+												service.ConsumableNewHisPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, tx)
 
-														//查询历史出库数据
-														flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
-														var out_count int64
-														for _, item := range flowGood {
-															out_count += item.Count
-														}
-														//如果历史数和当前数据不想等才进行退库出库
-														if out_count != parseIntCount {
-															service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
-
-															service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
-															detail := models.AutomaticReduceDetail{
-																WarehouseOutId:          0,
-																WarehouseOutOrderNumber: "",
-																PatientId:               p.PatientId,
-																Ctime:                   time.Now().Unix(),
-																Mtime:                   0,
-																Status:                  1,
-																RecordTime:              p.RecordDate,
-																OrgId:                   p.UserOrgId,
-																GoodId:                  p.ProjectId,
-																GoodTypeId:              0,
-																Count:                   parseIntCount,
-																Type:                    0,
-																ProjectId:               p.ID,
-																StorehouseId:            0,
-															}
+											}
 
-															service.CreateNewAutoDetail(detail, tx)
+											//如果当前处方数量小于历史数据，怎需要退库
+											if nowCount < historyCount {
 
-															//查询剩余库存
-															goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
-															var sum_count int64
-															for _, item := range goodList {
-																sum_count += item.StockCount
-															}
-
-															//更新剩余库存
-															service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+												var cha_count int64
+												cha_count = historyCount - nowCount
+												goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+												creater := c.GetAdminUserInfo().AdminUser.Id
 
-															//耗材
-															service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
-														}
+												newPrescriptionProject := &models.HisPrescriptionProject{
+													ID:                   p.ID,
+													ProjectId:            p.ProjectId,
+													Price:                p.Price,
+													UserOrgId:            p.UserOrgId,
+													Status:               1,
+													Ctime:                time.Now().Unix(),
+													Mtime:                time.Now().Unix(),
+													PatientId:            p.PatientId,
+													HisPatientId:         p.HisPatientId,
+													RecordDate:           p.RecordDate,
+													PrescriptionId:       p.PrescriptionId,
+													Count:                p.Count,
+													FeedetlSn:            p.FeedetlSn,
+													MedListCodg:          p.MedListCodg,
+													SingleDose:           p.SingleDose,
+													DeliveryWay:          p.DeliveryWay,
+													ExecutionFrequency:   p.ExecutionFrequency,
+													Day:                  p.Day,
+													HisProject:           models.HisProject{},
+													GoodInfo:             models.GoodInfo{},
+													Remark:               p.Remark,
+													Unit:                 p.Unit,
+													Type:                 p.Type,
+													Doctor:               p.Doctor,
+													ExecutionTime:        p.ExecutionTime,
+													ExecutionStaff:       p.ExecutionStaff,
+													ExecutionState:       p.ExecutionState,
+													CheckTime:            p.CheckTime,
+													CheckState:           p.CheckState,
+													Checker:              p.Checker,
+													StartTime:            p.StartTime,
+													TeamId:               p.TeamId,
+													XtHisProjectTeam:     models.XtHisProjectTeam{},
+													FrequencyType:        p.FrequencyType,
+													DayCount:             p.DayCount,
+													WeekDay:              p.WeekDay,
+													IsCheckTeam:          p.IsCheckTeam,
+													HisOrderInfo:         models.HisOrderInfo{},
+													ExecutionFrequencyId: p.ExecutionFrequencyId,
+													IsOut:                p.IsOut,
+													YbSyncStatus:         p.YbSyncStatus,
+												}
 
-													}
+												service.NewHisGoodCancelInfo(adminInfo.CurrentOrgId, creater, newPrescriptionProject, cha_count, goodObj, tx)
 
-												}
+												service.NewHisGoodAutoCancelInfo(adminInfo.CurrentOrgId, creater, newPrescriptionProject, cha_count, goodObj, tx)
 
 											}
 
+											//lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
+											////查询历史出库数据
+											//flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+											//
+											//var out_count_five int64
+											//for _, item := range flowGood {
+											//	out_count_five += item.Count
+											//}
+											//parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
+											//
+											////如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
+											//if out_count_five != parseIntCount {
+											//	//查询耗材最后一次出库记录
+											//	wareOut, _ := service.GetLastGoodWarehouseOutInfoByProjectId(p.ProjectId, patient_id, recordDateTime, lastHisProject.ID)
+											//	//查询默认出库仓库库存
+											//	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)
+											//
+											//		}
+											//	}
+											//
+											//	timeStr := time.Now().Format("2006-01-02")
+											//	timeArr := strings.Split(timeStr, "-")
+											//	total, _ := service.FindAllWarehouseOut(adminInfo.CurrentOrgId)
+											//
+											//	total = total + 1
+											//	warehousing_out_order := strconv.FormatInt(adminInfo.CurrentOrgId, 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 := c.GetAdminUserInfo().AdminUser.Id
+											//
+											//	recordDateStr := time.Now().Format("2006-01-02")
+											//	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+											//	nowtime := recordDate.Unix()
+											//	warehouseOut := models.WarehouseOut{
+											//		WarehouseOutOrderNumber: warehousing_out_order,
+											//		OperationTime:           operation_time,
+											//		OrgId:                   adminInfo.CurrentOrgId,
+											//		Creater:                 creater,
+											//		Ctime:                   time.Now().Unix(),
+											//		Status:                  1,
+											//		WarehouseOutTime:        nowtime,
+											//		Type:                    1,
+											//		StorehouseId:            storeConfig.StorehouseOutInfo,
+											//		IsCheck:                 1,
+											//		IsSys:                   1,
+											//	}
+											//	//查询是否生成出库单
+											//	out, _ := service.FindNewPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+											//	if out.ID == 0 {
+											//		service.AddNewSigleWarehouseOut(&warehouseOut, tx)
+											//	}
+											//
+											//	lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+											//
+											//	goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+											//	houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+											//
+											//	dialyPrepareOne := models.DialysisBeforePrepare{
+											//		GoodTypeId:   goodObj.GoodTypeId,
+											//		GoodId:       p.ProjectId,
+											//		PatientId:    p.PatientId,
+											//		RecordDate:   p.RecordDate,
+											//		UserOrgId:    adminInfo.CurrentOrgId,
+											//		Count:        parseIntCount,
+											//		Ctime:        time.Now().Unix(),
+											//		Creater:      creater,
+											//		Status:       1,
+											//		StorehouseId: houseConfig.StorehouseOutInfo,
+											//		ProjectId:    lastHisProject.ID,
+											//	}
+											//	//判断是否是零用耗材(非零用)
+											//	if goodObj.IsUse == 2 || goodObj.IsUse == 0 {
+											//
+											//		//查询历史出库数据
+											//		flowGood, _ := service.GetNewStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+											//		var out_count int64
+											//		for _, item := range flowGood {
+											//			out_count += item.Count
+											//		}
+											//		//如果历史数和当前数据不想等才进行退库出库
+											//		if out_count != parseIntCount {
+											//			service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
+											//
+											//			service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+											//			detail := models.AutomaticReduceDetail{
+											//				WarehouseOutId:          0,
+											//				WarehouseOutOrderNumber: "",
+											//				PatientId:               p.PatientId,
+											//				Ctime:                   time.Now().Unix(),
+											//				Mtime:                   0,
+											//				Status:                  1,
+											//				RecordTime:              p.RecordDate,
+											//				OrgId:                   p.UserOrgId,
+											//				GoodId:                  p.ProjectId,
+											//				GoodTypeId:              0,
+											//				Count:                   parseIntCount,
+											//				Type:                    0,
+											//				ProjectId:               lastHisProject.ID,
+											//				StorehouseId:            0,
+											//			}
+											//
+											//			service.CreateNewAutoDetail(detail, tx)
+											//
+											//			//查询剩余库存
+											//			goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+											//			var sum_count int64
+											//			for _, item := range goodList {
+											//				sum_count += item.StockCount
+											//			}
+											//
+											//			//更新剩余库存
+											//			service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+											//
+											//			//耗材
+											//			service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+											//
+											//		}
+											//		//判断是否是零用耗材(零用但是是出库耗材)
+											//		if goodObj.IsUse == 1 && goodObj.IsWarehouse == 1 {
+											//
+											//			//查询历史出库数据
+											//			flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)
+											//			var out_count int64
+											//			for _, item := range flowGood {
+											//				out_count += item.Count
+											//			}
+											//			//如果历史数和当前数据不想等才进行退库出库
+											//			if out_count != parseIntCount {
+											//				service.ConsumableNewPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount, tx)
+											//
+											//				service.UpdateNewAutomaticReduce(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID, tx)
+											//				detail := models.AutomaticReduceDetail{
+											//					WarehouseOutId:          0,
+											//					WarehouseOutOrderNumber: "",
+											//					PatientId:               p.PatientId,
+											//					Ctime:                   time.Now().Unix(),
+											//					Mtime:                   0,
+											//					Status:                  1,
+											//					RecordTime:              p.RecordDate,
+											//					OrgId:                   p.UserOrgId,
+											//					GoodId:                  p.ProjectId,
+											//					GoodTypeId:              0,
+											//					Count:                   parseIntCount,
+											//					Type:                    0,
+											//					ProjectId:               p.ID,
+											//					StorehouseId:            0,
+											//				}
+											//
+											//				service.CreateNewAutoDetail(detail, tx)
+											//
+											//				//查询剩余库存
+											//				goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+											//				var sum_count int64
+											//				for _, item := range goodList {
+											//					sum_count += item.StockCount
+											//				}
+											//
+											//				//更新剩余库存
+											//				service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+											//
+											//				//耗材
+											//				service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+											//			}
+											//
+											//		}
+											//
+											//	}
+											//
+											//}
+
 											//记录日志
 											byterequest, _ := json.Marshal(p)
 											adviceLog := models.XtDoctorAdviceLog{
@@ -3999,6 +4127,55 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 								}
 
+								service.CreateNewHisProjectTwo(&p, tx)
+								var randNum int
+								randNum = rand.Intn(10000) + 1000
+								timestamp := time.Now().Unix()
+								tempTime := time.Unix(timestamp, 0)
+								timeFormat := tempTime.Format("20060102150405")
+								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
+
+								goodBase, _ := service.GetBaseGoodById(p.ProjectId, p.UserOrgId)
+
+								if goodBase.ID > 0 {
+									tx.Rollback()
+									c.ServeDynamicFailJsonSend(goodBase.SpecificationName + "已停用!请更换其他耗材")
+									return
+								}
+								service.CreateNewHisProjectTwo(&p, tx)
+
+								houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+
+								//查询剩余库存
+								goodList, _ := service.GetNewAllGoodSumCount(p.ProjectId, adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, tx)
+								var sum_count int64
+								for _, item := range goodList {
+									sum_count += item.StockCount
+								}
+
+								//更新剩余库存
+								service.UpdateNewGoodFlushCount(houseConfig.StorehouseOutInfo, p.ProjectId, adminInfo.CurrentOrgId, sum_count, tx)
+
+								//耗材
+								service.UpdateNewGoodSumCountSeven(sum_count, p.ProjectId, adminInfo.CurrentOrgId, tx)
+
+								adviceObj, _ := service.GetLastHisProjectById(p.PatientId, p.UserOrgId, p.RecordDate, p.ProjectId, tx)
+
+								outInfoTwo, _ := service.GetGoodWarehouseOutInfoByAdviceId(p.PatientId, p.UserOrgId, p.RecordDate, p.ProjectId, tx)
+
+								if len(outInfoTwo) > 0 {
+									for _, item := range outInfoTwo {
+										service.UpdateGoodOutInfoByAdviceId(item.ID, adviceObj.ID, tx)
+									}
+								}
+
+								drugAutoDetail, _ := service.GetGoodAutoDetail(p.PatientId, p.UserOrgId, p.RecordDate, p.ProjectId, tx)
+								if len(drugAutoDetail) > 0 {
+									for _, item := range drugAutoDetail {
+										service.UpdateGoodAutoDetail(item.ID, adviceObj.ID, tx)
+									}
+								}
+
 								tx.Commit()
 							}
 						}
@@ -5189,6 +5366,7 @@ func (c *HisApiController) DeletePrescription() {
 									ExpireDate:              info.ExpiryDate,
 									StorehouseId:            houseConfig.StorehouseOutInfo,
 									OverCount:               flush_count,
+									OperateTime:             time.Now().Unix(),
 								}
 								service.CreateStockFlowOne(flow)
 
@@ -5268,6 +5446,7 @@ func (c *HisApiController) DeletePrescription() {
 									ExpireDate:              info.ExpiryDate,
 									StorehouseId:            houseConfig.StorehouseOutInfo,
 									OverCount:               flush_count,
+									OperateTime:             time.Now().Unix(),
 								}
 								service.CreateStockFlowOne(flow)
 
@@ -5908,6 +6087,7 @@ func (c *HisApiController) DeleteProject() {
 							ExpireDate:              info.ExpiryDate,
 							StorehouseId:            houseConfig.StorehouseOutInfo,
 							OverCount:               over_count,
+							OperateTime:             time.Now().Unix(),
 						}
 						service.CreateStockFlowOne(flow)
 					}
@@ -5946,6 +6126,7 @@ func (c *HisApiController) DeleteProject() {
 							ExpireDate:              info.ExpiryDate,
 							StorehouseId:            houseConfig.StorehouseOutInfo,
 							OverCount:               over_count,
+							OperateTime:             time.Now().Unix(),
 						}
 						service.CreateStockFlowOne(flow)
 					}
@@ -6181,6 +6362,7 @@ func (c *HisApiController) DeleteProject() {
 							ExpireDate:              it.ExpiryDate,
 							StorehouseId:            houseConfig.StorehouseOutInfo,
 							OverCount:               over_count_one,
+							OperateTime:             time.Now().Unix(),
 						}
 						service.CreateStockFlowOne(flow)
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -1,21 +1,22 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	_ "XT_New/utils"
 	"encoding/json"
 	_ "encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
-	_ "github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"net/http"
 	"net/url"
 	"strconv"
 	_ "strings"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	_ "XT_New/utils"
+	"github.com/astaxie/beego"
+	_ "github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+
 	// "fmt"
 	_ "reflect"
 	"time"
@@ -285,7 +286,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 10537 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -608,6 +608,10 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	dryWeightList, _ := service.GetPatientDryList(patientID, adminInfo.Org.Id)
 
+	lastMonitor, _ := service.GetLastMonitor(patientID, date.Unix(), adminInfo.Org.Id)
+
+	firstMonitor, _ := service.GetFirstMonitorOne(patientID, date.Unix(), adminInfo.Org.Id)
+
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -645,6 +649,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"lastDialysisPrescription":       lastDialysisPrescription,
 		"lastAssesmentBeforDialysis":     lastAssesmentBeforDialysis,
 		"dryWeightList":                  dryWeightList,
+		"firstMonitor":                   firstMonitor,
+		"lastMonitor":                    lastMonitor,
 	}
 
 	this.ServeSuccessJSON(returnData)
@@ -2542,6 +2548,7 @@ func (c *DialysisAPIController) Finish() {
 	}
 
 	lastAssessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, recordDate.Unix())
+	lastAssessmentAfterDislysisTwo, _ := service.MobileGetLastTimeAssessmentAfterDislysisTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
 
 	_, dialysisOrder := service.FindDialysisRecordById(adminUserInfo.Org.Id, id, recordDate.Unix())
 
@@ -2811,8 +2818,8 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.BloodFlow = lastAssessmentAfterDislysis.BloodFlow
 		tempassessmentAfterDislysis.SealingFluidDispose = lastAssessmentAfterDislysis.SealingFluidDispose
 		tempassessmentAfterDislysis.SealingFluidSpecial = lastAssessmentAfterDislysis.SealingFluidSpecial
-		tempassessmentAfterDislysis.Ktv = lastAssessmentAfterDislysis.Ktv
-		tempassessmentAfterDislysis.Urr = lastAssessmentAfterDislysis.Urr
+		tempassessmentAfterDislysis.Ktv = lastAssessmentAfterDislysisTwo.Ktv
+		tempassessmentAfterDislysis.Urr = lastAssessmentAfterDislysisTwo.Urr
 		if tempassessmentAfterDislysis.PatientId == 18695 {
 			tempassessmentAfterDislysis.ActualDisplacement = 0
 		}
@@ -3497,7 +3504,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 || adminUserInfo.Org.Id == 10679 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 
@@ -3539,6 +3546,16 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.PulseFrequency = befor.PulseFrequency
 			record.BreathingRate = befor.BreathingRate
 		}
+
+		//针对乐山友谊医院的需求
+		if adminUserInfo.Org.Id == 10677 {
+			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+			record.SystolicBloodPressure = befor.SystolicBloodPressure
+			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
+			record.Temperature = befor.Temperature
+			record.PulseFrequency = befor.PulseFrequency
+			record.BreathingRate = befor.BreathingRate
+		}
 		//新化博翔
 		if adminUserInfo.Org.Id == 10447 {
 			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
@@ -4485,7 +4502,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10610 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10610 || adminInfo.Org.Id == 10537 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4553,7 +4570,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 || adminInfo.Org.Id == 10537 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -558,140 +558,148 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 	drugOutConfig, _ := service.FindDrugOutConfigById(org_id)
 	//退库
 	if drugOutConfig.IsOpen == 1 {
-		hisAdvice, _ := service.GetHisDoctorAdviceListTwentyOne(schedule.PatientId, schedule.ScheduleDate, org_id)
-		for _, item := range hisAdvice {
-			creater := this.GetMobileAdminUserInfo().AdminUser.Id
-			err := service.DrugAutoAddCancelInfo(item, creater)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
-			}
+		hisAdvice, _ := service.GetPatientDrugCountToday(schedule.PatientId, schedule.ScheduleDate, org_id)
+		if len(hisAdvice) > 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorAdivceCode)
+			return
 		}
-		//查询是否有出库记录
-		service.GetPatientGoodStockCount(schedule.PatientId, schedule.ScheduleDate, org_id)
+		//for _, item := range hisAdvice {
+		//	creater := this.GetMobileAdminUserInfo().AdminUser.Id
+		//	err := service.DrugAutoAddCancelInfo(item, creater)
+		//	if err != nil {
+		//		err = fmt.Errorf("!:%v", err)
+		//		return
+		//	}
+		//}
+		////查询是否有出库记录
+		//service.GetPatientGoodStockCount(schedule.PatientId, schedule.ScheduleDate, org_id)
 	}
 
 	//查询该患者当天是否开耗材
 	list, _ := service.GetPatientGoodCountToday(schedule.PatientId, schedule.ScheduleDate, org_id)
 	if len(list) > 0 {
 
-		operation_time := time.Now().Unix()
-		creater := this.GetMobileAdminUserInfo().AdminUser.Id
-		//创建退库单
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		total, _ := service.FindAllCancelStockTotal(org_id)
-		total = total + 1
-		orderNumber := "CKTKD" + strconv.FormatInt(org_id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-		houseConfig, _ := service.GetAllStoreHouseConfig(org_id)
-		cancelStock := models.CancelStock{
-			OrderNumber:  orderNumber,
-			OperaTime:    operation_time,
-			OrgId:        org_id,
-			Creater:      creater,
-			Ctime:        time.Now().Unix(),
-			Status:       1,
-			ReturnTime:   schedule.ScheduleDate,
-			Type:         1,
-			StorehouseId: houseConfig.StorehouseOutInfo,
-			IsCheck:      1,
-		}
-		_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(schedule.ScheduleDate, org_id)
-		if msgerrkonde == gorm.ErrRecordNotFound {
-			service.AddSigleCancelStock(&cancelStock)
-		}
-		cancel, _ := service.GetLastCancelStockById(org_id)
-		//进行退库操作
-		for _, item := range list {
-			good, _ := service.FindGoodInfoByIdTwo(item.GoodId)
-			manufacturer, _ := service.GetManufactureById(item.Manufacturer)
-			deaerler, _ := service.GetDealerById(item.Dealer)
-			//回退库存
-			service.UpDateWarehouseInfoByStockDelete(item.WarehouseInfotId, item.Count, item.PatientId, item.SysRecordTime, item.GoodId)
-			goodList, _ := service.GetSumGoodList(org_id, houseConfig.StorehouseOutInfo, item.GoodId)
-			var flush_count int64
-			for _, it := range goodList {
-				flush_count += it.StockCount
-			}
-			cancelStockInfo := models.CancelStockInfo{
-				GoodId:          item.GoodId,
-				CancelStockId:   cancel.ID,
-				GoodTypeId:      good.GoodTypeId,
-				Count:           item.Count,
-				Price:           item.Price,
-				Total:           0,
-				ProductDate:     item.ProductDate,
-				ExpiryDate:      item.ExpiryDate,
-				Ctime:           time.Now().Unix(),
-				Status:          1,
-				OrgId:           org_id,
-				OrderNumber:     cancel.OrderNumber,
-				Type:            0,
-				Dealer:          deaerler.DealerName,
-				Manufacturer:    manufacturer.ManufacturerName,
-				Number:          item.Number,
-				RegisterAccount: "",
-				Remark:          "",
-				WarehouseInfoId: item.WarehouseInfotId,
-				PatientId:       item.PatientId,
-				RecordDate:      item.SysRecordTime,
-				StorehouseId:    houseConfig.StorehouseOutInfo,
-				IsCheck:         1,
-			}
-
-			service.CreateCancelStockInfoOne(&cancelStockInfo)
-
-			cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
-
-			flow := models.VmStockFlow{
-				WarehousingId:           item.WarehouseInfotId,
-				GoodId:                  item.GoodId,
-				Number:                  item.Number,
-				LicenseNumber:           item.LicenseNumber,
-				Count:                   item.Count,
-				UserOrgId:               org_id,
-				PatientId:               item.PatientId,
-				SystemTime:              item.SysRecordTime,
-				ConsumableType:          7,
-				IsSys:                   0,
-				WarehousingOrder:        "",
-				WarehouseOutId:          item.WarehouseOutId,
-				WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
-				IsEdit:                  0,
-				CancelStockId:           cancel.ID,
-				CancelOrderNumber:       cancel.OrderNumber,
-				Manufacturer:            manufacturer.ID,
-				Dealer:                  0,
-				Creator:                 org_id,
-				UpdateCreator:           0,
-				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Mtime:                   0,
-				Price:                   item.Price,
-				WarehousingDetailId:     item.WarehouseInfotId,
-				WarehouseOutDetailId:    item.ID,
-				CancelOutDetailId:       cancelInfo.ID,
-				ProductDate:             item.ProductDate,
-				ExpireDate:              item.ExpiryDate,
-				StorehouseId:            houseConfig.StorehouseOutInfo,
-				OverCount:               flush_count,
-			}
-			service.CreateStockFlowOne(flow)
-
-			//退库数量增加
-			service.UpdateSumAddCancelCount(org_id, item.GoodId, houseConfig.StorehouseOutInfo, item.Count)
-			//出库数量减少
-			service.UpdateSumCount(org_id, houseConfig.StorehouseOutInfo, item.GoodId, item.Count)
-
-			//更新库存
-			service.UpdateSumGood(org_id, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorAdivceCode)
+		return
 
-			//更新基础库库存
-			service.UpdateGoodInfoSumCountSix(item.GoodId, flush_count, org_id)
-		}
+		//operation_time := time.Now().Unix()
+		//creater := this.GetMobileAdminUserInfo().AdminUser.Id
+		////创建退库单
+		//timeStr := time.Now().Format("2006-01-02")
+		//timeArr := strings.Split(timeStr, "-")
+		//total, _ := service.FindAllCancelStockTotal(org_id)
+		//total = total + 1
+		//orderNumber := "CKTKD" + strconv.FormatInt(org_id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+		//houseConfig, _ := service.GetAllStoreHouseConfig(org_id)
+		//cancelStock := models.CancelStock{
+		//	OrderNumber:  orderNumber,
+		//	OperaTime:    operation_time,
+		//	OrgId:        org_id,
+		//	Creater:      creater,
+		//	Ctime:        time.Now().Unix(),
+		//	Status:       1,
+		//	ReturnTime:   schedule.ScheduleDate,
+		//	Type:         1,
+		//	StorehouseId: houseConfig.StorehouseOutInfo,
+		//	IsCheck:      1,
+		//}
+		//_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(schedule.ScheduleDate, org_id)
+		//if msgerrkonde == gorm.ErrRecordNotFound {
+		//	service.AddSigleCancelStock(&cancelStock)
+		//}
+		//cancel, _ := service.GetLastCancelStockById(org_id)
+		////进行退库操作
+		//for _, item := range list {
+		//	good, _ := service.FindGoodInfoByIdTwo(item.GoodId)
+		//	manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+		//	deaerler, _ := service.GetDealerById(item.Dealer)
+		//	//回退库存
+		//	service.UpDateWarehouseInfoByStockDelete(item.WarehouseInfotId, item.Count, item.PatientId, item.SysRecordTime, item.GoodId)
+		//	goodList, _ := service.GetSumGoodList(org_id, houseConfig.StorehouseOutInfo, item.GoodId)
+		//	var flush_count int64
+		//	for _, it := range goodList {
+		//		flush_count += it.StockCount
+		//	}
+		//	cancelStockInfo := models.CancelStockInfo{
+		//		GoodId:          item.GoodId,
+		//		CancelStockId:   cancel.ID,
+		//		GoodTypeId:      good.GoodTypeId,
+		//		Count:           item.Count,
+		//		Price:           item.Price,
+		//		Total:           0,
+		//		ProductDate:     item.ProductDate,
+		//		ExpiryDate:      item.ExpiryDate,
+		//		Ctime:           time.Now().Unix(),
+		//		Status:          1,
+		//		OrgId:           org_id,
+		//		OrderNumber:     cancel.OrderNumber,
+		//		Type:            0,
+		//		Dealer:          deaerler.DealerName,
+		//		Manufacturer:    manufacturer.ManufacturerName,
+		//		Number:          item.Number,
+		//		RegisterAccount: "",
+		//		Remark:          "",
+		//		WarehouseInfoId: item.WarehouseInfotId,
+		//		PatientId:       item.PatientId,
+		//		RecordDate:      item.SysRecordTime,
+		//		StorehouseId:    houseConfig.StorehouseOutInfo,
+		//		IsCheck:         1,
+		//	}
+		//
+		//	service.CreateCancelStockInfoOne(&cancelStockInfo)
+		//
+		//	cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
+		//
+		//	flow := models.VmStockFlow{
+		//		WarehousingId:           item.WarehouseInfotId,
+		//		GoodId:                  item.GoodId,
+		//		Number:                  item.Number,
+		//		LicenseNumber:           item.LicenseNumber,
+		//		Count:                   item.Count,
+		//		UserOrgId:               org_id,
+		//		PatientId:               item.PatientId,
+		//		SystemTime:              item.SysRecordTime,
+		//		ConsumableType:          7,
+		//		IsSys:                   0,
+		//		WarehousingOrder:        "",
+		//		WarehouseOutId:          item.WarehouseOutId,
+		//		WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
+		//		IsEdit:                  0,
+		//		CancelStockId:           cancel.ID,
+		//		CancelOrderNumber:       cancel.OrderNumber,
+		//		Manufacturer:            manufacturer.ID,
+		//		Dealer:                  0,
+		//		Creator:                 org_id,
+		//		UpdateCreator:           0,
+		//		Status:                  1,
+		//		Ctime:                   time.Now().Unix(),
+		//		Mtime:                   0,
+		//		Price:                   item.Price,
+		//		WarehousingDetailId:     item.WarehouseInfotId,
+		//		WarehouseOutDetailId:    item.ID,
+		//		CancelOutDetailId:       cancelInfo.ID,
+		//		ProductDate:             item.ProductDate,
+		//		ExpireDate:              item.ExpiryDate,
+		//		StorehouseId:            houseConfig.StorehouseOutInfo,
+		//		OverCount:               flush_count,
+		//	}
+		//	service.CreateStockFlowOne(flow)
+		//
+		//	//退库数量增加
+		//	service.UpdateSumAddCancelCount(org_id, item.GoodId, houseConfig.StorehouseOutInfo, item.Count)
+		//	//出库数量减少
+		//	service.UpdateSumCount(org_id, houseConfig.StorehouseOutInfo, item.GoodId, item.Count)
+		//
+		//	//更新库存
+		//	service.UpdateSumGood(org_id, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+		//
+		//	//更新基础库库存
+		//	service.UpdateGoodInfoSumCountSix(item.GoodId, flush_count, org_id)
+		//}
 	}
 
 	err := service.DeleteSchedule(id)
+
 	if err == nil {
 
 		//记录日志

controllers/pharmacy_controller.go

@@ -34,6 +34,12 @@ func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/getcurrentname", &PharmacyController{}, "get:GetCurrentName")               //获取当前登录账号的名字(
 	beego.Router("/api/pharmacy/getpartitionlist", &PharmacyController{}, "get:GetPartitionList")           //获取当前机构的分区列表
 	beego.Router("/api/pharmacy/routeofadministration", &PharmacyController{}, "get:RouteOfAdministration") //获取当前机构的给药途径
+
+	beego.Router("/api/pharmacy/getgoodinventorylist", &PharmacyController{}, "Get:GetGoodInventoryList")
+	beego.Router("/api/pharmacy/getgoodinventorybygoodid", &PharmacyController{}, "Get:GetGoodInventoryByGoodId")
+	beego.Router("/api/pharmacy/updateInventoryWarehouseInfo", &PharmacyController{}, "Get:UpdateInventoryWarehouseInfo")
+
+	beego.Router("/api/pharmacy/getdruginventoryList", &PharmacyController{}, "Get:GetDrugInventoryList")
 }
 
 // 测试
@@ -839,3 +845,247 @@ func (this *PharmacyController) RouteOfAdministration() {
 	})
 	return
 }
+
+func (this *PharmacyController) GetGoodInventoryList() {
+
+	keyword := this.GetString("keywords")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetGoodInventoryList(keyword, orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+	})
+	return
+}
+
+func (this *PharmacyController) GetGoodInventoryByGoodId() {
+
+	id, _ := this.GetInt64("id")
+
+	infoList, _ := service.GetGoodInventoryByGoodId(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"infoList": infoList,
+	})
+}
+
+func (this *PharmacyController) UpdateInventoryWarehouseInfo() {
+
+	id, _ := this.GetInt64("id")
+
+	stock_count, _ := this.GetInt64("stock_count")
+
+	last_stock_count, _ := this.GetInt64("last_stock_count")
+
+	good_id, _ := this.GetInt64("good_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	is_type, _ := this.GetInt64("is_type")
+
+	warehouseInfo, _ := service.GetInventoryWarehouseInfo(id)
+	goodInfo, _ := service.GetGoodInformationByGoodIdThirty(good_id)
+
+	manufacturer, _ := service.GetManufactureById(warehouseInfo.Manufacturer)
+
+	//更新库存
+	service.UpdateWarehouseInfoById(last_stock_count, id)
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	goodListOne, _ := service.GetSumGoodList(orgId, storehouse_id, good_id)
+	var flush_count int64
+	for _, it := range goodListOne {
+		flush_count += it.StockCount
+	}
+	//盘盈
+	if last_stock_count > stock_count {
+		var total_count int64
+		total_count = last_stock_count - stock_count
+		creater := this.GetAdminUserInfo().AdminUser.Id
+		inventory := models.XtStockInventory{
+			GoodName:          goodInfo.GoodName,
+			SpecificationName: goodInfo.SpecificationName,
+			WarehousingUnit:   goodInfo.PackingUnit,
+			Count:             total_count,
+			BuyPrice:          goodInfo.BuyPrice,
+			PackingPrice:      goodInfo.PackingPrice,
+			NewPrice:          0,
+			Manufacturer:      manufacturer.ManufacturerName,
+			Dealer:            "",
+			Remark:            "",
+			GoodId:            good_id,
+			UserOrgId:         orgId,
+			Ctime:             time.Now().Unix(),
+			Mtime:             0,
+			Status:            1,
+			WarehousingOrder:  warehouseInfo.WarehousingOrder,
+			LicenseNumber:     warehouseInfo.LicenseNumber,
+			StartTime:         time.Now().Unix(),
+			Creater:           creater,
+			Checker:           0,
+			CheckerStatus:     0,
+			CheckerTime:       0,
+			Total:             0,
+			Number:            warehouseInfo.Number,
+			WarehousingInfoId: id,
+			ExpireDate:        warehouseInfo.ExpiryDate,
+			ProductDate:       warehouseInfo.ProductDate,
+			GoodOriginPlace:   "",
+			Type:              10,
+			InventoryType:     is_type,
+			LastStockCount:    last_stock_count,
+			StockCount:        stock_count,
+			StorehouseId:      storehouse_id,
+			RecordDate:        recordDate.Unix(),
+		}
+		service.CreateInentory(inventory)
+
+		stockFlow := models.VmStockFlow{
+			WarehousingId:           0,
+			GoodId:                  good_id,
+			Number:                  warehouseInfo.Number,
+			LicenseNumber:           "",
+			Count:                   total_count,
+			UserOrgId:               orgId,
+			PatientId:               0,
+			SystemTime:              recordDate.Unix(),
+			ConsumableType:          10,
+			IsSys:                   0,
+			WarehousingOrder:        warehouseInfo.WarehousingOrder,
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            warehouseInfo.Manufacturer,
+			Dealer:                  0,
+			Creator:                 creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   warehouseInfo.Price,
+			WarehousingDetailId:     0,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       0,
+			ProductDate:             warehouseInfo.ProductDate,
+			ExpireDate:              warehouseInfo.ExpiryDate,
+			ReturnCount:             0,
+			StorehouseId:            storehouse_id,
+			OverCount:               flush_count,
+		}
+		service.CreateStockFlowOne(stockFlow)
+
+		service.ReduceSumOutCount(good_id, total_count, storehouse_id, orgId)
+	}
+
+	//盘亏
+	if last_stock_count < stock_count {
+		var total_count int64
+		total_count = stock_count - last_stock_count
+		creater := this.GetAdminUserInfo().AdminUser.Id
+		inventory := models.XtStockInventory{
+			GoodName:          goodInfo.GoodName,
+			SpecificationName: goodInfo.SpecificationName,
+			WarehousingUnit:   goodInfo.PackingUnit,
+			Count:             total_count,
+			BuyPrice:          goodInfo.BuyPrice,
+			PackingPrice:      goodInfo.PackingPrice,
+			NewPrice:          0,
+			Manufacturer:      manufacturer.ManufacturerName,
+			Dealer:            "",
+			Remark:            "",
+			GoodId:            good_id,
+			UserOrgId:         orgId,
+			Ctime:             time.Now().Unix(),
+			Mtime:             0,
+			Status:            1,
+			WarehousingOrder:  warehouseInfo.WarehousingOrder,
+			LicenseNumber:     warehouseInfo.LicenseNumber,
+			StartTime:         time.Now().Unix(),
+			Creater:           creater,
+			Checker:           0,
+			CheckerStatus:     0,
+			CheckerTime:       0,
+			Total:             0,
+			Number:            warehouseInfo.Number,
+			WarehousingInfoId: id,
+			ExpireDate:        warehouseInfo.ExpiryDate,
+			ProductDate:       warehouseInfo.ProductDate,
+			GoodOriginPlace:   "",
+			Type:              10,
+			InventoryType:     is_type,
+			LastStockCount:    last_stock_count,
+			StockCount:        stock_count,
+			StorehouseId:      storehouse_id,
+			RecordDate:        recordDate.Unix(),
+		}
+		service.CreateInentory(inventory)
+
+		stockFlow := models.VmStockFlow{
+			WarehousingId:           0,
+			GoodId:                  good_id,
+			Number:                  warehouseInfo.Number,
+			LicenseNumber:           "",
+			Count:                   total_count,
+			UserOrgId:               orgId,
+			PatientId:               0,
+			SystemTime:              recordDate.Unix(),
+			ConsumableType:          11,
+			IsSys:                   0,
+			WarehousingOrder:        warehouseInfo.WarehousingOrder,
+			WarehouseOutId:          0,
+			WarehouseOutOrderNumber: "",
+			IsEdit:                  0,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            warehouseInfo.Manufacturer,
+			Dealer:                  0,
+			Creator:                 creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   warehouseInfo.Price,
+			WarehousingDetailId:     0,
+			WarehouseOutDetailId:    0,
+			CancelOutDetailId:       0,
+			ProductDate:             warehouseInfo.ProductDate,
+			ExpireDate:              warehouseInfo.ExpiryDate,
+			ReturnCount:             0,
+			StorehouseId:            storehouse_id,
+			OverCount:               flush_count,
+		}
+		service.CreateStockFlowOne(stockFlow)
+		service.ReduceSumInCount(good_id, total_count, storehouse_id, orgId)
+	}
+
+	//查询已审核单据的剩余库存
+	goodList, _ := service.GetGoodSumCountByStoreId(storehouse_id, good_id, orgId)
+	var sum_count int64
+	var sum_in_count int64
+	for _, item := range goodList {
+		sum_count += item.StockCount
+		sum_in_count += item.WarehousingCount
+	}
+	service.UpdateGoodByGoodId(good_id, sum_count, sum_in_count, orgId)
+
+	service.UpdateSumGood(orgId, storehouse_id, good_id, flush_count)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "msg",
+	})
+
+}
+
+func (this *PharmacyController) GetDrugInventoryList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	drugList, _ := service.GetDrugNewInventoryList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugList": drugList,
+	})
+}

controllers/schedule_api_controller.go

@@ -258,6 +258,27 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 		return
 	}
 
+	//drugOutConfig, _ := service.FindDrugOutConfigById(adminInfo.CurrentOrgId)
+	//
+	//recordDateStr := time.Now().Format("2006-01-02")
+	//
+	//recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	//退库
+	//if drugOutConfig.IsOpen == 1 {
+	//	hisAdvice, _ := service.GetPatientDrugCountToday(patient_id, recordDate.Unix(), adminInfo.CurrentOrgId)
+	//
+	//	if len(hisAdvice) > 0 {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorAdivceCode)
+	//		return
+	//	}
+	//}
+
+	//list, _ := service.GetPatientGoodCountToday(patient_id, recordDate.Unix(), adminInfo.CurrentOrgId)
+	//if len(list) > 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorAdivceCode)
+	//	return
+	//}
+
 	//数据校验
 	if dataBody["smart_schs"] != nil && reflect.TypeOf(dataBody["smart_schs"]).String() == "[]interface {}" {
 		schs, _ := dataBody["smart_schs"].([]interface{})
@@ -466,6 +487,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					//一天只有排班一次
 					daySchedule, err := service.GetDaySchedule(adminInfo.CurrentOrgId, startTime, endTime, schedule.PatientId)
+
 					if daySchedule.ID > 0 && daySchedule.ID != schedule.ID {
 						week_type, _ := items["week_type"].(string)
 						week_name, _ := items["week_name"].(string)
@@ -2028,137 +2050,145 @@ func (c *ScheduleApiController) DeleteSchedule() {
 	drugOutConfig, _ := service.FindDrugOutConfigById(adminINfo.CurrentOrgId)
 	//退库
 	if drugOutConfig.IsOpen == 1 {
-		hisAdvice, _ := service.GetHisDoctorAdviceListTwentyOne(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
-		for _, item := range hisAdvice {
-			creater := adminINfo.AdminUser.Id
-			err = service.DrugAutoAddCancelInfo(item, creater)
-			if err != nil {
-				err = fmt.Errorf("!:%v", err)
-				return
-			}
+		hisAdvice, _ := service.GetPatientDrugCountToday(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+
+		if len(hisAdvice) > 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorAdivceCode)
+			return
 		}
-		//查询是否有出库记录
-		service.GetPatientGoodStockCount(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		//for _, item := range hisAdvice {
+		//	creater := adminINfo.AdminUser.Id
+		//	err = service.DrugAutoAddCancelInfo(item, creater)
+		//	if err != nil {
+		//		err = fmt.Errorf("!:%v", err)
+		//		return
+		//	}
+		//}
+		////查询是否有出库记录
+		//service.GetPatientGoodStockCount(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 	}
 
 	//查询该患者当天是否开耗材
 	list, _ := service.GetPatientGoodCountToday(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 	if len(list) > 0 {
 
-		operation_time := time.Now().Unix()
-		creater := c.GetAdminUserInfo().AdminUser.Id
-		//创建退库单
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		total, _ := service.FindAllCancelStockTotal(c.GetAdminUserInfo().CurrentOrgId)
-		total = total + 1
-		orderNumber := "CKTKD" + strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-		houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
-		cancelStock := models.CancelStock{
-			OrderNumber:  orderNumber,
-			OperaTime:    operation_time,
-			OrgId:        c.GetAdminUserInfo().CurrentOrgId,
-			Creater:      creater,
-			Ctime:        time.Now().Unix(),
-			Status:       1,
-			ReturnTime:   schedule.ScheduleDate,
-			Type:         1,
-			StorehouseId: houseConfig.StorehouseOutInfo,
-			IsCheck:      1,
-		}
-		_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(schedule.ScheduleDate, c.GetAdminUserInfo().CurrentOrgId)
-		if msgerrkonde == gorm.ErrRecordNotFound {
-			service.AddSigleCancelStock(&cancelStock)
-		}
-		cancel, _ := service.GetLastCancelStockById(c.GetAdminUserInfo().CurrentOrgId)
-		//进行退库操作
-		for _, item := range list {
-			good, _ := service.FindGoodInfoByIdTwo(item.GoodId)
-			manufacturer, _ := service.GetManufactureById(item.Manufacturer)
-			deaerler, _ := service.GetDealerById(item.Dealer)
-			//回退库存
-			service.UpDateWarehouseInfoByStockDelete(item.WarehouseInfotId, item.Count, item.PatientId, item.SysRecordTime, item.GoodId)
-			goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.GoodId)
-			var flush_count int64
-			for _, it := range goodList {
-				flush_count += it.StockCount
-			}
-			cancelStockInfo := models.CancelStockInfo{
-				GoodId:          item.GoodId,
-				CancelStockId:   cancel.ID,
-				GoodTypeId:      good.GoodTypeId,
-				Count:           item.Count,
-				Price:           item.Price,
-				Total:           0,
-				ProductDate:     item.ProductDate,
-				ExpiryDate:      item.ExpiryDate,
-				Ctime:           time.Now().Unix(),
-				Status:          1,
-				OrgId:           c.GetAdminUserInfo().CurrentOrgId,
-				OrderNumber:     cancel.OrderNumber,
-				Type:            0,
-				Dealer:          deaerler.DealerName,
-				Manufacturer:    manufacturer.ManufacturerName,
-				Number:          item.Number,
-				RegisterAccount: "",
-				Remark:          "",
-				WarehouseInfoId: item.WarehouseInfotId,
-				PatientId:       item.PatientId,
-				RecordDate:      item.SysRecordTime,
-				StorehouseId:    houseConfig.StorehouseOutInfo,
-				IsCheck:         1,
-			}
-
-			service.CreateCancelStockInfoOne(&cancelStockInfo)
-
-			cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
-
-			flow := models.VmStockFlow{
-				WarehousingId:           item.WarehouseInfotId,
-				GoodId:                  item.GoodId,
-				Number:                  item.Number,
-				LicenseNumber:           item.LicenseNumber,
-				Count:                   item.Count,
-				UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-				PatientId:               item.PatientId,
-				SystemTime:              item.SysRecordTime,
-				ConsumableType:          7,
-				IsSys:                   0,
-				WarehousingOrder:        "",
-				WarehouseOutId:          item.WarehouseOutId,
-				WarehouseOutOrderNumber: item.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:                   item.Price,
-				WarehousingDetailId:     item.WarehouseInfotId,
-				WarehouseOutDetailId:    item.ID,
-				CancelOutDetailId:       cancelInfo.ID,
-				ProductDate:             item.ProductDate,
-				ExpireDate:              item.ExpiryDate,
-				StorehouseId:            houseConfig.StorehouseOutInfo,
-				OverCount:               flush_count,
-			}
-			service.CreateStockFlowOne(flow)
-
-			//退库数量增加
-			service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.GoodId, houseConfig.StorehouseOutInfo, item.Count)
-			//出库数量减少
-			service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.GoodId, item.Count)
-
-			//更新库存
-			service.UpdateSumGood(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorAdivceCode)
+		return
 
-			//更新基础库库存
-			service.UpdateGoodInfoSumCountSix(item.GoodId, flush_count, c.GetAdminUserInfo().CurrentOrgId)
-		}
+		//operation_time := time.Now().Unix()
+		//creater := c.GetAdminUserInfo().AdminUser.Id
+		////创建退库单
+		//timeStr := time.Now().Format("2006-01-02")
+		//timeArr := strings.Split(timeStr, "-")
+		//total, _ := service.FindAllCancelStockTotal(c.GetAdminUserInfo().CurrentOrgId)
+		//total = total + 1
+		//orderNumber := "CKTKD" + strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+		//houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
+		//cancelStock := models.CancelStock{
+		//	OrderNumber:  orderNumber,
+		//	OperaTime:    operation_time,
+		//	OrgId:        c.GetAdminUserInfo().CurrentOrgId,
+		//	Creater:      creater,
+		//	Ctime:        time.Now().Unix(),
+		//	Status:       1,
+		//	ReturnTime:   schedule.ScheduleDate,
+		//	Type:         1,
+		//	StorehouseId: houseConfig.StorehouseOutInfo,
+		//	IsCheck:      1,
+		//}
+		//_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(schedule.ScheduleDate, c.GetAdminUserInfo().CurrentOrgId)
+		//if msgerrkonde == gorm.ErrRecordNotFound {
+		//	service.AddSigleCancelStock(&cancelStock)
+		//}
+		//cancel, _ := service.GetLastCancelStockById(c.GetAdminUserInfo().CurrentOrgId)
+		////进行退库操作
+		//for _, item := range list {
+		//	good, _ := service.FindGoodInfoByIdTwo(item.GoodId)
+		//	manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+		//	deaerler, _ := service.GetDealerById(item.Dealer)
+		//	//回退库存
+		//	service.UpDateWarehouseInfoByStockDelete(item.WarehouseInfotId, item.Count, item.PatientId, item.SysRecordTime, item.GoodId)
+		//	goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.GoodId)
+		//	var flush_count int64
+		//	for _, it := range goodList {
+		//		flush_count += it.StockCount
+		//	}
+		//	cancelStockInfo := models.CancelStockInfo{
+		//		GoodId:          item.GoodId,
+		//		CancelStockId:   cancel.ID,
+		//		GoodTypeId:      good.GoodTypeId,
+		//		Count:           item.Count,
+		//		Price:           item.Price,
+		//		Total:           0,
+		//		ProductDate:     item.ProductDate,
+		//		ExpiryDate:      item.ExpiryDate,
+		//		Ctime:           time.Now().Unix(),
+		//		Status:          1,
+		//		OrgId:           c.GetAdminUserInfo().CurrentOrgId,
+		//		OrderNumber:     cancel.OrderNumber,
+		//		Type:            0,
+		//		Dealer:          deaerler.DealerName,
+		//		Manufacturer:    manufacturer.ManufacturerName,
+		//		Number:          item.Number,
+		//		RegisterAccount: "",
+		//		Remark:          "",
+		//		WarehouseInfoId: item.WarehouseInfotId,
+		//		PatientId:       item.PatientId,
+		//		RecordDate:      item.SysRecordTime,
+		//		StorehouseId:    houseConfig.StorehouseOutInfo,
+		//		IsCheck:         1,
+		//	}
+		//
+		//	service.CreateCancelStockInfoOne(&cancelStockInfo)
+		//
+		//	cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
+		//
+		//	flow := models.VmStockFlow{
+		//		WarehousingId:           item.WarehouseInfotId,
+		//		GoodId:                  item.GoodId,
+		//		Number:                  item.Number,
+		//		LicenseNumber:           item.LicenseNumber,
+		//		Count:                   item.Count,
+		//		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+		//		PatientId:               item.PatientId,
+		//		SystemTime:              item.SysRecordTime,
+		//		ConsumableType:          7,
+		//		IsSys:                   0,
+		//		WarehousingOrder:        "",
+		//		WarehouseOutId:          item.WarehouseOutId,
+		//		WarehouseOutOrderNumber: item.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:                   item.Price,
+		//		WarehousingDetailId:     item.WarehouseInfotId,
+		//		WarehouseOutDetailId:    item.ID,
+		//		CancelOutDetailId:       cancelInfo.ID,
+		//		ProductDate:             item.ProductDate,
+		//		ExpireDate:              item.ExpiryDate,
+		//		StorehouseId:            houseConfig.StorehouseOutInfo,
+		//		OverCount:               flush_count,
+		//	}
+		//	service.CreateStockFlowOne(flow)
+		//
+		//	//退库数量增加
+		//	service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.GoodId, houseConfig.StorehouseOutInfo, item.Count)
+		//	//出库数量减少
+		//	service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.GoodId, item.Count)
+		//
+		//	//更新库存
+		//	service.UpdateSumGood(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+		//
+		//	//更新基础库库存
+		//	service.UpdateGoodInfoSumCountSix(item.GoodId, flush_count, c.GetAdminUserInfo().CurrentOrgId)
+		//}
 	}
 
 	err = service.UpdateSchedule(schedule)

controllers/sign_api_controller.go

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

enums/error_code.go

@@ -281,6 +281,8 @@ const ( // ErrorCode
 	ErrorCodeInformationExist = 600000008
 
 	ErrorScheduleCode = 600000009
+
+	ErrorAdivceCode = 600000010
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -542,6 +544,7 @@ var ErrCodeMsgs = map[int]string{
 	AdviceCodeParamWrong:                  "医嘱核对人和执行人不能为同一人,请更换第二核对人!",
 	ErrorCodeInformationExist:             "已经超过归档天数,不予编辑,请提交申请",
 	ErrorScheduleCode:                     "未更改排班,保存失败!",
+	ErrorAdivceCode:                       "该患者已开药,请先删除药品或耗材",
 }
 
 type SGJError struct {

models/device_models.go

@@ -137,14 +137,15 @@ func (DeviceZonePb) TableName() string {
 }
 
 type DialysisSolutionPb struct {
-	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"`
-	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
-	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
-	ModeName                   string `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
-	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Anticoagulant              int64  `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	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"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
+	ModeName                   string  `gorm:"column:mode_name" json:"mode_name" form:"mode_name"`
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	Calcium                    float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
 }
 
 func (DialysisSolutionPb) TableName() string {
@@ -204,6 +205,7 @@ type BloodDialysisPrescriptionPb struct {
 	AnticoagulantGaijiliang   string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
 	DialysisDialyszers        string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation        string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	Calcium                   float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
 }
 
 func (BloodDialysisPrescriptionPb) TableName() string {

models/dialysis.go

@@ -1488,6 +1488,50 @@ func (HisDoctorAdviceFourty) TableName() string {
 	return "his_doctor_advice_info"
 }
 
+type HisPrescriptionProjectFourty struct {
+	ID                   int64         `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64         `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price                float64       `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId            int64         `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	PatientId            int64         `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId         int64         `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate           int64         `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId       int64         `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count                string        `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn            string        `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg          string        `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose           string        `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay          string        `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency   string        `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                  string        `gorm:"column:day" json:"day" form:"day"`
+	Remark               string        `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string        `gorm:"column:unit" json:"unit" form:"unit"`
+	Type                 int64         `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64         `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	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"`
+	CheckTime            int64         `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64         `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64         `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime            int64         `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId               int64         `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType        int64         `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64         `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string        `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ExecutionFrequencyId int64         `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsOut                int64         `gorm:"column:is_out" json:"is_out" form:"is_out"`
+	YbSyncStatus         int64         `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
+	Good                 GoodInfoSeven `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"good"`
+}
+
+func (HisPrescriptionProjectFourty) TableName() string {
+	return "his_prescription_project"
+}
+
 type NewDialysisOrder struct {
 	ID                 int64  `gorm:"column:id" json:"id"`
 	DialysisDate       int64  `gorm:"column:dialysis_date" json:"dialysis_date"`

models/drug_stock.go

@@ -460,6 +460,7 @@ type DrugFlow struct {
 	OrderId                   int64                  `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	FlushOverCount            int64                  `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
 	Remark                    string                 `gorm:"column:remark" json:"remark" form:"remark"`
+	OperateTime               int64                  `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
 }
 
 func (DrugFlow) TableName() string {

models/good_models.go

@@ -236,9 +236,10 @@ func (GoodInfoSevenThirty) TableName() string {
 }
 
 type GoodInfoSeven struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	GoodName   string `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	GoodStatus string `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodStatus        string `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 }
 
 func (GoodInfoSeven) TableName() string {
@@ -256,6 +257,20 @@ func (GoodInfoTen) TableName() string {
 	return "xt_good_information"
 }
 
+type GoodInfoEight struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodStatus        string `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+}
+
+func (GoodInfoEight) TableName() string {
+	return "xt_good_information"
+}
+
 type GoodsTypeOne struct {
 	ID             int64                    `gorm:"column:id" json:"id"`
 	TypeCode       string                   `gorm:"column:type_code" json:"type_code"`

models/schedule_models.go

@@ -648,6 +648,29 @@ func (VmBloodScheduleOne) TableName() string {
 	return "xt_schedule"
 }
 
+type VmBloodScheduleSix 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"`
+	HisPrescriptionProject []*HisPrescriptionProjectFourty `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"his_doctor_project"`
+}
+
+func (VmBloodScheduleSix) TableName() string {
+	return "xt_schedule"
+}
+
 type VmNewSchedulesRemind 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"`

models/smart_sch.go

@@ -5,7 +5,7 @@ type SmartSchPatient struct {
 	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Name       string `gorm:"column:name" json:"name" form:"name"`
 	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-
+	Lapseto    int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
 	//SmartSchedule []*SmartSchedule `gorm:"-" json:"sch"`
 }
 

models/stock_models.go

@@ -697,6 +697,7 @@ type VmStockFlow struct {
 	OrderId                   int64           `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	Remark                    string          `gorm:"column:remark" json:"remark" form:"remark"`
 	FlushOverCount            int64           `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
+	OperateTime               int64           `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
 }
 
 func (VmStockFlow) TableName() string {
@@ -1188,6 +1189,7 @@ type XtStockInventory struct {
 	StorehouseId      int64           `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	GoodInfo          GoodInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 	WarehousingInfo   WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingInfoId" json:"xt_warehouse_info"`
+	RecordDate        int64           `gorm:"column:record_date" json:"record_date" form:"record_date"`
 }
 
 func (XtStockInventory) TableName() string {
@@ -1722,3 +1724,44 @@ type WarehouseOutInfoTenty struct {
 func (WarehouseOutInfoTenty) TableName() string {
 	return "xt_warehouse_out_info"
 }
+
+type XtWarehouseInfoEight struct {
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId                    int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId                int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Number                    string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type                      int64   `gorm:"column:type" json:"type" form:"type"`
+	WarehousingUnit           int64   `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	StockCount                int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	LicenseNumber             string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId           int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice              float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   string  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	IsUpload                  int64   `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	ManafacturerName          string  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DealerName                string  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+}
+
+func (XtWarehouseInfoEight) TableName() string {
+	return "xt_warehouse_info"
+}

service/dialysis_solution_service.go

@@ -548,6 +548,33 @@ func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_
 
 }
 
+func GetDialysisProjectSchedulistTen(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleSix, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleSix{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
+	}
+
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1 and record_date = ? and type =3", orgID, scheduleDate).Preload("Good", "org_id =? and status = 1", orgID)
+		}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+
+	return schedule, err
+
+}
+
 func GetHisDialysisGoodCountTwo(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleTwo, err error) {
 
 	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")

service/his_service.go

@@ -3149,6 +3149,21 @@ func GetLastHisDoctorAdviceById(patient_id int64, user_org_id int64, advice_date
 	return adviceInfo, err
 }
 
+func GetLastHisProjectById(patient_id int64, user_org_id int64, record_date int64, drug_id int64, tx *gorm.DB) (models.HisPrescriptionProject, error) {
+
+	projectInfo := models.HisPrescriptionProject{}
+
+	err := tx.Where("patient_id = ? and user_org_id = ? and record_date = ? and project_id = ? and status =1", patient_id, user_org_id, record_date, drug_id).Last(&projectInfo).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return projectInfo, err
+		}
+	}
+	return projectInfo, err
+}
+
 func GetDrugWarehouseOutInfoByAdviceId(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, tx *gorm.DB) (outInfo []*models.DrugWarehouseOutInfo, err error) {
 
 	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and drug_id = ? and status=1 and advice_id = 0", patient_id, user_org_id, sys_record_date, drug_id).Find(&outInfo).Error
@@ -3162,6 +3177,19 @@ func GetDrugWarehouseOutInfoByAdviceId(patient_id int64, user_org_id int64, sys_
 	return outInfo, err
 }
 
+func GetGoodWarehouseOutInfoByAdviceId(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, tx *gorm.DB) (outInfo []*models.WarehouseOutInfo, err error) {
+
+	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and good_id = ? and status=1 and project_id = 0", patient_id, user_org_id, sys_record_date, drug_id).Find(&outInfo).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
 func GetDrugWarehouseOutInfoByAdviceIdTwo(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, advice_id int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
 
 	outInfo := models.DrugWarehouseOutInfo{}
@@ -3201,6 +3229,19 @@ func GetDrugAutoDetail(patient_id int64, org_id int64, record_time int64, drug_i
 	return automaticReduceDetail, err
 }
 
+func GetGoodAutoDetail(patient_id int64, org_id int64, record_time int64, good_id int64, tx *gorm.DB) (automaticReduceDetail []*models.AutomaticReduceDetail, err error) {
+
+	err = tx.Where("patient_id = ? and org_id = ? and record_time =? and good_id = ? and status =1 and project_id = 0", patient_id, org_id, record_time, good_id).Find(&automaticReduceDetail).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return automaticReduceDetail, err
+		}
+	}
+	return automaticReduceDetail, err
+}
+
 func UpdateDrugAutoDetail(id int64, advice_id int64, tx *gorm.DB) error {
 
 	drugAutomaticReduceDetail := models.DrugAutomaticReduceDetail{}
@@ -3214,6 +3255,19 @@ func UpdateDrugAutoDetail(id int64, advice_id int64, tx *gorm.DB) error {
 	return err
 }
 
+func UpdateGoodAutoDetail(id int64, project_id int64, tx *gorm.DB) error {
+
+	automaticReduceDetail := models.AutomaticReduceDetail{}
+
+	err := tx.Model(&automaticReduceDetail).Where("id = ? and status=1", id).Updates(map[string]interface{}{"project_id": project_id}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func UpdateDrugOutInfoByAdviceId(id int64, advice_id int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
 
 	info := models.DrugWarehouseOutInfo{}
@@ -3228,6 +3282,20 @@ func UpdateDrugOutInfoByAdviceId(id int64, advice_id int64, tx *gorm.DB) (models
 	return info, err
 }
 
+func UpdateGoodOutInfoByAdviceId(id int64, project_id int64, tx *gorm.DB) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+
+	err := tx.Model(&info).Where("id = ? and status=1", id).Updates(map[string]interface{}{"project_id": project_id}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return info, err
+	}
+
+	return info, err
+}
+
 func ModifyDrugWarehouseOutInfoByNumber(id int64, cha_count int64, tx *gorm.DB) error {
 
 	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count - ?", cha_count)).Error
@@ -3252,6 +3320,17 @@ func ModifyDrugAuToWarehouseOut(id int64, cha_count int64, tx *gorm.DB) error {
 	return err
 }
 
+func ModifyGoodAuToWarehouseOut(id int64, cha_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.AutomaticReduceDetail{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count - ?", cha_count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
 func DeleteDrugWarehouseOutInfoByNumber(id int64, tx *gorm.DB) error {
 
 	err := tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
@@ -3273,3 +3352,83 @@ func DeleteDrugWarehouseAutoByNumber(id int64, tx *gorm.DB) error {
 	}
 	return err
 }
+
+func DeleteGoodWarehouseAutoByNumberTwo(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.AutomaticReduceDetail{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetHistoryProject(patient_id int64, user_org_id int64, record_date int64, id int64, good_id int64, tx *gorm.DB) (models.HisPrescriptionProject, error) {
+
+	project := models.HisPrescriptionProject{}
+	err := tx.Where("patient_id = ? and user_org_id = ? and record_date = ? and id = ? and project_id = ? and status =1", patient_id, user_org_id, record_date, id, good_id).Find(&project).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return project, err
+		}
+	}
+	return project, err
+}
+
+func GetGoodWarehouseOutInfoByProjectIdTwo(patient_id int64, user_org_id int64, sys_record_date int64, drug_id int64, advice_id int64, tx *gorm.DB) (models.WarehouseOutInfo, error) {
+
+	outInfo := models.WarehouseOutInfo{}
+	err = tx.Where("patient_id = ? and org_id =? and sys_record_time = ? and good_id = ? and status=1 and project_id = ?", patient_id, user_org_id, sys_record_date, drug_id, advice_id).Order("id desc").First(&outInfo).Error
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outInfo, err
+		}
+	}
+	return outInfo, err
+}
+
+func DeleteGoodWarehouseOutInfoByNumber(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.WarehouseOutInfo{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func ModifyGoodWarehouseOutInfoByNumber(id int64, cha_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.WarehouseOutInfo{}).Where("id = ? and status =1", id).UpdateColumn("count", gorm.Expr("count - ?", cha_count)).Error
+
+	err = tx.Model(&models.WarehouseOutInfo{}).Where("id = ? and status =1", id).UpdateColumn("over_count", gorm.Expr("over_count + ?", cha_count)).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetBasedrugById(drug_id int64, user_org_id int64) (models.BaseDrugLib, error) {
+
+	lib := models.BaseDrugLib{}
+
+	err := XTReadDB().Where("id = ? and org_id =? and status=1 AND find_in_set('停用',drug_status) = 1", drug_id, user_org_id).Find(&lib).Error
+
+	return lib, err
+}
+
+func GetBaseGoodById(good_id int64, user_org_id int64) (models.GoodInfo, error) {
+
+	info := models.GoodInfo{}
+
+	err := XTReadDB().Where("id = ? and org_id =? and status=1 AND find_in_set('停用',good_status) = 1", good_id, user_org_id).Find(&info).Error
+
+	return info, err
+}

service/manage_center_service.go

@@ -654,6 +654,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				AdviceId:                info.AdviceId,
 				StorehouseId:            storeHouseConfig.DrugStorehouseOut,
 				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
 			}
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)
@@ -775,6 +776,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				AdviceId:                info.AdviceId,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
 				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
 			}
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)
@@ -885,6 +887,7 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				AdviceId:                info.AdviceId,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
 				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
 			}
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)
@@ -1015,6 +1018,7 @@ func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater i
 				ExpireDate:              item.ExpiryDate,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
 				OverCount:               over_count,
+				OperateTime:             time.Now().Unix(),
 			}
 			CreateStockFlowOne(flow)
 

service/mobile_dialysis_service.go

@@ -1043,7 +1043,7 @@ func MobileGetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64)
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(beforeDate, 10) + ":monitor_record_last"
 	monitor_record_last_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(monitor_record_last_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
 		if err != nil {
@@ -1191,6 +1191,20 @@ func MobileGetLastTimeAssessmentAfterDislysisOne(orgID int64, patientID int64, m
 
 }
 
+func MobileGetLastTimeAssessmentAfterDislysisTwo(orgID int64, patientID int64, maxDate int64) (*models.AssessmentAfterDislysis, error) {
+	var record models.AssessmentAfterDislysis
+	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+
+}
+
 func MobileGetLast(orgID int64, patientID int64, maxDate int64) (models.AssessmentAfterDislysis, error) {
 	dislysis := models.AssessmentAfterDislysis{}
 	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&dislysis).Error
@@ -2252,6 +2266,12 @@ func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	return err
 }
 
+func UpdateScheduleByBedId(patient_id int64, schedule_date int64, bed_id int64, schedule_type int64, zone_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("patient_id = ? and schedule_date = ? and status=1", patient_id, schedule_date).Updates(map[string]interface{}{"bed_id": bed_id, "schedule_type": schedule_type, "partition_id": zone_id}).Error
+	return err
+}
+
 func ModifyFinishDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
@@ -8167,6 +8187,20 @@ func GetFirstMonitor(patient_id int64, monit_date int64) (models.MonitoringRecor
 	return record, err
 }
 
+func GetFirstMonitorOne(patient_id int64, monit_date int64, org_id int64) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	err := XTReadDB().Where("patient_id = ? and monitoring_date = ? and status=1 and user_org_id=?", patient_id, monit_date, org_id).First(&record).Error
+	return record, err
+}
+
+func GetLastMonitor(patient_id int64, monit_date int64, org_id int64) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	err := XTReadDB().Where("patient_id = ? and monitoring_date = ? and status=1 and user_org_id = ?", patient_id, monit_date, org_id).Last(&record).Error
+	return record, err
+}
+
 func UpdateFirstMonitor(id int64, catheter_operation string) (models.MonitoringRecord, error) {
 
 	record := models.MonitoringRecord{}

service/new_stock_service.go

@@ -139,6 +139,34 @@ func UpdateSumGood(orgid int64, storehouse_id int64, good_id int64, flush_count
 	return err
 }
 
+func ReduceSumOutCount(good_id int64, total_count int64, storehouse_id int64, user_org_id int64) error {
+	ut := XTWriteDB().Begin()
+
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count - ?", total_count)).Error
+
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count - ?", total_count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func ReduceSumInCount(good_id int64, total_count int64, storehouse_id int64, user_org_id int64) error {
+	ut := XTWriteDB().Begin()
+
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", total_count)).Error
+
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count + ?", total_count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
 func UpdateSumCount(user_org_id int64, storehouse_id int64, good_id int64, count int64) error {
 	ut := XTWriteDB().Begin()
 
@@ -595,3 +623,20 @@ func UpdateWarehosueOutInfo(id int64, sys_record_time int64) (models.WarehouseOu
 
 	return info, err
 }
+
+func AddGoodNewCancelSumCountOne(storehouse_id int64, good_id int64, user_org_id int64, cancel_count int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and storehouse_id  = ? and good_id = ? and status = 1", user_org_id, storehouse_id, good_id).UpdateColumn("stock_cancel_count", gorm.Expr("stock_cancel_count + ?", cancel_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetDrugNewInventoryList(org_id int64) (drug []*models.BaseDrugLibTwentyOne, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status =1", org_id).Find(&drug).Error
+
+	return drug, err
+}

service/new_warehouse_service.go

@@ -161,6 +161,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				OverCount:               sum_count,
 				BuyPrice:                warehouse.Price,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
@@ -276,6 +277,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
@@ -421,6 +423,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				OverCount:               sum_count,
 				BuyPrice:                warehouse.Price,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
@@ -532,6 +535,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.GoodId)
@@ -940,6 +944,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				OverCount:               sum_count,
 				AdviceId:                advice.ID,
 				LastPrice:               warehouse.Price,
+				OperateTime:             time.Now().Unix(),
 			}
 
 			CreateDrugFlowOne(drugflow)
@@ -1044,6 +1049,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				AdviceId:                advice.ID,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
 				LastPrice:               warehouse.Price,
+				OperateTime:             time.Now().Unix(),
 			}
 			CreateDrugFlowOne(flow)
 			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
@@ -1238,6 +1244,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				WarehouseOutDetailId:    lastDrugOutInfo.ID,
 				OverCount:               sum_count,
 				AdviceId:                advice.ID,
+				OperateTime:             time.Now().Unix(),
 			}
 
 			CreateDrugFlowOne(drugflow)
@@ -1338,6 +1345,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 				MinUnit:                 "",
 				AdviceId:                advice.ID,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
+				OperateTime:             time.Now().Unix(),
 			}
 			CreateDrugFlowOne(flow)
 			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
@@ -1487,9 +1495,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
-	fmt.Println("药品名称", drup.DrugName)
-	fmt.Println("库存数量我哦我我", stock_number)
-	fmt.Println("出库数量", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -1783,6 +1788,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 					OverCount:               sum_count,
 					AdviceId:                advice.ID,
 					LastPrice:               warehouse.Price,
+					OperateTime:             time.Now().Unix(),
 				}
 
 				errThreeTy := CreateDrugFlowOne(drugflow)
@@ -1958,6 +1964,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				StorehouseId:            storeConfig.DrugStorehouseOut,
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
 			}
 			errCodeflow := CreateDrugFlowOne(flow)
 			if errCodeflow != nil {
@@ -2304,6 +2311,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				AdviceId:                advice.ID,
 				LastPrice:               warehouse.Price,
 				SystemTime:              advice.AdviceDate,
+				OperateTime:             time.Now().Unix(),
 			}
 
 			CreateDrugFlowOne(drugflow)
@@ -2440,6 +2448,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				StorehouseId:            storeConfig.DrugStorehouseOut,
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
+				OperateTime:             time.Now().Unix(),
 			}
 			errCodeFlows := CreateDrugFlowOne(flow)
 			if errCodeFlows != nil {
@@ -4601,10 +4610,6 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			warehouse.StockMinNumber = 0
 		}
 
-		//fmt.Println("warehouse.StockMaxNumber-------------------", warehouse.StockMaxNumber)
-		//
-		//fmt.Println("warehouse.StockMinNumber-------------------", warehouse.StockMinNumber)
-
 		//扣减库存数据
 		UpDateNewDrugWarehouseInfoByStock(&warehouse, tx)
 
@@ -4692,6 +4697,7 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			OverCount:               sum_count,
 			AdviceId:                advice.ID,
 			LastPrice:               warehouse.Price,
+			OperateTime:             time.Now().Unix(),
 		}
 
 		CreateNewDrugFlowOne(drugflow, tx)
@@ -4879,6 +4885,7 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			AdviceId:                advice.ID,
 			LastPrice:               warehouse.Price,
 			SystemTime:              advice.AdviceDate,
+			OperateTime:             time.Now().Unix(),
 		}
 
 		CreateNewDrugFlowOne(drugflow, tx)
@@ -5042,6 +5049,7 @@ func NewHisDrugCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAd
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			LastPrice:               drugOutInfo.Price,
 			OverCount:               sum_count,
+			OperateTime:             time.Now().Unix(),
 		}
 		CreateNewDrugFlowOne(flow, tx)
 
@@ -5167,6 +5175,7 @@ func NewHisDrugCancelInfo(orgID int64, creater int64, advice *models.HisDoctorAd
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 			LastPrice:               drugOutInfo.Price,
 			OverCount:               sum_count,
+			OperateTime:             time.Now().Unix(),
 		}
 		CreateNewDrugFlowOne(flow, tx)
 
@@ -5231,3 +5240,13 @@ func NewHisDrugAutoCancelInfo(orgID int64, creater int64, advice *models.HisDoct
 	}
 	return err
 }
+
+func ReduceNewGoodCountTwo(good_id int64, org_id int64, storehouse_id int64, out_count int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id = ? and good_id = ?", storehouse_id, org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count - ?", out_count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/patient_service.go

@@ -597,7 +597,7 @@ func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(id, 10) + ":patient_info"
 	patient_info_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.Patients{}).Preload("Contagions", "status = 1").Preload("Diseases", "status = 1").Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
 		if err != nil {

service/pharmacy_service.go

@@ -2305,3 +2305,44 @@ func GetHisPatientAdviceList(user_org_id int64, patient_id int64, start_time int
 	err = XTReadDB().Model(&models.HisDoctorAdvice{}).Where("patient_id=? and advice_date=? and advice_date>=? and advice_date<=? and status=1 and user_org_id = ? and is_medicine =1", patient_id, start_time, end_time, user_org_id).Find(&list).Error
 	return list, err
 }
+
+func GetGoodInventoryList(keyword string, org_id int64) (good []*models.GoodInfoEight, err error) {
+
+	keyword = "%" + keyword + "%"
+
+	db := XTReadDB().Where("status=1")
+
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or specification_name like ?", keyword, keyword)
+	}
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+
+	err = db.Order("id desc").Find(&good).Error
+
+	return good, err
+}
+
+func GetGoodInventoryByGoodId(id int64) (info []*models.XtWarehouseInfoEight, err error) {
+
+	err = XTReadDB().Where("good_id = ? and status=1 and is_check=1", id).Order("id desc").Find(&info).Error
+
+	return info, err
+}
+
+func GetInventoryWarehouseInfo(id int64) (models.XtWarehouseInfoEight, error) {
+
+	infoEight := models.XtWarehouseInfoEight{}
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&id).Error
+
+	return infoEight, err
+}
+
+func UpdateWarehouseInfoById(last_stock_count int64, id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+
+	err := XTWriteDB().Model(&info).Where("id = ? and status =1", id).Updates(map[string]interface{}{"stock_count": last_stock_count}).Error
+	return info, err
+}

service/schedule_service.go

@@ -234,6 +234,11 @@ func GetDayScheduleByBedid(orgID, start, bed_id int64, schedule_type int64) (sch
 	err = readDb.Model(&models.Schedule{}).Where("user_org_id=?  and schedule_date=? and bed_id=? and status=1 AND schedule_type = ?", orgID, start, bed_id, schedule_type).Preload("DialysisOrder", "status = 1").First(&schedule).Error
 	return
 }
+
+func GetDayScheduleByOrder(orgID, start, bed_id int64, schedule_type int64) (schedule models.DialysisOrder, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).First(&schedule).Error
+	return
+}
 func GetSourceSch(orgId int64, patient_id int64, record_date int64) (schedule models.Schedule, err error) {
 	err = readDb.Model(&models.Schedule{}).Where("user_org_id=?  and schedule_date=? and patient_id =? and status=1", orgId, record_date, patient_id).First(&schedule).Error
 	return
@@ -1916,3 +1921,9 @@ func GetPatientGoodCountToday(patient_id int64, schedule_date int64, user_org_id
 	err = XTReadDB().Where("patient_id =? and sys_record_time=? and org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&list).Error
 	return list, err
 }
+
+func GetPatientDrugCountToday(patient_id int64, schedule_date int64, user_org_id int64) (list []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id =? and sys_record_time=? and org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&list).Error
+	return list, err
+}

service/smart_sch.go

@@ -11,7 +11,7 @@ func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*model
 	db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1", orgID)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("name LIKE ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error
+		err = db.Where("name LIKE ? OR dialysis_no LIKE ? and lapseto =1", likekey, likekey).Find(&patient).Error
 	} else {
 		err = db.Find(&patient).Error
 	}

service/stock_service.go

@@ -9195,3 +9195,13 @@ func UpdateHisPrescriptionProjectList(id int64, price float64) (models.HisPrescr
 	err := XTWriteDB().Model(&templateL).Where("id =? and status=1", id).Updates(map[string]interface{}{"price": price}).Error
 	return templateL, err
 }
+
+func ModifyNewGoodWarehouseInfoStockMinNumber(count int64, goodid int64, orgid int64, id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and org_id = ? and good_id = ? and status = 1", id, orgid, goodid).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}

service/warhouse_service.go

@@ -364,6 +364,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			LastPrice:               warehouse.Price,
 			OverCount:               sum_count,
 			AdviceId:                advice.ID,
+			OperateTime:             time.Now().Unix(),
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -541,6 +542,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			LastPrice:               warehouse.Price,
 			OverCount:               sum_count,
 			AdviceId:                advice.ID,
+			OperateTime:             time.Now().Unix(),
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -1351,8 +1353,6 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-	fmt.Println("len233333333333333w", len(goods_yc))
-	fmt.Println("需要出库的数据", len(goods))
 	if len(goods) > 0 {
 		out, err := FindStockOutByIsSys(orgID, 1, record_time)
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
@@ -7057,8 +7057,6 @@ 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
@@ -7174,9 +7172,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		lastOut, _ := FindWarehouseOutInfoByPatientIdTwo(patient_id, record_time, goods.GoodId, orgID, goods.ProjectId)
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		fmt.Println("本次出库数据", count)
-		fmt.Println("历史出库数据", out_count)
-		fmt.Println("退库数据", out_count_one)
+
 		if count > (out_count - out_count_one) {
 
 			stockFlow := models.VmStockFlow{
@@ -7219,6 +7215,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
 				ProjectId:               goods.ProjectId,
+				OperateTime:             time.Now().Unix(),
 			}
 			//创建出库流水
 			errflow := CreateStockFlowOne(stockFlow)
@@ -7361,6 +7358,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
@@ -7515,9 +7513,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 		for _, item := range flowGoodTwo {
 			out_count_one += item.Count
 		}
-		fmt.Println("count----------------", count)
-		fmt.Println("out_count----------", out_count)
-		fmt.Println("out_count_one--------", out_count_one)
+
 		//如果出库数量 大于 历史出库数据 新增1条流水
 		if count > out_count-out_count_one {
 			stockFlow := models.VmStockFlow{
@@ -7560,6 +7556,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
 				ProjectId:               goods.ProjectId,
+				OperateTime:             time.Now().Unix(),
 			}
 			//创建出库流水
 			errflow := CreateStockFlowOne(stockFlow)
@@ -7702,6 +7699,7 @@ func ConsumablePrescriptionDelivery(orgID int64, patient_id int64, record_time i
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
@@ -8080,6 +8078,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
 				ProjectId:               goods.ProjectId,
+				OperateTime:             time.Now().Unix(),
 			}
 			//创建出库流水
 			errflow := CreateNewStockFlowOne(stockFlow, tx)
@@ -8222,6 +8221,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeNewGoodInfo(orgID, goods.ProjectId, tx)
@@ -8406,6 +8406,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
 				ProjectId:               goods.ProjectId,
+				OperateTime:             time.Now().Unix(),
 			}
 			//创建出库流水
 			errflow := CreateNewStockFlowOne(stockFlow, tx)
@@ -8548,6 +8549,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
 				RegisterNumber:          warehouse.RegisterNumber,
+				OperateTime:             time.Now().Unix(),
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeNewGoodInfo(orgID, goods.ProjectId, tx)
@@ -8600,3 +8602,570 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 
 	return nil
 }
+
+// 保存处方出库
+func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, creator int64, tx *gorm.DB) (err error) {
+
+	fmt.Println("出库时间-------------------------------------------------", record_time)
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+	var maxNumber int64 = 0
+
+	deliver_number = goods.Count
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+
+	// 如果没有对应的库存，则报错
+	warehouse, _ := FindNewFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId, tx)
+
+	stock_number = warehouse.StockCount
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+		maxNumber = goods.Count
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+		//扣减库存
+		UpDateNewWarehouseInfoByStock(&warehouse, tx)
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		//创建出库单
+		OutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+			Count:                   goods.Count,
+		}
+
+		AddNewSigleWarehouseOutInfo(OutInfo, tx)
+
+		stockFlow := models.VmStockFlow{
+			WarehousingId:           warehouse.ID,
+			GoodId:                  goods.GoodId,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Count:                   goods.Count,
+			UserOrgId:               orgID,
+			PatientId:               goods.PatientId,
+			SystemTime:              record_time,
+			ConsumableType:          3,
+			IsSys:                   1,
+			WarehousingOrder:        warehouse.WarehousingOrder,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			IsEdit:                  1,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			Creator:                 creator,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   warehouse.PackingPrice, //零售价
+			WarehousingDetailId:     warehouse.ID,
+			WarehouseOutDetailId:    goods.ID,
+			CancelOutDetailId:       0,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            warehouse.StorehouseId,
+			AdminUserId:             creator,
+			BuyPrice:                warehouse.Price, //进货价
+			StockCount:              "",
+			BatchNumberCount:        warehouse.StockCount - goods.Count,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+			ProjectId:               goods.ProjectId,
+			OperateTime:             time.Now().Unix(),
+		}
+
+		//插入流水
+		CreateNewStockFlowOne(stockFlow, tx)
+
+		//更新出库数量
+		ModifyNewGoodSumCount(goods.StorehouseId, stockFlow.Count, orgID, goods.GoodId, tx)
+
+		goodObj, _ := GetNewGoodInformationByGoodIdThirty(goods.GoodId, tx)
+
+		autoMatic := &models.AutomaticReduceDetail{
+			Count:        goods.Count,
+			GoodTypeId:   goodObj.GoodTypeId,
+			GoodId:       goods.GoodId,
+			PatientId:    goods.PatientId,
+			RecordTime:   goods.RecordDate,
+			OrgId:        orgID,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			StorehouseId: goods.StorehouseId,
+			ProjectId:    goods.ProjectId,
+		}
+
+		CreatedDialysisPrepare(autoMatic, tx)
+
+		return nil
+	} else {
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		UpDateNewWarehouseInfoByStock(&warehouse, tx)
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		OutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		OutInfo.Count = stock_number
+
+		AddNewSigleWarehouseOutInfo(OutInfo, tx)
+
+		//如果出库数量 大于 历史出库数据 新增1条流水
+		stockFlow := models.VmStockFlow{
+			WarehousingId:           warehouse.ID,
+			GoodId:                  goods.GoodId,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Count:                   stock_number,
+			UserOrgId:               orgID,
+			PatientId:               goods.PatientId,
+			SystemTime:              record_time,
+			ConsumableType:          3,
+			IsSys:                   1,
+			WarehousingOrder:        warehouse.WarehousingOrder,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			IsEdit:                  1,
+			CancelStockId:           0,
+			CancelOrderNumber:       "",
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			Creator:                 creator,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   warehouse.PackingPrice, //零售价
+			WarehousingDetailId:     warehouse.ID,
+			WarehouseOutDetailId:    goods.ID,
+			CancelOutDetailId:       0,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            warehouse.StorehouseId,
+			AdminUserId:             creator,
+			BuyPrice:                warehouse.Price, //进货价
+			StockCount:              "",
+			BatchNumberCount:        0,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+			ProjectId:               goods.ProjectId,
+			OperateTime:             time.Now().Unix(),
+		}
+		//创建出库流水
+		CreateNewStockFlowOne(stockFlow, tx)
+
+		ModifyNewGoodSumCount(goods.StorehouseId, stock_number, orgID, goods.GoodId, tx)
+
+		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, tx)
+
+	}
+	dialyPrepareOne := &models.DialysisBeforePrepare{
+		GoodTypeId:   goods.GoodTypeId,
+		GoodId:       goods.GoodId,
+		PatientId:    goods.PatientId,
+		RecordDate:   goods.RecordDate,
+		UserOrgId:    orgID,
+		Count:        goods.Count,
+		Ctime:        time.Now().Unix(),
+		Creater:      creator,
+		Status:       1,
+		StorehouseId: goods.StorehouseId,
+		ProjectId:    goods.ID,
+	}
+
+	autoMatic := &models.AutomaticReduceDetail{
+		Count:        stock_number,
+		GoodTypeId:   goods.GoodTypeId,
+		GoodId:       goods.GoodId,
+		PatientId:    goods.PatientId,
+		RecordTime:   goods.RecordDate,
+		OrgId:        orgID,
+		Ctime:        time.Now().Unix(),
+		Status:       1,
+		StorehouseId: goods.StorehouseId,
+		ProjectId:    goods.ProjectId,
+	}
+	CreatedDialysisPrepare(autoMatic, tx)
+
+	goods.Count = deliver_number - stock_number
+	ConsumableNewHisPrescriptionDelivery(orgID, patient_id, record_time, dialyPrepareOne, warehouseOut, creator, tx)
+
+	return nil
+}
+
+func CreatedDialysisPrepare(prepare *models.AutomaticReduceDetail, tx *gorm.DB) error {
+
+	err := tx.Create(&prepare).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func NewHisGoodCancelInfo(orgID int64, creater int64, project *models.HisPrescriptionProject, cha_count int64, good models.GoodInformationThirty, tx *gorm.DB) (err error) {
+
+	storeConfig, _ := GetNewAllStoreHouseConfig(orgID, tx)
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	GoodOutInfo, _ := GetGoodWarehouseOutInfoByProjectIdTwo(project.PatientId, project.UserOrgId, project.RecordDate, project.ProjectId, project.ID, tx)
+
+	out_count = GoodOutInfo.Count
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+	fmt.Println("out_count---------------------------------------", out_count)
+	fmt.Println("cha_count++++++++++++++++++++++++++++++++++++++=", cha_count)
+	if out_count >= cha_count {
+		//退库 退回 cha_count 的数量
+		ModifyNewGoodWarehouseInfoStockMinNumber(cha_count, GoodOutInfo.GoodId, GoodOutInfo.OrgId, GoodOutInfo.WarehouseInfotId, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteGoodWarehouseOutInfoByNumber(GoodOutInfo.ID, tx)
+		}
+
+		//减去出库单里面的数量
+		ModifyGoodWarehouseOutInfoByNumber(GoodOutInfo.ID, cha_count, tx)
+
+		//创建退库单
+		goodList, _ := GetNewAllGoodSumCount(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		operation_time := time.Now().Unix()
+
+		//创建退库单
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindNewAllCancelStockTotal(orgID, tx)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+		cancelStock := models.CancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        orgID,
+			Creater:      creater,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			ReturnTime:   project.RecordDate,
+			Type:         1,
+			StorehouseId: storeConfig.StorehouseOutInfo,
+			IsCheck:      1,
+		}
+		_, msgerrkonde := GetNewCancelStockDetailByOrderNumberOne(project.RecordDate, orgID, tx)
+		if msgerrkonde == gorm.ErrRecordNotFound {
+			AddNewSigleCancelStock(&cancelStock, tx)
+		}
+
+		manufactureName, _ := GetNewManufactureById(GoodOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(GoodOutInfo.Dealer, tx)
+
+		cancelInfo, _ := GetNewLastCancelStockById(orgID, tx)
+
+		cancelStockInfo := models.CancelStockInfo{
+			GoodId:          project.ProjectId,
+			CancelStockId:   cancelInfo.ID,
+			GoodTypeId:      good.GoodTypeId,
+			Count:           cha_count,
+			Price:           project.Price,
+			Total:           0,
+			ProductDate:     GoodOutInfo.ProductDate,
+			ExpiryDate:      GoodOutInfo.ExpiryDate,
+			Ctime:           time.Now().Unix(),
+			Status:          1,
+			OrgId:           orgID,
+			OrderNumber:     cancelInfo.OrderNumber,
+			Type:            0,
+			Dealer:          dealer.DealerName,
+			Manufacturer:    manufactureName.ManufacturerName,
+			Number:          GoodOutInfo.Number,
+			RegisterAccount: "",
+			Remark:          "",
+			WarehouseInfoId: GoodOutInfo.WarehouseInfotId,
+			PatientId:       project.ProjectId,
+			RecordDate:      project.RecordDate,
+			StorehouseId:    storeConfig.StorehouseOutInfo,
+			IsCheck:         1,
+		}
+		CreateNewCancelStockInfoOne(&cancelStockInfo, tx)
+
+		flow := models.VmStockFlow{
+			WarehousingId:           GoodOutInfo.WarehouseInfotId,
+			GoodId:                  project.ProjectId,
+			Number:                  GoodOutInfo.Number,
+			LicenseNumber:           GoodOutInfo.LicenseNumber,
+			Count:                   cha_count,
+			UserOrgId:               orgID,
+			PatientId:               project.PatientId,
+			SystemTime:              project.RecordDate,
+			ConsumableType:          7,
+			IsSys:                   1,
+			WarehousingOrder:        "",
+			WarehouseOutId:          GoodOutInfo.WarehouseOutId,
+			WarehouseOutOrderNumber: GoodOutInfo.WarehouseOutOrderNumber,
+			IsEdit:                  0,
+			CancelStockId:           cancelInfo.ID,
+			CancelOrderNumber:       cancelInfo.OrderNumber,
+			Manufacturer:            manufactureName.ID,
+			Dealer:                  0,
+			Creator:                 creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   GoodOutInfo.Price,
+			WarehousingDetailId:     GoodOutInfo.WarehouseInfotId,
+			WarehouseOutDetailId:    GoodOutInfo.ID,
+			CancelOutDetailId:       cancelInfo.ID,
+			ProductDate:             GoodOutInfo.ProductDate,
+			ExpireDate:              GoodOutInfo.ExpiryDate,
+			StorehouseId:            storeConfig.StorehouseOutInfo,
+			BuyPrice:                project.Price,
+			ProjectId:               project.ID,
+			OverCount:               sum_count,
+			RegisterNumber:          GoodOutInfo.RegisterNumber,
+			OperateTime:             time.Now().Unix(),
+		}
+		CreateNewStockFlowOne(flow, tx)
+
+		AddGoodNewCancelSumCountOne(storeConfig.StorehouseOutInfo, project.ProjectId, orgID, flow.Count, tx)
+
+		ReduceNewGoodCountTwo(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, flow.Count, tx)
+
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//把该出库单的数量退完
+		ModifyNewGoodWarehouseInfoStockMinNumber(out_count, GoodOutInfo.GoodId, GoodOutInfo.OrgId, GoodOutInfo.WarehouseInfotId, tx)
+
+		//删除该出库单
+		DeleteGoodWarehouseOutInfoByNumber(GoodOutInfo.ID, tx)
+
+		//查询剩余库存
+		goodList, _ := GetNewAllGoodSumCount(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, tx)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		operation_time := time.Now().Unix()
+		//创建退库单
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindNewAllCancelStockTotal(orgID, tx)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+		cancelStock := models.CancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        orgID,
+			Creater:      creater,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			ReturnTime:   project.RecordDate,
+			Type:         1,
+			StorehouseId: storeConfig.StorehouseOutInfo,
+			IsCheck:      1,
+		}
+		_, msgerrkonde := GetNewCancelStockDetailByOrderNumberOne(project.RecordDate, orgID, tx)
+		if msgerrkonde == gorm.ErrRecordNotFound {
+			AddNewSigleCancelStock(&cancelStock, tx)
+		}
+
+		manufactureName, _ := GetNewManufactureById(GoodOutInfo.Manufacturer, tx)
+		dealer, _ := GetNewDealerById(GoodOutInfo.Dealer, tx)
+
+		cancelInfo, _ := GetNewLastCancelStockById(orgID, tx)
+
+		cancelStockInfo := models.CancelStockInfo{
+			GoodId:          project.ProjectId,
+			CancelStockId:   cancelInfo.ID,
+			GoodTypeId:      good.GoodTypeId,
+			Count:           out_count,
+			Price:           project.Price,
+			Total:           0,
+			ProductDate:     GoodOutInfo.ProductDate,
+			ExpiryDate:      GoodOutInfo.ExpiryDate,
+			Ctime:           time.Now().Unix(),
+			Status:          1,
+			OrgId:           orgID,
+			OrderNumber:     cancelInfo.OrderNumber,
+			Type:            0,
+			Dealer:          dealer.DealerName,
+			Manufacturer:    manufactureName.ManufacturerName,
+			Number:          GoodOutInfo.Number,
+			RegisterAccount: "",
+			Remark:          "",
+			WarehouseInfoId: GoodOutInfo.WarehouseInfotId,
+			PatientId:       project.ProjectId,
+			RecordDate:      project.RecordDate,
+			StorehouseId:    storeConfig.StorehouseOutInfo,
+			IsCheck:         1,
+		}
+		CreateNewCancelStockInfoOne(&cancelStockInfo, tx)
+
+		flow := models.VmStockFlow{
+			WarehousingId:           GoodOutInfo.WarehouseInfotId,
+			GoodId:                  project.ProjectId,
+			Number:                  GoodOutInfo.Number,
+			LicenseNumber:           GoodOutInfo.LicenseNumber,
+			Count:                   out_count,
+			UserOrgId:               orgID,
+			PatientId:               project.PatientId,
+			SystemTime:              project.RecordDate,
+			ConsumableType:          7,
+			IsSys:                   1,
+			WarehousingOrder:        "",
+			WarehouseOutId:          GoodOutInfo.WarehouseOutId,
+			WarehouseOutOrderNumber: GoodOutInfo.WarehouseOutOrderNumber,
+			IsEdit:                  0,
+			CancelStockId:           cancelInfo.ID,
+			CancelOrderNumber:       cancelInfo.OrderNumber,
+			Manufacturer:            manufactureName.ID,
+			Dealer:                  0,
+			Creator:                 creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   GoodOutInfo.Price,
+			WarehousingDetailId:     GoodOutInfo.WarehouseInfotId,
+			WarehouseOutDetailId:    GoodOutInfo.ID,
+			CancelOutDetailId:       cancelInfo.ID,
+			ProductDate:             GoodOutInfo.ProductDate,
+			ExpireDate:              GoodOutInfo.ExpiryDate,
+			StorehouseId:            storeConfig.StorehouseOutInfo,
+			BuyPrice:                project.Price,
+			ProjectId:               project.ID,
+			OverCount:               sum_count,
+			RegisterNumber:          GoodOutInfo.RegisterNumber,
+			OperateTime:             time.Now().Unix(),
+		}
+		CreateNewStockFlowOne(flow, tx)
+
+		AddGoodNewCancelSumCountOne(storeConfig.StorehouseOutInfo, project.ProjectId, orgID, flow.Count, tx)
+
+		ReduceNewGoodCountTwo(project.ProjectId, orgID, storeConfig.StorehouseOutInfo, flow.Count, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisGoodCancelInfo(orgID, creater, project, over_count, good, tx)
+	}
+	return err
+
+}
+
+func NewHisGoodAutoCancelInfo(orgID int64, creater int64, project *models.HisPrescriptionProject, cha_count int64, good models.GoodInformationThirty, tx *gorm.DB) error {
+
+	//查找患者最后一条的退库数据是否满足要求
+	var out_count int64
+	goodOutInfo, _ := GetGoodWarehouseOutInfoByProjectIdTwo(project.PatientId, project.UserOrgId, project.RecordDate, project.ProjectId, project.ID, tx)
+
+	out_count = goodOutInfo.Count
+
+	//如果最后1条出库数量大于退库数量,则直接退库,满足退库要求
+	if out_count >= cha_count {
+
+		//减去出库单里面的数量
+		ModifyGoodAuToWarehouseOut(goodOutInfo.ID, cha_count, tx)
+
+		if out_count == cha_count {
+			//删除该出库单
+			DeleteGoodWarehouseAutoByNumberTwo(goodOutInfo.ID, tx)
+		}
+	}
+
+	//如果出库的数据小于这个退库的数量差,则先该批次出库数量出完
+	if out_count < cha_count {
+
+		//删除该出库单
+		DeleteGoodWarehouseAutoByNumberTwo(goodOutInfo.ID, tx)
+
+		//计算还有多少没有退库
+		var over_count = cha_count - out_count
+
+		NewHisGoodAutoCancelInfo(orgID, creater, project, over_count, good, tx)
+	}
+	return err
+}