更新数据

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 

controllers/patient_api_controller.go

@@ -183,16 +183,16 @@ func (c *PatientApiController) CreatePatient() {
 	remind_cycle, _ := c.GetInt64("remind_cycle")
 
 	adminUserInfo := c.GetAdminUserInfo()
-	patientTotal := service.GetLapsetoPatientCount(adminUserInfo.CurrentOrgId, 1)
+	//patientTotal := service.GetLapsetoPatientCount(adminUserInfo.CurrentOrgId, 1)
 
-	subscibes := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
-	if subscibes.State == 2 && patientTotal >= 20 { //免费试用版，不过期，限制患者数20
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
-		return
-	} else if subscibes.State == 1 && patientTotal >= 60 { //标准版，不过期，限制患者数60
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
-		return
-	}
+	//subscibes := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
+	//if subscibes.State == 2 && patientTotal >= 20 { //免费试用版，不过期，限制患者数20
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
+	//	return
+	//} else if subscibes.State == 1 && patientTotal >= 60 { //标准版，不过期，限制患者数60
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
+	//	return
+	//}
 
 	var patient models.Patients
 	contagions, diseases, code, formItems := patientFormData(&patient, c.Ctx.Input.RequestBody, "create")
@@ -234,6 +234,7 @@ func (c *PatientApiController) CreatePatient() {
 	// patient.Lapseto = 1
 
 	err := service.CreatePatient(&patient, contagions, diseases)
+	fmt.Println("创建病人失败---------------------------------------------err")
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePatient)
 		return
@@ -242,29 +243,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             0,
-		Avatar:             patients.Avatar,
-		PatientType:        patients.PatientType,
-		DialysisNo:         patients.DialysisNo,
-		AdmissionNumber:    patients.AdmissionNumber,
-		Source:             patients.Source,
-		Lapseto:            patients.Lapseto,
-		PartitionId:        patients.PartitionId,
-		BedId:              patients.BedId,
-		Name:               patients.Name,
-		Alias:              patients.Alias,
-		Gender:             patients.Gender,
-		MaritalStatus:      patients.MaritalStatus,
-		IdCardNo:           patients.IdCardNo,
-		Birthday:           patients.Birthday,
-		ReimbursementWayId: patients.ReimbursementWayId,
-		HealthCareType:     patients.HealthCareType,
-		HealthCareNo:       patients.HealthCareNo,
-		HealthCareDueDate:  patients.HealthCareDueDate,
-		Height:             patients.Height,
-		BloodType:          patients.BloodType,
-		Rh:                 patients.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       0,
+		Avatar:                       patients.Avatar,
+		PatientType:                  patients.PatientType,
+		DialysisNo:                   patients.DialysisNo,
+		AdmissionNumber:              patients.AdmissionNumber,
+		Source:                       patients.Source,
+		Lapseto:                      patients.Lapseto,
+		PartitionId:                  patients.PartitionId,
+		BedId:                        patients.BedId,
+		Name:                         patients.Name,
+		Alias:                        patients.Alias,
+		Gender:                       patients.Gender,
+		MaritalStatus:                patients.MaritalStatus,
+		IdCardNo:                     patients.IdCardNo,
+		Birthday:                     patients.Birthday,
+		ReimbursementWayId:           patients.ReimbursementWayId,
+		HealthCareType:               patients.HealthCareType,
+		HealthCareNo:                 patients.HealthCareNo,
+		HealthCareDueDate:            patients.HealthCareDueDate,
+		Height:                       patients.Height,
+		BloodType:                    patients.BloodType,
+		Rh:                           patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -310,27 +311,27 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
-		IsInfectious:             patients.IsInfectious,
-		RemindCycle:              patients.RemindCycle,
-		ResponseResult:           patients.ResponseResult,
-		IsOpenRemind:             patients.IsOpenRemind,
-		FirstTreatmentDate:       patients.FirstTreatmentDate,
-		DialysisAge:              patients.DialysisAge,
-		ExpenseKind:              patients.ExpenseKind,
-		TellPhone:                patients.TellPhone,
-		ContactName:              patients.ContactName,
-		BloodPatients:            1,
-		SlowPatients:             0,
-		MemberPatients:           0,
-		EcommerPatients:          "",
-		BloodId:                  patients.ID,
-		SlowId:                   0,
-		MemberId:                 0,
-		MemberFistdate:           0,
-		MemberPatienttype:        0,
-		MemberTreatement:         0,
-		EquitmentId:              "",
+		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
+		IsInfectious:                 patients.IsInfectious,
+		RemindCycle:                  patients.RemindCycle,
+		ResponseResult:               patients.ResponseResult,
+		IsOpenRemind:                 patients.IsOpenRemind,
+		FirstTreatmentDate:           patients.FirstTreatmentDate,
+		DialysisAge:                  patients.DialysisAge,
+		ExpenseKind:                  patients.ExpenseKind,
+		TellPhone:                    patients.TellPhone,
+		ContactName:                  patients.ContactName,
+		BloodPatients:                1,
+		SlowPatients:                 0,
+		MemberPatients:               0,
+		EcommerPatients:              "",
+		BloodId:                      patients.ID,
+		SlowId:                       0,
+		MemberId:                     0,
+		MemberFistdate:               0,
+		MemberPatienttype:            0,
+		MemberTreatement:             0,
+		EquitmentId:                  "",
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -411,6 +412,7 @@ func (c *PatientApiController) CreatePatient() {
 //EditPatient 修改
 func (c *PatientApiController) EditPatient() {
 	id, _ := c.GetInt64("id", 0)
+
 	record_date := c.GetString("record_date")
 	is_infectious, _ := c.GetInt64("is_infectious")
 	remind_cycle, _ := c.GetInt64("remind_cycle")
@@ -455,6 +457,87 @@ func (c *PatientApiController) EditPatient() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
 		return
 	}
+	fmt.Println("病人--------------------------------------------------------------", patient.Name, patient.Age)
+	patientsNew := models.XtPatientsNew{
+		UserOrgId:                 patient.UserOrgId,
+		UserId:                    patient.UserId,
+		Avatar:                    patient.Avatar,
+		PatientType:               patient.PatientType,
+		DialysisNo:                patient.DialysisNo,
+		AdmissionNumber:           patient.AdmissionNumber,
+		Source:                    patient.Source,
+		Lapseto:                   patient.Lapseto,
+		PartitionId:               patient.PartitionId,
+		BedId:                     patient.BedId,
+		Name:                      patient.Name,
+		Alias:                     patient.Alias,
+		Gender:                    patient.Gender,
+		MaritalStatus:             patient.MaritalStatus,
+		IdCardNo:                  patient.IdCardNo,
+		Birthday:                  patient.Birthday,
+		ReimbursementWayId:        patient.ReimbursementWayId,
+		HealthCareType:            patient.HealthCareType,
+		HealthCareNo:              patient.HealthCareNo,
+		HealthCareDueDate:         patient.HealthCareDueDate,
+		Height:                    patient.Height,
+		BloodType:                 patient.BloodType,
+		Rh:                        patient.Rh,
+		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
+		EducationLevel:            patient.EducationLevel,
+		Profession:                patient.Profession,
+		Phone:                     patient.Phone,
+		HomeTelephone:             patient.HomeTelephone,
+		RelativePhone:             patient.RelativePhone,
+		RelativeRelations:         patient.RelativeRelations,
+		HomeAddress:               patient.HomeAddress,
+		WorkUnit:                  patient.WorkUnit,
+		UnitAddress:               patient.UnitAddress,
+		Children:                  patient.Children,
+		ReceivingDate:             patient.ReceivingDate,
+		IsHospitalFirstDialysis:   patient.IsHospitalFirstDialysis,
+		FirstDialysisDate:         patient.FirstDialysisDate,
+		FirstDialysisHospital:     patient.FirstDialysisHospital,
+		PredialysisCondition:      patient.PredialysisCondition,
+		PreHospitalDialysisTimes:  patient.PreHospitalDialysisTimes,
+		HospitalFirstDialysisDate: patient.HospitalFirstDialysisDate,
+		InductionPeriod:           patient.InductionPeriod,
+		InitialDialysis:           patient.InitialDialysis,
+		TotalDialysis:             patient.TotalDialysis,
+		AttendingDoctorId:         patient.AttendingDoctorId,
+		HeadNurseId:               patient.HeadNurseId,
+		Evaluate:                  patient.Evaluate,
+		Diagnose:                  patient.Diagnose,
+		Remark:                    patient.Remark,
+		RegistrarsId:              patient.RegistrarsId,
+		Registrars:                patient.Registrars,
+		QrCode:                    patient.QrCode,
+		BindingState:              patient.BindingState,
+		PatientComplains:          patient.PatientComplains,
+		PresentHistory:            patient.PresentHistory,
+		PastHistory:               patient.PastHistory,
+		Temperature:               patient.Temperature,
+		Pulse:                     patient.Pulse,
+		Respiratory:               patient.Respiratory,
+		Sbp:                       patient.SBP,
+		Dbp:                       patient.DBP,
+		Nation:                    patient.Nation,
+		NativePlace:               patient.NativePlace,
+		Age:                       patient.Age,
+		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
+		IsInfectious:              patient.IsInfectious,
+		RemindCycle:               patient.RemindCycle,
+		ResponseResult:            patient.ResponseResult,
+		IsOpenRemind:              patient.IsOpenRemind,
+		FirstTreatmentDate:        patient.FirstTreatmentDate,
+		DialysisAge:               patient.DialysisAge,
+		ExpenseKind:               patient.ExpenseKind,
+		TellPhone:                 patient.TellPhone,
+		ContactName:               patient.ContactName,
+		UpdatedTime:               time.Now().Unix(),
+	}
+	//	//更新病人ID获取新表病人ID
+	err = service.UpdatepatientTwo(&patientsNew, id)
+	fmt.Println("更新病人失败---------------------------------------", err)
 
 	if len(record_date) > 0 {
 		var recordTime int64
@@ -587,17 +670,17 @@ func (c *PatientApiController) EditLapseto() {
 	lapseto.Status = 1
 	patient.Lapseto = lapseto.LapsetoType
 
-	if patient.Lapseto == 1 {
-		patientTotal := service.GetLapsetoPatientCount(adminUserInfo.CurrentOrgId, 1)
-		subscibes := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
-		if subscibes.State == 2 && patientTotal >= 100 { //免费试用版，不过期，限制患者数20
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
-			return
-		} else if subscibes.State == 1 && patientTotal >= 200 { //标准版，不过期，限制患者数60
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
-			return
-		}
-	}
+	//if patient.Lapseto == 1 {
+	//	patientTotal := service.GetLapsetoPatientCount(adminUserInfo.CurrentOrgId, 1)
+	//	subscibes := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
+	//	if subscibes.State == 2 && patientTotal >= 100 { //免费试用版，不过期，限制患者数20
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
+	//		return
+	//	} else if subscibes.State == 1 && patientTotal >= 200 { //标准版，不过期，限制患者数60
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientReachLimit)
+	//		return
+	//	}
+	//}
 
 	err = service.EditPatientLapseto(&patient, &lapseto)
 	if err != nil {

service/patient_service.go

@@ -67,7 +67,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	offset := (page - 1) * limit
 
-	err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
 }
 
@@ -122,6 +122,13 @@ func FindPatientById(orgID int64, id int64) (patient models.Patients, err error)
 	err = readDb.Model(&models.Patients{}).Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
 	return
 }
+
+func FindPatientByIdTwo(orgID int64, id int64) (patient models.XtPatientsNew, err error) {
+
+	err = readDb.Model(&models.XtPatientsNew{}).Where("blood_id = ? and user_org_id = ? and status =1", id, orgID).First(&patient).Error
+	return
+}
+
 func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Preload("Contagions", "status = 1").Preload("Diseases", "status = 1").Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
 	return
@@ -373,6 +380,13 @@ func UpdatePatient(patient *models.Patients, contagions []int64, diseases []int6
 	return
 }
 
+func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
+
+	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients}).Error
+	return err
+}
+
 func GetLastInfectionRecord(id int64, org_id int64, project_id int64, date int64) (inspection models.Inspection, err error) {
 	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and status=1 and org_id = ? and project_id = ? AND inspect_date = ? ", id, org_id, project_id, date).Last(&inspection).Error
 	return

service/patientmanage_service.go

@@ -1254,7 +1254,7 @@ func GetAdminName(id int64) (models.AdminUsers, error) {
 	db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)
-	err := db.Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id").Scan(&user).Error
+	err := db.Group("x.id").Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id").Scan(&user).Error
 	return user, err
 }