11月9日库存管理

conf/app.conf

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

controllers/dialysis_api_controller.go

@@ -4271,24 +4271,38 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-
-	list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
-
 	_, config := service.FindXTHisRecordByOrgId(orgId)
-	goodType, err := service.GetAllGoodType(orgId)
-	if err == nil {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"list":     list,
-			"total":    total,
-			"config":   config,
-			"goodType": goodType,
-		})
-		return
+	goodType, _ := service.GetAllGoodType(orgId)
+	if config.IsOpen == 0 {
+		list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"list":     list,
+				"total":    total,
+				"config":   config,
+				"goodType": goodType,
+			})
+			return
 
-	} else {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
 	}
+	if config.IsOpen == 1 {
+		list, total, err := service.GetHisPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"list":     list,
+				"total":    total,
+				"config":   config,
+				"goodType": goodType,
+			})
+			return
+		}
+
+	}
+
 }
 
 func (this *DialysisApiController) GetDialysisAdviceTemplateList() {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1228,22 +1228,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 
-					//if config.IsOpen == 1 && item.UserOrgId == 10318 {
-					//
-					//  service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//  //更新字典里面的库存
-					//  stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					//  var sum_count int64
-					//  for _, its := range stockInfo {
-					//    if its.MaxUnit == medical.MaxUnit {
-					//      its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-					//    }
-					//    sum_count += its.StockMaxNumber + its.StockMinNumber
-					//  }
-					//  service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					//  //剩余库存
-					//  service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-					//}
+					if config.IsOpen == 1 && item.UserOrgId == 10318 {
+
+						service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+						//更新字典里面的库存
+						stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+						var sum_count int64
+						for _, its := range stockInfo {
+							if its.MaxUnit == medical.MaxUnit {
+								its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+							}
+							sum_count += its.StockMaxNumber + its.StockMinNumber
+						}
+						service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+						//剩余库存
+						service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+					}
 
 				}
 			}

models/good_models.go

@@ -15,6 +15,7 @@ type GoodsType struct {
 	Number         int64  `gorm:"column:number" json:"number"`
 	OutStock       int64  `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
 	StockAttribute int64  `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
+	IsOpen         int64  `gorm:"column:is_open" json:"is_open" form:"is_open"`
 }
 
 func (GoodsType) TableName() string {

models/schedule_models.go

@@ -349,3 +349,26 @@ type NewMSchedualPatientVMList struct {
 func (NewMSchedualPatientVMList) TableName() string {
 	return "xt_patients"
 }
+
+type VmBloodScheduleTwo 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"`
+	HisPrescriptionInfoTemplate HisPrescriptionInfoTemplate `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"his_prescription_template"`
+}
+
+func (VmBloodScheduleTwo) TableName() string {
+	return "xt_schedule"
+}

service/dialysis_solution_service.go

@@ -266,6 +266,52 @@ func GetDialysisParameterGoodList(orgID int64, schedule_type int64, partition_id
 func SaveHisDialysis(orgid int64, ids []string) error {
 
 	goodsType := models.BloodGoodsType{}
-	err := XTWriteDB().Where("org_id = ? and status = 1 and id in(?)", orgid, ids).Update(map[string]interface{}{"is_open": goodsType.IsOpen}).Error
+	err := XTWriteDB().Model(&goodsType).Where("org_id = ? and status = 1 and id in(?)", orgid, ids).Update(map[string]interface{}{"is_open": 1}).Error
+
+	err = XTWriteDB().Model(&goodsType).Where("org_id = ? and status = 1 and id not in(?)", orgid, ids).Update(map[string]interface{}{"is_open": 0}).Error
 	return err
 }
+
+func GetHisPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodScheduleTwo, total int64, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
+	offset := (page - 1) * limit
+	if scheduleDate > 0 {
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("xt_schedule.partition_id = ?", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("HisPrescriptionInfoTemplate", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type =3 ", orgID).Preload("GoodInfo", "org_id = ? and status = 1", orgID)
+				})
+			})
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&schedule).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).
+			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("HisPrescriptionInfoTemplate", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionProjectTemplate", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type =3 ", orgID).Preload("GoodInfo", "org_id = ? and status = 1", orgID)
+				})
+			}).Find(&schedule).Error
+	}
+
+	return schedule, total, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -295,10 +295,10 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 		db = db.Where("x.org_id = ?", orgid)
 	}
 	if startime > 0 {
-		db = db.Where("x.ctime >= ?", startime)
+		db = db.Where("x.sys_record_time >= ?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("x.ctime<=?", endtime)
+		db = db.Where("x.sys_record_time<=?", endtime)
 	}
 	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
 	return out, err