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

controllers/base_api_controller.go

@@ -73,7 +73,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 16919
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 10579 //4，809
+		userAdmin.Id = 10599 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id 10344
+		subscibe.OrgId = 10598 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14655 //4
+		adminUserInfo.CurrentOrgId = 10598 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10344 //机构id小英10344或4
+		subscibe.OrgId = 10598 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,8 +336,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10344 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 14655 //4
+		adminUserInfo.CurrentOrgId = 10598 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3467  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -7150,7 +7150,7 @@ func (this *DialysisApiController) GetDialysisPatientsFlow() {
 
 	} else {
 		dialysisSchedule, err, total := service.GetDialysisWatchFlow(adminUserInfo.CurrentOrgId, startTime/1000, schedulType, partitionType, page, limit, start_time/1000, end_time/1000)
-		fmt.Println("dialysisSchedule-----------------------", dialysisSchedule)
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"schedule": dialysisSchedule,

controllers/manage_api_controller.go

@@ -2881,7 +2881,6 @@ func (this *MachineApiController) GetPatientDetail() {
 
 func (this *MachineApiController) SaveReminder() {
 	id, _ := this.GetInt64("id")
-	fmt.Print("码字", id)
 	info := this.GetAdminUserInfo()
 	orgId := info.CurrentOrgId
 	remander := models.DeviceRemander{
@@ -2892,8 +2891,7 @@ func (this *MachineApiController) SaveReminder() {
 	}
 	data, errs := service.GetRemanderData(orgId)
 	if errs == gorm.ErrRecordNotFound {
-		err := service.CreateRemander(&remander).Error()
-		fmt.Print(err)
+		service.CreateRemander(&remander).Error()
 	} else if errs == nil {
 		deviceRemander := models.DeviceRemander{
 			ID:        data.ID,
@@ -2902,11 +2900,11 @@ func (this *MachineApiController) SaveReminder() {
 			UserOrgId: orgId,
 			Mtime:     time.Now().Unix(),
 		}
-		err := service.UpdateRemander(&deviceRemander)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
-			return
-		}
+		service.UpdateRemander(&deviceRemander)
+		//if err != nil {
+		//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		//	return
+		//}
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"id": id,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -606,6 +606,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	lastAssesmentBeforDialysis, _ := service.GetLastAssessmentBeforDialysis(patientID, adminInfo.Org.Id)
 
 	dryWeightList, _ := service.GetPatientDryList(patientID, adminInfo.Org.Id)
+
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -2610,6 +2611,10 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.ActualUltrafiltration = 0
 		}
 
+		if adminUserInfo.Org.Id == 10612 {
+			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
+		}
+
 	}
 
 	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
@@ -10572,6 +10577,24 @@ func (c *DialysisAPIController) MobileCoverSch() {
 	id_one, _ := c.GetInt64("id_one")
 	id_two, _ := c.GetInt64("id_two")
 	sch, _ := service.GetScheduleTen(c.GetMobileAdminUserInfo().Org.Id, id_one)
+	//针对凤凰医院
+	if c.GetMobileAdminUserInfo().Org.Id == 10579 || c.GetMobileAdminUserInfo().Org.Id == 10344 || c.GetMobileAdminUserInfo().Org.Id == 10206 {
+		advice, _ := service.GetDoctorAdviceListTwenty(sch.PatientId, sch.ScheduleDate, c.GetMobileAdminUserInfo().Org.Id)
+		if len(advice) > 0 {
+			service.UpdateAdviceObj(sch.PatientId, sch.ScheduleDate, c.GetMobileAdminUserInfo().Org.Id)
+		}
+	}
+
+	if c.GetMobileAdminUserInfo().Org.Id == 10206 || c.GetMobileAdminUserInfo().Org.Id == 10344 {
+		hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(sch.PatientId, sch.ScheduleDate, c.GetMobileAdminUserInfo().Org.Id)
+		project, _ := service.GetHisPrescriptionProjectList(sch.PatientId, sch.ScheduleDate, c.GetMobileAdminUserInfo().Org.Id)
+		if len(hisAdvice) > 0 {
+			service.UpdateHisAdviceObj(sch.PatientId, sch.ScheduleDate, c.GetMobileAdminUserInfo().Org.Id)
+		}
+		if len(project) > 0 {
+			service.UpdateProjectObj(sch.PatientId, sch.ScheduleDate, c.GetMobileAdminUserInfo().Org.Id)
+		}
+	}
 	sch_two, _ := service.GetScheduleTen(c.GetMobileAdminUserInfo().Org.Id, id_two)
 
 	order, _ := service.GetOneDialysisOrderOne(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -522,10 +522,148 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 func (this *StaffScheduleApiController) DeleteSchedule() {
 	id, _ := this.GetInt64("id")
 	org_id := this.GetMobileAdminUserInfo().Org.Id
-	err := service.DeleteSchedule(id)
 
+	schedule, _ := service.GetScheduleNight(org_id, id)
+
+	//如果使用的是保存出库功能
+	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
+			}
+		}
+		//查询是否有出库记录
+		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)
+
+			//更新基础库库存
+			service.UpdateGoodInfoSumCountSix(item.GoodId, flush_count, org_id)
+		}
+	}
+
+	err := service.DeleteSchedule(id)
 	if err == nil {
-		schedule, _ := service.GetScheduleNight(org_id, id)
 
 		//记录日志
 		byterequest, _ := json.Marshal(schedule)
@@ -1253,6 +1391,27 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 		}
 		service.UpdateRepeatSchStatus(org_id, schedule_date)
 		service.CreateScheduleLog(scheduleLog)
+
+		scheduleToday, _ := service.GetPatientScheduleToday(schedule.PatientId, schedule.ScheduleDate, schedule.UserOrgId)
+
+		//针对凤凰医院
+		if org_id == 10579 || org_id == 10344 || org_id == 10206 {
+			advice, _ := service.GetDoctorAdviceListTwenty(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+			if len(advice) > 0 {
+				service.UpdateAdviceObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+			}
+		}
+
+		if org_id == 10206 || org_id == 10344 {
+			hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+			project, _ := service.GetHisPrescriptionProjectList(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+			if len(hisAdvice) > 0 {
+				service.UpdateHisAdviceObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+			}
+			if len(project) > 0 {
+				service.UpdateProjectObj(scheduleToday.PatientId, scheduleToday.ScheduleDate, org_id)
+			}
+		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "ok",

controllers/schedule_api_controller.go

@@ -97,6 +97,25 @@ func (c *ScheduleApiController) CoverSch() {
 	id_one, _ := c.GetInt64("id_one")
 	id_two, _ := c.GetInt64("id_two")
 	sch, _ := service.GetScheduleTen(c.GetAdminUserInfo().CurrentOrgId, id_one)
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	//针对凤凰医院
+	if orgId == 10579 || orgId == 10344 || orgId == 10206 {
+		advice, _ := service.GetDoctorAdviceListTwenty(sch.PatientId, sch.ScheduleDate, orgId)
+		if len(advice) > 0 {
+			service.UpdateAdviceObj(sch.PatientId, sch.ScheduleDate, orgId)
+		}
+	}
+
+	if orgId == 10206 || orgId == 10344 {
+		hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(sch.PatientId, sch.ScheduleDate, orgId)
+		project, _ := service.GetHisPrescriptionProjectList(sch.PatientId, sch.ScheduleDate, orgId)
+		if len(hisAdvice) > 0 {
+			service.UpdateHisAdviceObj(sch.PatientId, sch.ScheduleDate, orgId)
+		}
+		if len(project) > 0 {
+			service.UpdateProjectObj(sch.PatientId, sch.ScheduleDate, orgId)
+		}
+	}
 	sch_two, _ := service.GetScheduleTen(c.GetAdminUserInfo().CurrentOrgId, id_two)
 	//order, _ := service.GetDialysisOrder(sch.ScheduleDate, sch.PatientId, sch.UserOrgId)
 	//if order.ID > 0 {
@@ -714,6 +733,24 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					}
 
 					schedule.Status = 0
+					//针对凤凰医院
+					if adminInfo.CurrentOrgId == 10579 || adminInfo.CurrentOrgId == 10344 || adminInfo.CurrentOrgId == 10206 {
+						advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+						if len(advice) > 0 {
+							service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+						}
+					}
+
+					if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
+						hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+						project, _ := service.GetHisPrescriptionProjectList(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+						if len(hisAdvice) > 0 {
+							service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+						}
+						if len(project) > 0 {
+							service.UpdateProjectObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
+						}
+					}
 					service.SaveSch(&schedule)
 				}
 				HandleRedis(adminInfo.CurrentOrgId, schedule.ScheduleDate)
@@ -1985,6 +2022,144 @@ func (c *ScheduleApiController) DeleteSchedule() {
 
 	schedule.Status = 0
 	schedule.UpdatedTime = time.Now().Unix()
+
+	//如果使用的是保存出库功能
+	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
+			}
+		}
+		//查询是否有出库记录
+		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)
+
+			//更新基础库库存
+			service.UpdateGoodInfoSumCountSix(item.GoodId, flush_count, c.GetAdminUserInfo().CurrentOrgId)
+		}
+	}
+
 	err = service.UpdateSchedule(schedule)
 
 	//记录日志

