历史排班

conf/app.conf

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

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -86,7 +86,7 @@ func (this *DialysisAPIController) Scheduals() {
 	defer redis.Close()
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-	redis.Set(key, "", time.Second)
+
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	patients, _ := service.GetAllPatientListSix(orgID)

controllers/patient_api_controller.go

@@ -4919,6 +4919,18 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		return
 	}
 	patient.PatientSource = patient_source
+
+	if patientBody["patient_start_time"] != nil && reflect.TypeOf(patientBody["patient_start_time"]).String() == "string" {
+		patient_start_time := patientBody["patient_start_time"].(string)
+		var startTime int64
+		if len(patient_start_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", patient_start_time+" 00:00:00", loc)
+
+			startTime = theTime.Unix()
+		}
+		patient.PatientStartTime = startTime
+	}
+
 	return
 }
 

controllers/self_drug_api_congtroller.go

@@ -77,6 +77,7 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/deletedruginventory", &SelfDrugApiController{}, "Get:DeleteDrugInventory")
 	beego.Router("/api/drug/getdruginventoryprintlist", &SelfDrugApiController{}, "Get:GetDrugInventoryPrintList")
 	beego.Router("/api/drug/getinventorydetaillist", &SelfDrugApiController{}, "Get:GetDrugInventoryDetailList")
+	beego.Router("/api/drug/getinventorydetailprintlist", &SelfDrugApiController{}, "Get:GetInventoryDetailPrintList")
 	beego.Router("/api/drug/savedrugproofinventory", &SelfDrugApiController{}, "Get:SaveDrugProofInventory")
 	beego.Router("/api/drug/getdrugwarehouseinfototal", &StockManagerApiController{}, "Get:GetDrugWarehouseInfoTotal")
 
@@ -4008,3 +4009,29 @@ func (this *SelfDrugApiController) GetDrugInventoryWarehouseInfoList() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (this *SelfDrugApiController) GetInventoryDetailPrintList() {
+	keyword := this.GetString("keyword")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, err := service.GetDrugInventoryDetailMapList(keyword, page, limit, orgId, storehouse_id, idSplit)
+	inventoryList, _, _ := service.GetDrugInventoryDetailListTwo(keyword, page, limit, orgId, storehouse_id)
+	houseList, _ := service.GetAllStoreHouseList(orgId)
+	doctorList, _ := service.GetAllDoctorThree(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":         total,
+		"list":          list,
+		"doctorList":    doctorList,
+		"houseList":     houseList,
+		"inventoryList": inventoryList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -7792,10 +7792,12 @@ func (this *StockManagerApiController) GetPrintList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	good_name := this.GetString("good_name")
+	ids := this.GetString("ids")
+	idSplit := strings.Split(ids, ",")
 	fmt.Println(storehouse_id, good_name)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	houseList, _ := service.GetAllStoreHouseList(orgId)
-	list, total, _ := service.GetInventoryDetailList(good_name, limit, page, orgId, storehouse_id)
+	list, total, _ := service.GetInventoryDetailPrintMapList(good_name, limit, page, orgId, storehouse_id, idSplit)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":      list,
 		"total":     total,

models/patient_models.go

@@ -223,6 +223,7 @@ type Patients struct {
 	Doctor                   int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	RecordNumber             string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 	PatientSource            int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
+	PatientStartTime         int64   `gorm:"column:patient_start_time" json:"patient_start_time" form:"patient_start_time"`
 }
 
 func (Patients) TableName() string {
@@ -816,6 +817,7 @@ type XtPatientsNew struct {
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	RecordNumber                 string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 	PatientSource                int64   `gorm:"column:patient_source" json:"patient_source" form:"patient_source"`
+	PatientStartTime             int64   `gorm:"column:patient_start_time" json:"patient_start_time" form:"patient_start_time"`
 }
 
 func (XtPatientsNew) TableName() string {

service/patient_service.go

@@ -874,7 +874,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber, "patient_start_time": patientsNew.PatientStartTime}).Error
 	return err
 }
 
@@ -2670,7 +2670,7 @@ func GetAllPatientListByListOne(orgID int64) (patients []*models.VMMonitorPatien
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
 	patient_info_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1", orgID).Find(&patients).Error
 		if err != nil {

service/self_drug_service.go

@@ -1119,6 +1119,29 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	return list, total, err
 }
 
+func GetDrugInventoryDetailMapList(keyword string, page int64, limit int64, orgid int64, storehouse_id int64, ids []string) (list []*models.VmDrugInventory, total int64, err error) {
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+	if len(keyword) > 0 {
+		db = db.Where("x.warehousing_order = ? or r.user_name like ? or t.drug_name like ?", keyword, likeKey, likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	if len(ids) > 0 {
+		db = db.Where("x.id in(?)", ids)
+	}
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
 func GetDrugInventoryDetailListTwo(keyword string, page int64, limit int64, orgid int64, storehouse_id int64) (list []*models.XtDrugInventory, total int64, err error) {
 
 	db := XTReadDB().Model(&list).Where("status = 1")
@@ -2715,6 +2738,6 @@ func ModifyDrugFlowById(id int64, over_count int64) error {
 
 func GetDrugInventoryWarehouseInfoList(org_id int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ?", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ? and (stock_max_number >0 or stock_min_number >0)", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
 	return info, err
 }

service/stock_service.go

@@ -6113,6 +6113,30 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 	return list, total, err
 }
 
+func GetInventoryDetailPrintMapList(keyword string, limit int64, page int64, orgid int64, storehouse_id int64, ids []string) (list []*models.VmStockInventory, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and x.type = 10")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+	if len(keyword) > 0 {
+		db = db.Where("x.good_name like ?", likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	if len(ids) > 0 {
+		db = db.Where("x.id in(?)", ids)
+	}
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
 func GetInventoryPrintList(ids []string) (list []*models.XtStockInventory, err error) {
 
 	err = XTReadDB().Where("id in(?) and status = 1", ids).Find(&list).Error
@@ -8212,7 +8236,7 @@ func ReduceGoodSumOutCount(storehouse_id int64, good_id int64, user_org_id int64
 
 func GetInvetoryWarehouseInfoList(orgid int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ?", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id=? and is_check= 1 and org_id = ? and stock_count >0", storehouse_id, orgid).Preload("GoodInfo", "status = 1").Order("good_id").Find(&info).Error
 	return info, err
 }