11月8日库存管理

conf/app.conf

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

controllers/drug_stock_api_contorller.go

@@ -1225,7 +1225,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
 
-	var drugFlow []*models.DrugFlow
+	//var drugFlow []*models.DrugFlow
 
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
@@ -1326,28 +1326,28 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
-				drugflow := &models.DrugFlow{
-					WarehouseOutId:          warehouseOut.ID,
-					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-					DrugId:                  drug_id,
-					Number:                  number,
-					ProductDate:             productDates,
-					ExpireDate:              expiryDates,
-					Count:                   count,
-					Price:                   price,
-					Status:                  1,
-					Ctime:                   ctime,
-					UserOrgId:               adminUserInfo.CurrentOrgId,
-					Manufacturer:            manufacturer,
-					Dealer:                  dealer,
-					BatchNumber:             batch_number,
-					MaxUnit:                 max_unit,
-					ConsumableType:          2,
-					IsEdit:                  1,
-					Creator:                 adminUserInfo.AdminUser.Id,
-					IsSys:                   0,
-				}
-				drugFlow = append(drugFlow, drugflow)
+				//drugflow := &models.DrugFlow{
+				//	WarehouseOutId:          warehouseOut.ID,
+				//	WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				//	DrugId:                  drug_id,
+				//	Number:                  number,
+				//	ProductDate:             productDates,
+				//	ExpireDate:              expiryDates,
+				//	Count:                   count,
+				//	Price:                   price,
+				//	Status:                  1,
+				//	Ctime:                   ctime,
+				//	UserOrgId:               adminUserInfo.CurrentOrgId,
+				//	Manufacturer:            manufacturer,
+				//	Dealer:                  dealer,
+				//	BatchNumber:             batch_number,
+				//	MaxUnit:                 max_unit,
+				//	ConsumableType:          2,
+				//	IsEdit:                  1,
+				//	Creator:                 adminUserInfo.AdminUser.Id,
+				//	IsSys:                   0,
+				//}
+				//drugFlow = append(drugFlow, drugflow)
 			}
 		}
 	}
@@ -1374,8 +1374,10 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			prescribing_number_total = item.Count
 		}
 
+		fmt.Println("药品ID", item.DrugId)
 		fmt.Println("数量一", prescribing_number_total)
 		fmt.Println("数量二", total_count)
+
 		//判断单位
 		if total_count == 0 {
 			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
@@ -1405,11 +1407,11 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			return
 		} else {
 			service.AddSigleDrugWarehouseOut(&warehouseOut)
-			list, _ := service.GetLastWarehouseOut(adminUserInfo.CurrentOrgId)
-			for _, item := range drugFlow {
-				item.WarehouseOutId = list.ID
-			}
-			service.CreateDrugFlow(drugFlow)
+			//list, _ := service.GetLastWarehouseOut(adminUserInfo.CurrentOrgId)
+			//for _, item := range drugFlow {
+			//	item.WarehouseOutId = list.ID
+			//}
+			//service.CreateDrugFlow(drugFlow)
 			// 出库流程
 			// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 			drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
@@ -1417,6 +1419,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				prescribingNumber := item.Count
 				service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
 			}
+			prescribing_number_total = 0
+			total_count = 0
 		}
 
 	}
@@ -1430,7 +1434,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 		"min_unit":   "",
 		"max_unit":   "",
 	})
-
+	return
 }
 func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 	page, _ := c.GetInt64("page", -1)

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -268,22 +268,35 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 		}
 		startTime = theTime.Unix()
 	}
-	fmt.Println("时间搓", startTime)
 	zoneid, _ := this.GetInt64("zoneid")
 	fmt.Println(zoneid)
 	classtype, _ := this.GetInt64("classtype")
-	fmt.Println("classtype", classtype)
 
-	//获取当天排班的病人情况
-	schedule, err := service.GetPatientSchedule(startTime, zoneid, classtype, orgid)
+	is_open, _ := this.GetInt64("is_open")
 
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
-		return
+	if is_open == 0 {
+		//获取当天排班的病人情况
+		schedule, err := service.GetPatientSchedule(startTime, zoneid, classtype, orgid)
+
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule": schedule,
+		})
+	}
+	if is_open == 1 {
+		//获取空床位的排班数据
+		list, err := service.GetPatientScheduleByBed(startTime, zoneid, classtype, orgid)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule": list,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"schedule": schedule,
-	})
 }
 
 func (this *StaffScheduleApiController) DeleteSchedule() {

controllers/patient_api_controller.go

@@ -2450,36 +2450,71 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		theEndtTIme = theTime.Unix()
 	}
 
