耗材参数

controllers/doctors_api_controller.go

@@ -343,6 +343,9 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 	stopTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", stop_time+" 00:00:00", loc)
 	patient_id, _ := this.GetInt64("patient_id")
 	other_vascular := this.GetString("other_vascular")
+	ci_type, _ := this.GetInt64("ci_type")
+	blood_cultupe, _ := this.GetInt64("blood_cultupe")
+	sequelae_type, _ := this.GetInt64("sequelae_type")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	creator := adminUserInfo.AdminUser.Id
@@ -367,6 +370,9 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 			StopTime:               stopTime.Unix(),
 			PatientId:              patient_id,
 			OtherVascular:          other_vascular,
+			CiType:                 ci_type,
+			BloodCultupe:           blood_cultupe,
+			SequelaeType:           sequelae_type,
 		}
 		err := service.SaveVascularAccess(&access)
 		if err == nil {
@@ -439,8 +445,10 @@ func (this *DoctorsApiController) UpdateVasularAccess() {
 	orgId := adminUserInfo.CurrentOrgId
 	creator := adminUserInfo.AdminUser.Id
 	patientId, _ := this.GetInt64("patient_id")
-	fmt.Println("patient_id222222222222222222", patientId)
 	other_vascular := this.GetString("other_vascular")
+	ci_type, _ := this.GetInt64("ci_type")
+	blood_cultupe, _ := this.GetInt64("blood_cultupe")
+	sequelae_type, _ := this.GetInt64("sequelae_type")
 	access := models.XtPatientVascularAccess{
 		AccessProject:          access_project,
 		BloodAccessPartId:      blood_access_part_id,
@@ -456,6 +464,9 @@ func (this *DoctorsApiController) UpdateVasularAccess() {
 		Status:                 1,
 		StopTime:               stopTime.Unix(),
 		OtherVascular:          other_vascular,
+		CiType:                 ci_type,
+		BloodCultupe:           blood_cultupe,
+		SequelaeType:           sequelae_type,
 	}
 	_, errcode := service.GetDialysisDateByDateOne(startTime.Unix(), patientId, orgId, id)
 	if errcode == gorm.ErrRecordNotFound {

controllers/manager_center_api_controller.go

@@ -126,7 +126,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_charge_predict, _ := c.GetInt64("is_charge_predict")
 	is_statistics_work, _ := c.GetInt64("is_statistics_work")
 	is_charge_use, _ := c.GetInt64("is_charge_use")
-
+	dealer, _ := c.GetInt64("dealer")
 	adminInfo := c.GetAdminUserInfo()
 
 	drugLib := &models.BaseDrugLib{
@@ -178,6 +178,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Status:                 1,
 		Ctime:                  time.Now().Unix(),
 		Mtime:                  time.Now().Unix(),
+		Dealer:                 dealer,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -255,6 +256,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_charge_use, _ := c.GetInt64("is_charge_use")
 	drug_code := c.GetString("drug_code")
 	//unit := c.GetString("unit")
+	dealer, _ := c.GetInt64("dealer")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -309,6 +311,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		Ctime:                  drug.Ctime,
 		Mtime:                  time.Now().Unix(),
 		DrugCode:               drug_code,
+		Dealer:                 dealer,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)

models/drug.go

@@ -51,6 +51,7 @@ type BaseDrugLib struct {
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/user_models.go

@@ -492,6 +492,9 @@ type XtPatientVascularAccess struct {
 	StopTime               int64  `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
 	PatientId              int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	OtherVascular          string `gorm:"column:other_vascular" json:"other_vascular" form:"other_vascular"`
+	CiType                 int64  `gorm:"column:ci_type" json:"ci_type" form:"ci_type"`
+	BloodCultupe           int64  `gorm:"column:blood_cultupe" json:"blood_cultupe" form:"blood_cultupe"`
+	SequelaeType           int64  `gorm:"column:sequelae_type" json:"sequelae_type" form:"sequelae_type"`
 }
 
 func (XtPatientVascularAccess) TableName() string {

service/drug_stock_service.go

@@ -35,9 +35,9 @@ func FindAllDrugByManufactureId(manufacturer_id int64, dealer_id int64, org_id i
 	if manufacturer_id > 0 {
 		db = db.Where("manufacturer = ?", manufacturer_id)
 	}
-	//if dealer_id > 0 {
-	//	db = db.Where("dealer = ?", dealer_id)
-	//}
+	if dealer_id > 0 {
+		db = db.Where("dealer = ?", dealer_id)
+	}
 	err = db.Preload("DrugSpecs", "status = 1 AND org_id = ? AND find_in_set('停用',drug_status) = 0", org_id).Group("drug_name").Find(&goodInfo).Error
 	return goodInfo, err
 }

service/patientmanage_service.go

@@ -1520,7 +1520,7 @@ func GetVasularAccessByDetail(id int64) (models.XtPatientVascularAccess, error)
 
 func UpdateVascularAccess(access *models.XtPatientVascularAccess, id int64) error {
 
-	err := XTWriteDB().Model(&access).Where("id= ?", id).Updates(map[string]interface{}{"access_project": access.AccessProject, "blood_access_part_id": access.BloodAccessPartId, "inflow_pass": access.InflowPass, "start_time": access.StartTime, "first_start_time": access.FirstStartTime, "blood_access_part_opera_id": access.BloodAccessPartOperaId, "stop_reason": access.StopReason, "remark": access.Remark, "user_status": access.UserStatus, "modify": access.Modify, "stop_time": access.StopTime, "other_vascular": access.OtherVascular}).Error
+	err := XTWriteDB().Model(&access).Where("id= ?", id).Updates(map[string]interface{}{"access_project": access.AccessProject, "blood_access_part_id": access.BloodAccessPartId, "inflow_pass": access.InflowPass, "start_time": access.StartTime, "first_start_time": access.FirstStartTime, "blood_access_part_opera_id": access.BloodAccessPartOperaId, "stop_reason": access.StopReason, "remark": access.Remark, "user_status": access.UserStatus, "modify": access.Modify, "stop_time": access.StopTime, "other_vascular": access.OtherVascular, "ci_type": access.CiType, "blood_cultupe": access.BloodCultupe, "sequelae_type": access.SequelaeType}).Error
 	return err
 }