controllers/self_drug_api_congtroller.go

@@ -3858,10 +3858,25 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 
 			//期间减少
 			banceOutList, _ := service.GetInitOutBanceList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
 			for _, it := range banceOutList {
 				item.WarehouseOutInfoTenty = append(item.WarehouseOutInfoTenty, it)
 			}
 
+			//期间盘盈
+			infoFlow, _ := service.GetInitInfoFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
+			for _, it := range infoFlow {
+				item.WareStartInStockFlow = append(item.WareStartInStockFlow, it)
+			}
+
+			//期间盘亏
+			outInfoFlow, _ := service.GetInitOutInfoFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
+			for _, it := range outInfoFlow {
+				item.WareStartOutStockFlow = append(item.WareStartOutStockFlow, it)
+			}
+
 		}
 
 		if err != nil {
@@ -3940,41 +3955,6 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 		endFlow, _ := service.GetDrugEndFlow(item.ID, orgId, endTime)
 
 		item.DrugEndFlow = endFlow
-		//获取期初结余入库数量
-		//startDrugInfo, _ := service.GetDrugWarehouseInfoStart(item.ID, orgId, startTime)
-		//for _, it := range startDrugInfo {
-		//  item.DrugWarehouseInfoStart = append(item.DrugWarehouseInfoStart, it)
-		//}
-		//
-		////获取期初结余出库数量
-		//flowOutList, _ := service.GetDrugFlowOut(item.ID, orgId, startTime)
-		//for _, it := range flowOutList {
-		//  item.DrugWarehouseOutInfoStart = append(item.DrugWarehouseOutInfoStart, it)
-		//}
-		//
-		////获取期初结余退库数量
-		//cancelInfo, _ := service.GetStartDrugFlowCancelInfo(item.ID, orgId, startTime)
-		//for _, it := range cancelInfo {
-		//  item.WareStartStockCancelInfo = append(item.WareStartStockCancelInfo, it)
-		//}
-		//
-		////获取期末结余入库数量
-		//drugwarehouseinfoend, _ := service.DrugWarehouseInfoEnd(item.ID, orgId, endTime)
-		//for _, it := range drugwarehouseinfoend {
-		//  item.DrugWarehouseInfoEnd = append(item.DrugWarehouseInfoEnd, it)
-		//}
-
-		////获取期末出库结余
-		//endDrugInfo, _ := service.DrugWarehouseOutInfoEnd(item.ID, orgId, endTime)
-		//for _, it := range endDrugInfo {
-		//  item.DrugWarehouseOutInfoEnd = append(item.DrugWarehouseOutInfoEnd, it)
-		//}
-		//
-		////获取期末退库数量
-		//flowCancelInfo, _ := service.GetEndDrugFlowCancelInfo(item.ID, orgId, endTime)
-		//for _, it := range flowCancelInfo {
-		//  item.WareEndStockCancelInfo = append(item.WareEndStockCancelInfo, it)
-		//}
 
 		//期中增加
 		drugWarehouse, _ := service.GetDrugWarehouseStartEnd(item.ID, orgId, startTime, endTime)
@@ -3995,27 +3975,6 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 			item.WareStartEndStockCancelInfo = append(item.WareStartEndStockCancelInfo, it)
 		}
 