-	advices, total, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
-	advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+	hisconfig, _ := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
 
-	if len(advices) > 0 {
-		for _, item := range advices {
-			if item.AdviceDoctor > 0 {
-				operatorIDs = append(operatorIDs, item.AdviceDoctor)
-			}
-			if item.ExecutionStaff > 0 {
-				operatorIDs = append(operatorIDs, item.ExecutionStaff)
-			}
-			if item.Checker > 0 {
-				operatorIDs = append(operatorIDs, item.Checker)
+	if hisconfig.IsOpen == 1 {
+		advices, total, _ := service.GetDoctorAdviceListThree(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
+		advicestwo, _, _ := service.GetDoctorAdviceListFour(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+
+		if len(advices) > 0 {
+			for _, item := range advices {
+				if item.AdviceDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.AdviceDoctor)
+				}
+				if item.ExecutionStaff > 0 {
+					operatorIDs = append(operatorIDs, item.ExecutionStaff)
+				}
+				if item.Checker > 0 {
+					operatorIDs = append(operatorIDs, item.Checker)
+				}
+				if item.StopDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.StopDoctor)
+				}
 			}
-			if item.StopDoctor > 0 {
-				operatorIDs = append(operatorIDs, item.StopDoctor)
+		}
+
+		//相关操作对应的操作人
+		operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"advices":   advices,
+			"operators": operators,
+			"total":     total,
+			"advicetwo": advicestwo,
+		})
+		return
+	} else {
+		advices, total, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
+		advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+
+		if len(advices) > 0 {
+			for _, item := range advices {
+				if item.AdviceDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.AdviceDoctor)
+				}
+				if item.ExecutionStaff > 0 {
+					operatorIDs = append(operatorIDs, item.ExecutionStaff)
+				}
+				if item.Checker > 0 {
+					operatorIDs = append(operatorIDs, item.Checker)
+				}
+				if item.StopDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.StopDoctor)
+				}
 			}
 		}
-	}
 
-	//相关操作对应的操作人
-	operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
+		//相关操作对应的操作人
+		operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"advices":   advices,
-		"operators": operators,
-		"total":     total,
-		"advicetwo": advicestwo,
-	})
-	return
+		c.ServeSuccessJSON(map[string]interface{}{
+			"advices":   advices,
+			"operators": operators,
+			"total":     total,
+			"advicetwo": advicestwo,
+		})
+		return
+	}
 
 }
 

controllers/self_drug_api_congtroller.go

@@ -2574,7 +2574,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				CancelOutDetailId:       0,
 				ExpireDate:              expiry_date,
 				ProductDate:             0,
