耗材参数

controllers/manage_api_controller.go

@@ -1040,10 +1040,10 @@ func (this *MachineApiController) GetAllOrganization() {
 
 func (this *MachineApiController) SaveInformation() {
 	eid, _ := this.GetInt64("eid")
-	fmt.Print("eid-------", eid)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//fmt.Println("错误是", err)
+
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
 
@@ -1089,21 +1089,17 @@ func (this *MachineApiController) SaveInformation() {
 	dialysis_time := dataBody["dialysis_time"].(string)
 	//fmt.Println("透析时长", dialysis_time)
 
-	//hyperfiletration := dataBody["hyperfiltratio"].(string)
 	hyperfiletration := dataBody["hyperfiltratio"].(float64)
-	//hyperfiletration := strconv.FormatInt(hyperfiltratios, 10)
+
 	fmt.Println("实际超滤量", hyperfiletration)
 
-	//weight_loss := dataBody["weight_loss"].(string)
 	weight_loss := dataBody["weight_loss"].(float64)
-	//weight_loss := strconv.FormatInt(weightloss, 10)
+
 	fmt.Println("体重减少", weight_loss)
 
 	warining_value := dataBody["warning_value"].(string)
 	fmt.Println("预警值", warining_value)
 
-	//user_total := dataBody["user_total"].(string)
-	//fmt.Println("使用次数",user_total)
 	usertotal := int64(dataBody["user_total"].(float64))
 	user_total := strconv.FormatInt(usertotal, 10)
 
@@ -1185,7 +1181,7 @@ func (this *MachineApiController) SaveInformation() {
 	sign_name := int64(dataBody["sign_name"].(float64))
 	//fmt.Println("签名", sign_name)
 
-	information, errinfor := service.GetInformation(eid, startdate, orgid)
+	information, errinfor := service.GetInformation(eid, startdate, orgid, classtype)
 	fmt.Print("errinfor", errinfor)
 	fmt.Print("information", information)
 	if errinfor == gorm.ErrRecordNotFound {
@@ -1287,7 +1283,7 @@ func (this *MachineApiController) SaveInformation() {
 			Bed:                   number.Number,
 		}
 		informationdata, err := service.GetLastInformationdata(eid, startdate, orgid)
-		fmt.Print("informationdata----", informationdata.ID)
+
 		errors := service.UpadateForm(informationdata.ID, orgid, &infor)
 		//fmt.Print("报错", errors)
 		if errors != nil {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -243,6 +243,7 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 
 		// 保存透后相关数据
 		assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysis(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+
 		if getAADErr != nil {
 			c.ErrorLog("获取透后评估失败:%v", getAADErr)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -268,6 +269,11 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 		afterevaluation.DiastolicBloodPressure = diastolic_blood_pressure // 舒张压
 		afterevaluation.PulseFrequency = pulse_frequency                  // 脉率
 
+		afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
+		afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
+		afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
+		afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk                   //跌倒风险
+
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -697,6 +703,11 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 		afterevaluation.WeightAfter = weight_after
 		afterevaluation.WeightLoss = weight_loss
+
+		afterevaluation.LeaveOfficeMethod = assessmentAfterDislysis.LeaveOfficeMethod //离科方式
+		afterevaluation.Lapse = assessmentAfterDislysis.Lapse                         //转归
+		afterevaluation.Consciousness = assessmentAfterDislysis.Consciousness         //意识
+		afterevaluation.Fallrisk = assessmentAfterDislysis.Fallrisk
 		// if (adminUserInfo.Org.Id == 9538){
 		// 	afterevaluation.ActualUltrafiltration = weight_loss * 1000  //中能建的计量单位是毫升（ml）
 		// } else {

controllers/self_drug_api_congtroller.go

@@ -81,6 +81,8 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getdrugwarehouseinfototal", &StockManagerApiController{}, "Get:GetDrugWarehouseInfoTotal")
 
 	beego.Router("/api/drug/saveinentorylist", &SelfDrugApiController{}, "Post:SaveInventoryList")
+
+	beego.Router("/api/drug/getdamagebydrugid", &SelfDrugApiController{}, "Get:GetDamageByDrugId")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2359,9 +2361,8 @@ func (this *SelfDrugApiController) SaveDrugProofInventory() {
 	warehouse_info_id, _ := this.GetInt64("warehouse_info_id")
 	warehousing_unit := this.GetString("warehousing_unit")
 	remark := this.GetString("remark")
-	//total := this.GetString("total")
 	proof_count, _ := this.GetInt64("proof_count")
-	fmt.Println("pof_count2222222", proof_count)
+
 	inventory := models.XtDrugInventory{
 		WarehouseInfoId: warehouse_info_id,
 		ProofCount:      proof_count,
@@ -2586,3 +2587,19 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 		}
 	}
 }
+
+func (this *SelfDrugApiController) GetDamageByDrugId() {
+
+	drug_id, _ := this.GetInt64("drug_id")
+	warehousing_order := this.GetString("warehousing_order")
+	drug_type, _ := this.GetInt64("type")
+	list, err := service.GetDamageByDrugId(drug_id, warehousing_order, drug_type)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/self_drug_models.go

@@ -844,6 +844,7 @@ type VmDrugInventory struct {
 	MinUnit            string             `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	MinCount           int64              `gorm:"column:min_count" json:"min_count" form:"min_count"`
 	Total              string             `gorm:"column:total" json:"total" form:"total"`
+	MinPrice           float64            `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	ExpiryDate         int64              `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
 	ProductDate        int64              `gorm:"column:product_date" json:"product_date" form:"product_date"`
 	DrugOriginPlace    string             `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`

service/manage_service.go

@@ -896,10 +896,10 @@ func GetAllpatient(orgid int64) (patients []*models.Patients, err error) {
 ////	return &information, nil
 ////}
 
-func GetInformation(eid int64, startdate int64, orgid int64) (*models.DeviceInformation, error) {
+func GetInformation(eid int64, startdate int64, orgid int64, classtype int64) (*models.DeviceInformation, error) {
 	var information models.DeviceInformation
 	var err error
-	err = UserReadDB().Model(&information).Where("equiment_id = ? and user_org_id = ? and status = ? and date = ? ", eid, orgid, 1, startdate).Find(&information).Error
+	err = UserReadDB().Model(&information).Where("equiment_id = ? and user_org_id = ? and status = ? and date = ?  and class = ?", eid, orgid, 1, startdate, classtype).Find(&information).Error
 	fmt.Print("", err)
 	if err == gorm.ErrRecordNotFound {
 		return nil, err

service/self_drug_service.go

@@ -879,7 +879,7 @@ func CreateDrugDamage(damage models.XtDrugDamage) error {
 func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.VmDrugInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and inventory_type = 10")
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and inventory_type = 11")
 	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)
@@ -895,12 +895,12 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 	if endtime > 0 {
 		db = db.Where("x.ctime <=?", endtime)
 	}
-	err = db.Group("x.drug_id").Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.number,x.drug_origin_place,x.warehouse_info_id,x.batch_number,x.stock_max_number,x.stock_min_number").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
+	err = db.Group("x.drug_id").Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.number,x.drug_origin_place,x.warehouse_info_id,x.batch_number,x.stock_max_number,x.stock_min_number,t.min_number,t.max_unit,t.min_unit,t.min_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
 	return adjust, total, err
 }
 
 func GetDrugDamageByOrgId(orgid int64) (list []*models.XtDrugInventory, err error) {
-	err = XTReadDB().Model(&list).Where("user_org_id = ? and inventory_type = 10 and status = 1", orgid).Find(&list).Error
+	err = XTReadDB().Model(&list).Where("user_org_id = ? and inventory_type = 11 and status = 1", orgid).Find(&list).Error
 	return list, err
 }
 
@@ -1120,3 +1120,21 @@ func CreateDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo) error {
 	err := XTWriteDB().Create(&info).Error
 	return err
 }
+
+func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.XtDrugInventory, err error) {
+
+	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1 and inventory_type = 11 ")
+
+	if drugid > 0 {
+		db = db.Where("drug_id = ?", drugid)
+	}
+	if len(warhousingorder) > 0 {
+		db = db.Where("warehousing_order = ?", warhousingorder)
+	}
+	if drugtype > 0 {
+		db = db.Where("type = ?", drugtype)
+	}
+
+	err = db.Find(&drug).Error
+	return drug, err
+}