耗材参数

controllers/dialysis_record_api_controller.go

@@ -947,6 +947,9 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		if prescription.ID > 0 && adminUserInfo.CurrentOrgId == 9583 {
 			tempassessmentAfterDislysis.ActualUltrafiltration = prescription.TargetUltrafiltration
 		}
+		if endmonitorRecords.ID > 0 && adminUserInfo.CurrentOrgId == 10060 {
+			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
+		}
 	}
 
 	if lastAssessmentAfterDislysis != nil {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -335,7 +335,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1363,6 +1363,11 @@ func (c *DialysisAPIController) Finish() {
 
 			tempassessmentAfterDislysis.ActualUltrafiltration = diaPrescription.TargetUltrafiltration
 		}
+
+	}
+
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10060 {
+		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 	}
 
 	if lastAssessmentAfterDislysis != nil {
@@ -2133,7 +2138,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 {
+			if template.TemplateId == 32 || template.TemplateId == 34 {
+
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
+			if template.TemplateId == 20 || template.TemplateId == 22 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}

controllers/stock_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"strconv"
 	"time"
 )
@@ -224,13 +225,18 @@ func (c *StockApiController) CreateManufacturer() {
 		PinYin:           pinyin,
 	}
 
-	err, manufacturers := service.AddSigleManufacturer(&manufacturer)
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"manufacturer": manufacturers,
-		})
-
-	} else {
+	_, errcode := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
+	if errcode == gorm.ErrRecordNotFound {
+		err, manufacturers := service.AddSigleManufacturer(&manufacturer)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"manufacturer": manufacturers,
+			})
+
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	} else if errcode == nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 
@@ -282,13 +288,18 @@ func (c *StockApiController) ModifyManufacturer() {
 		PinYin:           pinyin,
 	}
 
-	err := service.ModifyManufacturer(&manufacturer)
-
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"manufacturer": manufacturer,
-		})
-	} else {
+	_, errcode := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.ModifyManufacturer(&manufacturer)
+
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"manufacturer": manufacturer,
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	} else if errcode == nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 

models/his_models.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"gdyb/models"
+	//"gdyb/models"
 	"time"
 )
 
@@ -575,41 +575,41 @@ func (XtHisProjectList) TableName() string {
 }
 
 type XtHisPatient struct {
-	ID                     int64           `gorm:"column:id" json:"id" form:"id"`
-	BalanceAccountsType    int64           `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
-	MedicalInsuranceNumber string          `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	Name                   string          `gorm:"column:name" json:"name" form:"name"`
-	Gender                 int64           `gorm:"column:gender" json:"gender" form:"gender"`
-	IdType                 int64           `gorm:"column:id_type" json:"id_type" form:"id_type"`
-	MedicalTreatmentType   int64           `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
-	Birthday               int64           `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	RecordDate             int64           `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Age                    int64           `gorm:"column:age" json:"age" form:"age"`
-	PhoneNumber            string          `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
-	IdCardNo               string          `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	RegisterType           int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	AdminUserId            int64           `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	Departments            int64           `gorm:"column:departments" json:"departments" form:"departments"`
-	IsNeedCostOfProduction int64           `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
-	RegisterCost           float64         `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
-	TreatmentCost          float64         `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
-	CostOfProduction       float64         `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
-	Total                  float64         `gorm:"column:total" json:"total" form:"total"`
-	UserOrgId              int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status                 int64           `gorm:"column:status" json:"status" form:"status"`
-	Ctime                  int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId              int64           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Number                 string          `gorm:"column:number" json:"number" form:"number"`
-	Doctor                 int64           `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	IsReturn               int64           `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	Phone                  string          `gorm:"column:phone" json:"phone" form:"phone"`
-	SocialType             int64           `gorm:"column:social_type" json:"social_type" form:"social_type"`
-	IdCardType             int64           `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
-	PType                  string          `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Diagnosis              int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	SickType               int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
-	HisOrder               models.HisOrder `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,SettleAccountsDate" json:"order"`
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
+	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
+	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
+	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
+	TreatmentCost          float64 `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
+	CostOfProduction       float64 `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
+	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
+	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	//HisOrder               models.HisOrder `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,SettleAccountsDate" json:"order"`
 }
 
 func (XtHisPatient) TableName() string {

service/stock_service.go

@@ -2174,3 +2174,16 @@ func GetOutStockTotalCountOne(startime int64, endtime int64, orgid int64) (autoM
 
 	return autoMatic, err
 }
+
+func GetManufacturerName(orgid int64, name string) (*models.Manufacturer, error) {
+	var manufacturer models.Manufacturer
+	var err error
+	err = XTReadDB().Model(&manufacturer).Where("org_id = ? and manufacturer_name = ? and status = 1", orgid, name).Find(&manufacturer).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &manufacturer, nil
+}