-				MaxUnit:                 max_unit,
+				MaxUnit:                 min_unit,
 				MinUnit:                 min_unit,
 			}
 			if ord_total != new_total {

controllers/stock_in_api_controller.go

@@ -680,9 +680,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 			//获取该批次该型号的库存
 			info, _ := service.GetLastWarehousingByIdOne(item.ID, item.GoodId)
 
-			//判断 该批次的库存数量 和 编辑库存数量
-			fmt.Println("库存11111111111111", item.WarehousingCount)
-			fmt.Println("库存22222222222222", info.WarehousingCount)
 			//增加库存
 			if item.WarehousingCount > info.WarehousingCount {
 
@@ -728,6 +725,13 @@ func (c *StockManagerApiController) EditWarehouse() {
 					WarehousingCount: item.WarehousingCount,
 					StockCount:       info.StockCount,
 					Price:            item.Price,
+					Manufacturer:     item.Manufacturer,
+					Number:           item.Number,
+					ProductDate:      item.ProductDate,
+					ExpiryDate:       item.ExpiryDate,
+					LicenseNumber:    item.LicenseNumber,
+					Dealer:           item.Dealer,
+					Remark:           item.Remark,
 				}
 				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
 				break
@@ -1304,8 +1308,10 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 		// 查询该耗材是否有库存
 		warehouseOne, _ := service.FindWarehousingInfoTen(item.GoodId)
+		fmt.Println("hhh2333223223", item.GoodId, item.Count, warehouseOne.StockCount)
 		// 如果出库数量大于该批次剩余库存数量
 		if item.Count > warehouseOne.StockCount {
+
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":                "1",
@@ -1314,27 +1320,28 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			})
 			return
 
-		} else {
-			//查询是否生成出库单
-			_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
-			if errcodes == gorm.ErrRecordNotFound {
-				service.AddSigleWarehouseOut(&warehouseOut)
-			}
-			//出库逻辑
-			parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count, creater)
-			if parseDateErr != nil {
-				utils.ErrorLog(parseDateErr.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-				return
-			}
+		}
+	}
 
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":                "2",
-				"good_name":          "",
-				"specification_name": "",
-			})
+	for _, it := range warehousingOutInfo {
+		//查询是否生成出库单
+		_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
+		if errcodes == gorm.ErrRecordNotFound {
+			service.AddSigleWarehouseOut(&warehouseOut)
+		}
+		//出库逻辑
+		parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), it, &warehouseOut, it.Count, creater)
+		if parseDateErr != nil {
+			utils.ErrorLog(parseDateErr.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+			return
 		}
 
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":                "2",
+			"good_name":          "",
+			"specification_name": "",
+		})
 	}
 }
 func (c *StockManagerApiController) GetWarehouseOutList() {

models/device_models.go

@@ -1054,3 +1054,28 @@ type VmXtSchedule struct {
 	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
 	Count        int64
 }
+
+type PatientDeviceNumber struct {
+	ID            int64         `gorm:"column:id" json:"id"`
+	OrgID         int64         `gorm:"column:org_id" json:"-"`
+	Number        string        `gorm:"column:number" json:"number"`
+	GroupID       int64         `gorm:"column:group_id" json:"group_id"`
+	ZoneID        int64         `gorm:"column:zone_id" json:"zone_id"`
+	CreateTime    int64         `gorm:"column:ctime" json:"-"`
+	ModifyTime    int64         `gorm:"column:mtime" json:"-"`
+	Sort          int64         `gorm:"column:sort" json:"sort" form:"sort"`
+	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"`
+	Name          string        `gorm:"column:name" json:"name"`
+	Patient       Patients      `json:"patient"  gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	DeviceZone    DeviceZone    `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber  DeviceNumber  `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	TreatmentMode TreatmentMode `json:"mode" gorm:"foreignkey:ModeId"`
+	DialysisOrder DialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	Schedule      Schedule      `json:"schedule"  gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
+}

models/dialysis.go

@@ -1093,3 +1093,59 @@ type BloodDoctorAdvice struct {
 	DeliveryWay string `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	Total       int64
 }
+
+type HisDoctorAdvice struct {
+	ID                    int64              `gorm:"column:id" json:"id" form:"id"`
+	GroupNo               int64              `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	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"`
+	AdviceType            int64              `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64              `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64              `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string             `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string             `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64              `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64            `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string             `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	DrugSpec              float64            `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string             `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescribingNumber     float64            `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string             `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string             `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string             `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64              `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	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"`
+	AdviceAffirm          string             `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string             `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64              `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string             `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64              `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64              `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64              `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64              `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64              `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64              `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64              `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64              `gorm:"column:record_date" json:"record_date"`
+	DialysisOrderId       int64              `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	CheckTime             int64              `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64              `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	AdviceId              int64              `gorm:"-"`
+	RemindType            int64              `gorm:"column:remind_type" json:"remind_type"`
+	FrequencyType         int64              `gorm:"column:frequency_type" json:"frequency_type"`
+	DayCount              int64              `gorm:"column:day_count" json:"day_count"`
+	WeekDay               string             `gorm:"column:week_day" json:"week_day"`
+	ChildDoctorAdvice     []*HisDoctorAdvice `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+	TemplateId            string             `gorm:"column:template_id" json:"template_id"`
+	Modifier              int64              `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsCheck               int64              `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64              `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+}
+
+func (HisDoctorAdvice) TableName() string {
+	return "his_doctor_advice_info"
+}

service/doctor_schedule_service.go

@@ -598,6 +598,26 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	return schedule, err
 }
 
