历史排班

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/schedule_api_controller.go

@@ -2023,6 +2023,23 @@ 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
+			}
+		}
+		//查询是否有出库记录
+		service.GetPatientGoodStockCount(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+	}
+
 	redis := service.RedisClient()
 
 	//处方

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/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

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
+}