11月9日库存管理

conf/app.conf

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

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -665,6 +665,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10340 {
 					evaluation.BreathingRate = "20"
 				}
+				if adminUserInfo.Org.Id == 10445 {
+					evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -531,6 +531,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
 
 	prescriptionConfig, _ := service.FindPrescriptionConfigById(adminInfo.Org.Id)
+
 	var team_projects []*models.HisPrescriptionProject
 	//var index int64 = 0
 	for _, item := range temp_team_projects {

controllers/stock_in_api_controller.go

@@ -155,6 +155,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
 
 	beego.Router("/api/stock/getnewgoodwarehouseinfo", &StockManagerApiController{}, "Get:GetNewGoodWarehouseInfo")
+	beego.Router("/api/stock/getnewwarehouseoutinfolist", &StockManagerApiController{}, "Get:GetNewWarehouseOutInfoList")
 
 }
 func (c *StockManagerApiController) HandleRefundStock() {
@@ -7826,7 +7827,7 @@ func (this *StockManagerApiController) GetNewGoodWarehouseInfo() {
 	}
 	var endTime int64
 	if len(end_time) > 0 {
-		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -7852,9 +7853,68 @@ func (this *StockManagerApiController) GetNewGoodWarehouseInfo() {
 	}
 
 	list, _ := service.GetNewGoodWarehouseInfo(startTime, endTime, orgId, goodids, storehouse_id)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	storeHouseList, _ := service.GetAllStoreHouseList(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
-		//"manufacturerList": manufacturerList,
-		//"dealerList":       dealerList,
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"storeHouseList":   storeHouseList,
+	})
+}
+
+func (this *StockManagerApiController) GetNewWarehouseOutInfoList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	keywords := this.GetString("keyword")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var goodids []int64
+	//查询商品名称
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetGoodInforByGoodName(keywords, orgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+			//入库详情但里面查询
+		}
+	}
+
+	list, _ := service.GetNewWarehouseOutInfoList(startTime, endTime, orgId, goodids, storehouse_id)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	storeHouseList, _ := service.GetAllStoreHouseList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"storeHouseList":   storeHouseList,
 	})
 }

models/stock_models.go