-		////获取期初盘盈
-		//startProfit, _ := service.GetDrugFlowStartProfit(item.ID, orgId, startTime)
-		//for _, it := range startProfit {
-		//  item.WareStartStockInventoryProfit = append(item.WareStartStockInventoryProfit, it)
-		//}
-		////获取期初盘亏
-		//startLosses, _ := service.GetDrugFlowStartLosses(item.ID, orgId, startTime)
-		//for _, it := range startLosses {
-		//  item.WareStartStockInventoryLosses = append(item.WareStartStockInventoryLosses, it)
-		//}
-		////获取期末盘盈
-		//endProfit, _ := service.GetDrugFlowEndProfit(item.ID, orgId, endTime)
-		//for _, it := range endProfit {
-		//  item.WareEndStockInventoryProfit = append(item.WareEndStockInventoryProfit, it)
-		//}
-		////获取期末盘亏
-		//losses, _ := service.GetDrugFlowEndLosses(item.ID, orgId, endTime)
-		//for _, it := range losses {
-		//  item.WareEndStockInventoryLosses = append(item.WareEndStockInventoryLosses, it)
-		//}
-
 		//获取期中盘盈
 		profit, _ := service.GetDrugFlowStartEndProfit(item.ID, orgId, startTime, endTime)
 		for _, it := range profit {
@@ -4027,6 +3986,37 @@ func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {
 		for _, it := range endLosses {
 			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 		}
+
+		//获取入库
+		infoFLow, _ := service.GetNewDrugFlowInWarehouseInfo(item.ID, orgId, startTime)
+
+		for _, it := range infoFLow {
+			item.NewDrugFlowInWarehouseInfo = append(item.NewDrugFlowInWarehouseInfo, it)
+		}
+		//获取盘盈
+		infoProfitFlow, _ := service.GetNewDrugFlowPofitWarehouseInfo(item.ID, orgId, startTime)
+
+		for _, it := range infoProfitFlow {
+			item.NewDrugFlowPofitWarehouseInfo = append(item.NewDrugFlowPofitWarehouseInfo, it)
+		}
+		//获取出库
+		infoOutFlow, _ := service.GetNewDrugFlowOutWarehouseInfo(item.ID, orgId, startTime)
+		for _, it := range infoOutFlow {
+			item.NewDrugFlowOutWarehouseInfo = append(item.NewDrugFlowOutWarehouseInfo, it)
+		}
+
+		//获取退库
+		infoCacelFlow, _ := service.GetNewDrugFlowCacelWarehouseInfo(item.ID, orgId, startTime)
+		for _, it := range infoCacelFlow {
+			item.NewDrugFlowNoCancelWarehouseInfo = append(item.NewDrugFlowNoCancelWarehouseInfo, it)
+		}
+
+		//获取盘亏
+		infoNoPofitFlow, _ := service.GetNewDrugFlowNoPofitWarehouseInfo(item.ID, orgId, startTime)
+		for _, it := range infoNoPofitFlow {
+			item.NewDrugFlowNoPofitWarehouseInfo = append(item.NewDrugFlowNoPofitWarehouseInfo, it)
+		}
+
 	}
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")

models/new_stock_models.go

@@ -288,7 +288,10 @@ type GoodInfoTwenty struct {
 	StartFlowWarehouseInfo []*VmStockFlowTwenty //本期增加
 
 	StWarehousingInfoTwo  []*StWarehousingInfoOne  `gorm:"json:"new_warehouse_info_start"` //期间增加
-	WarehouseOutInfoTenty []*WarehouseOutInfoTenty `gorm:"json:"new_warehouse_out_info"`
+	WarehouseOutInfoTenty []*WarehouseOutInfoTenty `gorm:"json:"new_warehouse_out_info"`   //减少
+	WareStartInStockFlow  []*VmStockFlowTwenty     `gorm:"json:"new_stock_in_flow"`        //盘盈
+	WareStartOutStockFlow []*VmStockFlowTwenty     `gorm:"json:"new_stock_out_flow"`       //盘亏
+
 	//期初结余
 	StartFlowInfo    []*VmStockFlowTwenty
 	StartOutFlowInfo []*VmStockFlowTwenty
@@ -433,6 +436,12 @@ type VmBaseDrugTwenty struct {
 
 	DrugStatFlow DrugFlowTwenty
 	DrugEndFlow  DrugFlowTwenty
+
+	NewDrugFlowInWarehouseInfo       []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_in_flow_info"`
+	NewDrugFlowOutWarehouseInfo      []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_out_flow_info"`
+	NewDrugFlowPofitWarehouseInfo    []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_profit_flow_info"`
+	NewDrugFlowNoPofitWarehouseInfo  []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_no_profit_flow_info"`
+	NewDrugFlowNoCancelWarehouseInfo []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_cancel_flow_info"`
 }
 
 func (VmBaseDrugTwenty) TableName() string {

service/manage_center_service.go

@@ -1070,3 +1070,9 @@ func DeletePatientDiagnose(id int64) error {
 	err := XTWriteDB().Model(&models.XtPatientDiagnose{}).Where("id=? and status= 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetPatientGoodStockCount(patient_id int64, record_time int64, user_org_id int64) (auto []*models.XtAutomaticReduceDetail, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and record_time =? and user_org_id = ? and status=1", patient_id, record_time, user_org_id).Find(&auto).Error
+	return auto, err
+}

service/patient_service.go

@@ -1371,6 +1371,9 @@ func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int6
 	if advice_type == 1 && advice_type > 0 {
 		db = db.Where("x.advice_type = ?", advice_type)
 	}
+	if advice_type == 2 && advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
 	if advice_type == 3 && advice_type > 0 {
 		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
 	}
@@ -2118,6 +2121,9 @@ func GetDoctorAdviceListThree(orgID, patientID, advice_type, stop, start, end in
 	if advice_type == 1 && advice_type > 0 {
 		db = db.Where("x.advice_type = ?", advice_type)
 	}
+	if advice_type == 2 && advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
 	if advice_type == 3 && advice_type > 0 {
 		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
 	}

service/schedule_service.go

@@ -1798,6 +1798,12 @@ func GetHisDoctorAdviceListTwenty(patient_id int64, schedule_date int64, user_or
 	return advice, err
 }
 
+func GetHisDoctorAdviceListTwentyOne(patient_id int64, schedule_date int64, user_org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&advice).Error
+	return advice, err
+}
+
 func GetHisPrescriptionProjectList(patient_id int64, record_date int64, user_org_id int64) (project []*models.HisPrescriptionProject, err error) {
 	err = XTReadDB().Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Find(&project).Error
 	return project, err
@@ -1832,6 +1838,13 @@ func GetLastSchedule(patient_id int64, user_org_id int64) (models.XtSchedule, er
 	return schedule, err
 }
 
+func GetPatientScheduleToday(patient_id int64, schedule_date int64, user_org_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+	err = XTReadDB().Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status=0", patient_id, schedule_date, user_org_id).Find(&schedule).Error
+	return schedule, err
+}
+
 func UpdateRepeatSchStatus(user_org_id int64, schedule_date int64) {
 	var schedules []models.XtSchedule
 	// Find duplicate records based on patient_id, schedule_date, and user_org_id
@@ -1843,9 +1856,8 @@ func UpdateRepeatSchStatus(user_org_id int64, schedule_date int64) {
 
 	for _, schedule := range schedules {
 		// Update records with status = 0 where id is less than max_id
-		XTReadDB().Model(&models.XtSchedule{}).
-			Where("patient_id = ? AND schedule_date = ? AND id < ?", schedule.PatientId, schedule.ScheduleDate, schedule.MaxId).
-			Update("status", 0)
+		XTReadDB().Model(&models.XtSchedule{}).Where("patient_id = ? AND schedule_date = ? AND id < ?", schedule.PatientId, schedule.ScheduleDate, schedule.MaxId).Update("status", 0)
+
 	}
 
 }
@@ -1865,3 +1877,9 @@ func UpdateMobileSchedule(id_two int64, mode_id int64, bed_id int64, zone_id int
 
 	return err
 }
+
+func GetPatientGoodCountToday(patient_id int64, schedule_date int64, user_org_id int64) (list []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("patient_id =? and record_time=? and use_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&list).Error
+	return list, err
+}

service/self_drug_service.go

@@ -3015,7 +3015,7 @@ func GetPurchaseStockQueryList(good_type int64, keyword string, page int64, limi
 
 func GetInitBalanceList(good_id int64, user_org_id int64, start_time int64, end_time int64, storehouse_id int64) (list []*models.StWarehousingInfoOne, err error) {
 
-	db := XTReadDB().Model(&list).Where("status=1")
+	db := XTReadDB().Model(&list).Where("status=1 and is_check=1")
 
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -3025,7 +3025,7 @@ func GetInitBalanceList(good_id int64, user_org_id int64, start_time int64, end_
 	}
 
 	if start_time > 0 {
-		db = db.Where("ctime<=?", start_time)
+		db = db.Where("ctime<?", start_time)
 	}
 
 	if storehouse_id > 0 {
@@ -3050,7 +3050,7 @@ func GetInitOutBanceList(good_id int64, user_org_id int64, start_time int64, end
 	}
 
 	if start_time > 0 {
-		db = db.Where("ctime<=?", start_time)
+		db = db.Where("ctime<?", start_time)
 	}
 
 	if storehouse_id > 0 {
@@ -3061,3 +3061,136 @@ func GetInitOutBanceList(good_id int64, user_org_id int64, start_time int64, end
 
 	return list, err
 }
+
+func GetInitInfoFlow(good_id int64, user_org_id int64, start_time int64, end_time int64, storehouse_id int64) (list []*models.VmStockFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and consumable_type =10")
+
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	err = db.Find(&list).Error
+
+	return list, err
+}
+
+func GetInitOutInfoFlow(good_id int64, user_org_id int64, start_time int64, end_time int64, storehouse_id int64) (list []*models.VmStockFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and consumable_type =11")
+
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	err = db.Find(&list).Error
+
+	return list, err
+}
+
+func GetNewDrugFlowInWarehouseInfo(drug_id int64, user_org_id int64, start_time int64) (list []*models.DrugFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and consumable_type=1")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetNewDrugFlowPofitWarehouseInfo(drug_id int64, user_org_id int64, start_time int64) (list []*models.DrugFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and consumable_type=10")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetNewDrugFlowOutWarehouseInfo(drug_id int64, user_org_id int64, start_time int64) (list []*models.DrugFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and consumable_type=3")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetNewDrugFlowCacelWarehouseInfo(drug_id int64, user_org_id int64, start_time int64) (list []*models.DrugFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and consumable_type=7")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}
+
+func GetNewDrugFlowNoPofitWarehouseInfo(drug_id int64, user_org_id int64, start_time int64) (list []*models.DrugFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1 and consumable_type=11")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime<?", start_time)
+	}
+	err = db.Find(&list).Error
+	return list, err
+}