库存流水展示

controllers/dialysis_api_controller.go

@@ -582,7 +582,7 @@ func (c *DialysisApiController) PostPrescription() {
 			if filedConfig.ID > 0 {
 				str = dialyzerPerfusionApparatus
 			} else {
-				str = dialysis_dialyszers + "/" + dialysis_irrigation
+				str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 			}
 			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 		}
@@ -858,7 +858,7 @@ func (c *DialysisApiController) PostSoulution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1490,7 +1490,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, id, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -3031,7 +3031,7 @@ func (c *DialysisAPIController) PostSolution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}

controllers/patient_api_controller.go

@@ -938,6 +938,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 			OxygenTime:                 solution.OxygenTime,
 			MaxUltrafiltrationRate:     solution.MaxUltrafiltrationRate,
 			Amylaceum:                  solution.Amylaceum,
+			DialysisStrainer:           solution.DialysisStrainer,
 		}
 		service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	}
@@ -3849,6 +3850,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		solution.DialysisIrrigation = dialysisIrrigation
 	}
 
+	if dataBody["dialysis_strainer"] != nil && reflect.TypeOf(dataBody["dialysis_strainer"]).String() == "string" {
+		dialysis_strainer := dataBody["dialysis_strainer"].(string)
+		solution.DialysisStrainer = dialysis_strainer
+	}
+
 	if dataBody["plasma_separator"] != nil && reflect.TypeOf(dataBody["plasma_separator"]).String() == "string" {
 		plasmaSeparator := dataBody["plasma_separator"].(string)
 		solution.PlasmaSeparator = plasmaSeparator

controllers/pharmacy_controller.go

@@ -289,6 +289,7 @@ func (this *PharmacyController) DispensingMedicine() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
+
 	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
 	if err != nil {
 		utils.ErrorLog(err.Error())
@@ -564,7 +565,7 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 		return
 	}
 	total, err := service.CalculateTheTotalAmount(listll, drug_id)
-	fmt.Println("total2322332232323232332322wo", total)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

controllers/self_drug_api_congtroller.go

@@ -2766,6 +2766,7 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	for _, it := range manufacturerList {
 		ids = append(ids, it.ID)
 	}
+
 	infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
 	for _, it := range infoList {
 		goodIds = append(goodIds, it.GoodId)

models/good_models.go

@@ -137,8 +137,9 @@ func (GoodInfo) TableName() string {
 }
 
 type GoodInfoSeven struct {
-	ID       int64  `gorm:"column:id" json:"id" form:"id"`
-	GoodName string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName   string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodStatus string `gorm:"column:good_status" json:"good_status" form:"good_status"`
 }
 
 func (GoodInfoSeven) TableName() string {

models/patient_models.go

@@ -472,6 +472,7 @@ type DialysisPrescriptionList struct {
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (DialysisPrescriptionList) TableName() string {

service/new_stock_service.go

@@ -80,12 +80,16 @@ func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 
-	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1  and x.org_id =?", orgId)
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1  and x.org_id =? and find_in_set('停用',x.good_status) = 0", orgId)
 
 	if good_type == 2 {
 		db = db.Where(" x.total_count<=x.stock_warn_count")
 	}
 
+	if good_type == 3 {
+		db = db.Where("x.sum_count = 0")
+	}
+
 	if len(keyword) > 0 {
 		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
 	}

service/patient_service.go

@@ -1923,7 +1923,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer}).Error
 	return err
 }
 

service/pharmacy_service.go

@@ -601,6 +601,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 			if PettyCash(v.DrugId) {
 				continue
 			}
+			//判断药品库存是否充足
 			kou := FenDrugInventory(v, orgid)
 			if !kou {
 				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
@@ -757,6 +758,9 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 		}
 
 		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+		//扣减库存
+		UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
 	}
 
 	err = tx.Raw("select id,dispensing_time from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and "+
@@ -808,6 +812,8 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+		//扣减库存
+		UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 	}
 
 	//删除掉发药明细
@@ -1107,6 +1113,8 @@ func FenStock(orgid, creater int64, v *models.HisDoctorAdviceInfo) (err error) {
 		sum_count += its.StockMaxNumber + its.StockMinNumber
 	}
 	UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+	//扣减库存
+	UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 	return
 }
 

service/self_drug_service.go

@@ -1241,6 +1241,7 @@ func GetGoodWarehouseInfoByOrgId(orgid int64, storehouse_id int64) (info []*mode
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
+
 	if storehouse_id > 0 {
 		db = db.Where("storehouse_id = ?", storehouse_id)
 	}
@@ -1808,10 +1809,13 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
-	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1 AND find_in_set('停用',x.drug_status) = 0")
 	if good_type == 2 {
 		db = db.Where("x.total_count<=x.drug_stock_limit")
 	}
+	if good_type == 3 {
+		db = db.Where("x.sum_count = 0")
+	}
 	if storehouse_id > 0 {
 		db = db.Preload("DrugWarehouseInfo", "org_id = ? and status = 1 and storehouse_id = ? and is_check = 1", orgId, storehouse_id)
 
@@ -1876,6 +1880,12 @@ func GetAllGoodListSeven(orgid int64) (good []*models.GoodInfoSeven, err error)
 	return good, err
 }
 
+func GetAllGoodListEight(orgid int64) (good []*models.GoodInfoSeven, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1  AND find_in_set('停用',good_status) = 0", orgid).Find(&good).Error
+	return good, err
+}
+
 func GetGoodInformationWarehouseInfo(good_id int64, orgid int64) (info []*models.WarehousingInfoTen, err error) {
 
 	err = XTReadDB().Where("good_id = ? and org_id = ? and status = 1 and is_check = 1 and stock_count > 0", good_id, orgid).Find(&info).Error