@@ -279,26 +279,27 @@ func (WarehouseOutInfo) TableName() string {
 }
 
 type WarehouseOutInfoNight struct {
-	ID                      int64   `gorm:"column:id" json:"id"`
-	Count                   int64   `gorm:"column:count" json:"count"`
-	GoodId                  int64   `gorm:"column:good_id" json:"good_id"`
-	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id"`
-	ProjectId               int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	WarehouseInfotId        int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys"`
-	Status                  int64   `gorm:"column:status" json:"status"`
-	OrgId                   int64   `gorm:"column:org_id" json:"org_id"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	GoodTypeId              int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	LicenseNumber           string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ID                      int64                 `gorm:"column:id" json:"id"`
+	Count                   int64                 `gorm:"column:count" json:"count"`
+	GoodId                  int64                 `gorm:"column:good_id" json:"good_id"`
+	SysRecordTime           int64                 `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64                 `gorm:"column:patient_id" json:"patient_id"`
+	ProjectId               int64                 `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	WarehouseInfotId        int64                 `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	IsSys                   int64                 `gorm:"column:is_sys" json:"is_sys"`
+	Status                  int64                 `gorm:"column:status" json:"status"`
+	OrgId                   int64                 `gorm:"column:org_id" json:"org_id"`
+	WarehouseOutOrderNumber string                `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	StorehouseId            int64                 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	Price                   float64               `gorm:"column:price" json:"price" form:"price"`
+	Dealer                  int64                 `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64                 `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	GoodTypeId              int64                 `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	ProductDate             int64                 `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64                 `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Number                  string                `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string                `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	GoodInfo                GoodInformationThirty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (WarehouseOutInfoNight) TableName() string {
@@ -1574,37 +1575,38 @@ func (StartDrugWarehouseInfo) TableName() string {
 }
 
 type GoodWarehousingInfo struct {
-	ID                        int64   `gorm:"column:id" json:"id"`
-	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
-	GoodId                    int64   `gorm:"column:good_id" json:"good_id"`
-	GoodTypeId                int64   `gorm:"column:good_type_id" json:"good_type_id"`
-	Number                    string  `gorm:"column:number" json:"number"`
-	ProductDate               int64   `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date"`
-	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
-	WarehousingUnit           string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
-	Price                     float64 `gorm:"column:price" json:"price"`
-	TotalPrice                float64 `gorm:"column:total_price" json:"total_price"`
-	Dealer                    int64   `gorm:"column:dealer" json:"dealer"`
-	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer"`
-	Remark                    string  `gorm:"column:remark" json:"remark"`
-	Ctime                     int64   `gorm:"column:ctime" json:"ctime"`
-	Mtime                     int64   `gorm:"column:mtime" json:"mtime"`
-	Status                    int64   `gorm:"column:status" json:"status"`
-	OrgId                     int64   `gorm:"column:org_id" json:"org_id"`
-	IsReturn                  int64   `gorm:"column:is_return" json:"is_return"`
-	StockCount                int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order"`
-	Type                      int64   `gorm:"column:type" json:"type"`
-	LicenseNumber             string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	WarehouseInfoId           int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	PackingPrice              float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
-	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ID                        int64                 `gorm:"column:id" json:"id"`
+	WarehousingId             int64                 `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId                    int64                 `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId                int64                 `gorm:"column:good_type_id" json:"good_type_id"`
+	Number                    string                `gorm:"column:number" json:"number"`
+	ProductDate               int64                 `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate                int64                 `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount          int64                 `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit           string                `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price                     float64               `gorm:"column:price" json:"price"`
+	TotalPrice                float64               `gorm:"column:total_price" json:"total_price"`
+	Dealer                    int64                 `gorm:"column:dealer" json:"dealer"`
+	Manufacturer              int64                 `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark                    string                `gorm:"column:remark" json:"remark"`
+	Ctime                     int64                 `gorm:"column:ctime" json:"ctime"`
+	Mtime                     int64                 `gorm:"column:mtime" json:"mtime"`
+	Status                    int64                 `gorm:"column:status" json:"status"`
+	OrgId                     int64                 `gorm:"column:org_id" json:"org_id"`
+	IsReturn                  int64                 `gorm:"column:is_return" json:"is_return"`
+	StockCount                int64                 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingOrder          string                `gorm:"column:warehousing_order" json:"warehousing_order"`
+	Type                      int64                 `gorm:"column:type" json:"type"`
+	LicenseNumber             string                `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId           int64                 `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice              float64               `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId         int64                 `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64                 `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64                 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64                 `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64                 `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber            string                `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	GoodInfo                  GoodInformationThirty `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
 }
 
 func (GoodWarehousingInfo) TableName() string {

service/patient_service.go

@@ -66,9 +66,17 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 	}
 
 	offset := (page - 1) * limit
+	if lapseto == 2 || lapseto == 3 {
+		err = db.Order("p.death_time desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+
+	}
+	if lapseto != 2 && lapseto != 3 {
+		err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+
+	}
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
+
 }
 
 //GetAllPatientList 返回全部患者的列表

service/stock_service.go

@@ -8381,7 +8381,7 @@ func GetWarehouseOutInfoIsExistSix(good_id int64, patient_id int64, record_time
 	return &info, nil
 }
 
-func GetNewGoodWarehouseInfo(startime int64, endtime int64, orgid int64, good_id []int64, storehouse_id int64) (info []*models.WarehousingInfo, err error) {
+func GetNewGoodWarehouseInfo(startime int64, endtime int64, orgid int64, good_id []int64, storehouse_id int64) (info []*models.GoodWarehousingInfo, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1")
 
@@ -8400,6 +8400,30 @@ func GetNewGoodWarehouseInfo(startime int64, endtime int64, orgid int64, good_id
 	if storehouse_id > 0 {
 		db = db.Where("storehouse_id = ?", storehouse_id)
 	}
-	err = db.Find(&info).Error
+	err = db.Preload("GoodInfo", "org_id = ? and status= 1", orgid).Find(&info).Error
+	return info, err
+}
+
+func GetNewWarehouseOutInfoList(start_time int64, end_time int64, orgid int64, good_id []int64, storehouse_id int64) (info []*models.WarehouseOutInfoNight, err error) {
+
+	db := XTReadDB().Model(&info).Where("status= 1")
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime <=?", end_time)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(good_id) > 0 {
+		db = db.Where("good_id in(?)", good_id)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	err = db.Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&info).Error
 	return info, err
 }