2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id
+		subscibe.OrgId = 10633 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12627 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英9675或4
+		subscibe.OrgId = 10633 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12627 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -2573,7 +2573,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -326,6 +326,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	}
 
+	if adminUserInfo.Org.Id == 10727 {
+		dewater_amount = dewater_amount * 1000
+	}
+
 	if dewater_amount < 0 {
 		dewater_amount = 0
 	}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3486,7 +3486,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 {
 
 			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 {
 				dewater_amount = dewater_amount * 1000

controllers/patient_api_controller.go

@@ -533,6 +533,7 @@ func (c *PatientApiController) CreatePatient() {
 		AllergicHistory:              patient.AllergicHistory,
 		PatientAddress:               patient.PatientAddress,
 		PrintDate:                    patient.PrintDate,
+		FamalityRecord:               patient.FamalityRecord,
 	}
 	patientsNew.FirstLetter = firstLetter
 
@@ -774,6 +775,7 @@ func (c *PatientApiController) EditPatient() {
 		AllergicHistory:           patient.AllergicHistory,
 		PatientAddress:            patient.PatientAddress,
 		PrintDate:                 patient.PrintDate,
+		FamalityRecord:            patient.FamalityRecord,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -6065,6 +6067,11 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		patient.PatientAddress = patient_address
 	}
 
+	if patientBody["famality_record"] != nil && reflect.TypeOf(patientBody["famality_record"]).String() == "string" {
+		famality_record := patientBody["famality_record"].(string)
+		patient.FamalityRecord = famality_record
+	}
+
 	if patientBody["print_date"] != nil && reflect.TypeOf(patientBody["print_date"]).String() == "string" {
 		print_date := patientBody["print_date"].(string)
 		printDateTime, err := time.ParseInLocation(timeLayout, print_date, loc)

models/patient_models.go

@@ -233,6 +233,7 @@ type Patients struct {
 	PatientAddress           string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
 	FirstLetter              string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	PrintDate                int64   `gorm:"column:print_date" json:"print_date" form:"print_date"`
+	FamalityRecord           string  `gorm:"column:famality_record" json:"famality_record" form:"famality_record"`
 }
 
 func (Patients) TableName() string {
@@ -862,6 +863,7 @@ type XtPatientsNew struct {
 	PatientAddress               string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
 	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	PrintDate                    int64   `gorm:"column:print_date" json:"print_date" form:"print_date"`
+	FamalityRecord               string  `gorm:"column:famality_record" json:"famality_record" form:"famality_record"`
 }
 
 func (XtPatientsNew) TableName() string {