+func GetPatientScheduleByBed(startime int64, zoneid int64, classtype int64, orgid int64) (list []*models.PatientDeviceNumber, err error) {
+
+	db := XTReadDB().Table("xt_device_number as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_schedule as s").Where("s.status = 1")
+	p := XTReadDB().Table("xt_patients as p").Where("p.status = 1")
+	fmt.Println(table, p)
+	if zoneid > 0 {
+		db = db.Where("s.zone_id = ?", zoneid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if classtype > 0 {
+		db = db.Where("s.schedule_type = ?", classtype)
+	}
+
+	err = db.Select("x.id,x.number,x.group_id,x.zone_id,x.sort,s.partition_id,s.bed_id,s.patient_id,s.schedule_date,s.schedule_type,s.schedule_week,s.mode_id").Joins("left join xt_schedule as s on s.bed_id = x.id").Where("s.schedule_date = ?", startime).Scan(&list).Error
+	return list, err
+}
+
 func DeleteSchedule(id int64) error {
 
 	schedule := models.XtSchedule{}

service/patient_service.go

@@ -788,7 +788,7 @@ func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int6
 		db = db.Where("x.start_time>=?", start)
 	}
 	if end != 0 {
-		db = db.Where("start_time<=?", end)
+		db = db.Where("x.start_time<=?", end)
 	}
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
@@ -831,7 +831,7 @@ func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, sto
 		db = db.Where("x.start_time>=?", start)
 	}
 	if end != 0 {
-		db = db.Where("start_time<=?", end)
+		db = db.Where("x.start_time<=?", end)
 	}
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
@@ -1515,3 +1515,89 @@ func UpdateScheduleItemByPatientId(id int64) error {
 	err := XTWriteDB().Model(models.PatientScheduleTemplateItem{}).Where("patient_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetDoctorAdviceListThree(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.HisDoctorAdvice, total int64, err error) {
+
+	db := readDb.Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Print("table", table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 && 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")
+	}
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
+	}
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("x.start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	fmt.Print("err", err)
+	return
+}
+
+func GetDoctorAdviceListFour(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64) (advices []*models.HisDoctorAdvice, total int64, err error) {
+
+	db := readDb.Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println(table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 {
+		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")
+	}
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
+	}
+
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("x.start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	offset := (page - 1) * limit
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Scan(&advices).Error
+	fmt.Print("错误是什么", err)
+	return
+
+}

service/stock_service.go

@@ -4937,6 +4937,6 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark}).Error
 	return err
 }

service/warhouse_service.go

@@ -809,32 +809,56 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  advice.Remark,
+			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
 			Manufacturer:            advice.Manufacturer,
-			Dealer:                  advice.Dealer,
+			Dealer:                  warehouse.Dealer,
 			IsSys:                   0,
 			SysRecordTime:           advice.Ctime,
 			DrugId:                  advice.DrugId,
 			ExpiryDate:              advice.ExpiryDate,
 			ProductDate:             advice.ProductDate,
 			Number:                  advice.Number,
-			BatchNumber:             advice.BatchNumber,
-			Count:                   advice.Count,
+			BatchNumber:             warehouse.BatchNumber,
+			Count:                   deliver_number,
 			RetailPrice:             advice.RetailPrice,
 			Price:                   advice.Price,
 			WarehouseInfoId:         warehouse.ID,
+			CountUnit:               drup.MinUnit,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
 		warehouseOutInfo.CountUnit = advice.CountUnit
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-
 		if errOne != nil {
 			return errOne
 		}
+		list, _ := GetLastWarehouseOut(drup.OrgId)
+		drugflow := models.DrugFlow{
+			WarehouseOutId:          list.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   deliver_number,
+			Price:                   advice.Price,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+		}
+
+		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要减去对应批次的库存数量
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
@@ -878,22 +902,23 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  advice.Remark,
+			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
 			Manufacturer:            advice.Manufacturer,
-			Dealer:                  advice.Dealer,
+			Dealer:                  warehouse.Dealer,
 			IsSys:                   0,
 			SysRecordTime:           advice.Ctime,
 			DrugId:                  advice.DrugId,
-			ExpiryDate:              advice.ExpiryDate,
-			ProductDate:             advice.ProductDate,
-			Number:                  advice.Number,
-			BatchNumber:             advice.BatchNumber,
-			Count:                   advice.Count,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Count:                   deliver_number,
 			RetailPrice:             advice.RetailPrice,
 			Price:                   advice.Price,
 			WarehouseInfoId:         warehouse.ID,
+			CountUnit:               drup.MinUnit,
 		}
 		warehouseOutInfo.Count = prescribingNumber
 
@@ -903,6 +928,29 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if errOne != nil {
 			return errOne
 		}
+		list, _ := GetLastWarehouseOut(drup.OrgId)
+		drugflow := models.DrugFlow{
+			WarehouseOutId:          list.ID,
+			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			ProductDate:             warehouse.ProductDate,
+			ExpireDate:              warehouse.ExpiryDate,
+			Count:                   deliver_number,
+			Price:                   advice.Price,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			UserOrgId:               advice.OrgId,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
+			BatchNumber:             warehouse.BatchNumber,
+			MaxUnit:                 drup.MinUnit,
+			ConsumableType:          2,
+			IsEdit:                  1,
+			Creator:                 0,
+			IsSys:                   0,
+		}
+		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
 		warehouse.StockMaxNumber = 0
 		warehouse.StockMinNumber = 0