Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/new_mobile_api_controllers/mobile_regist_controller.go

 		ids = append(ids, item.ID)
 	}
 
+	//创建两个血透的虚拟病人到新表
+	fmt.Print("patients", patients)
+	for _, it := range patients {
+		patientsNew := models.XtPatientsNew{
+			UserOrgId:     org.Id,
+			CreatedTime:   time.Now().Unix(),
+			UpdatedTime:   time.Now().Unix(),
+			Status:        1,
+			BloodId:       it.ID,
+			BloodPatients: 1,
+		}
+		service.CreateVMOrgNewPatient(&patientsNew)
+		ids = append(ids, it.ID)
+	}
 	//创建1个分组
 	vmGroup := &models.VMDeviceGroup{
 		OrgId:  org.Id,

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

 	fmt.Print("机构ID", orgId)
 	phone := this.GetString("phone")
 	_, errcode := service.GetBloodPatientInfo(orgId, phone)
-	fmt.Print("errcode-----------------", errcode)
+	fmt.Print("errcode", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		returnData := make(map[string]interface{}, 0)
 		returnData["msg"] = "ok"
 	phone := this.GetString("phone")
 	fmt.Print("phone", phone)
 	_, errcode := service.GetSlowPatientInfo(orgId, phone)
-	fmt.Print("errcode -----------------------", errcode)
+	fmt.Print("errcode", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		returnData := make(map[string]interface{}, 0)
 		returnData["msg"] = "ok"
 	phone := this.GetString("phone")
 	fmt.Print("phone", phone)
 	_, errcode := service.GetMemberPatientInfo(orgId, phone)
-	fmt.Print("errcode --------------", errcode)
+	fmt.Print("errcode", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		returnData := make(map[string]interface{}, 0)
 		returnData["msg"] = "ok"
 								MemberTreatement:  treatmentmethod,
 							}
 							err = service.CreateNewPatient(&patientsNew)
-							fmt.Print("报错-----------------------", err)
+							fmt.Print("报错", err)
 							if err != nil {
 								this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 								return
 
 func (this *NewDialysisApiController) GetEducationDetail() {
 	id, _ := this.GetInt64("id")
-	fmt.Print("id----------", id)
+	fmt.Print("id", id)
 	education, err := service.GetEducationDetailOne(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 
 func (this *NewDialysisApiController) GetRescueRecordDetail() {
 	id, _ := this.GetInt64("id")
-	fmt.Print("id========", id)
 	recordDetail, err := service.GetRescueRecordDetail(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 }
 
 func (this *NewDialysisApiController) GetDoctorAdviceDetail() {
+
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
 	appid := adminUser.App.Id
 }
 
 func (this *NewDialysisApiController) UpdatedPatient() {
+
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
 	fmt.Print("机构ID", orgid)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Print("err", err)
+	id := int64(dataBody["id"].(float64))
+	fmt.Print("id", id)
 	name := dataBody["name"].(string)
 	fmt.Println("姓名", name)
 	sex := int64(dataBody["sex"].(float64))
 	fmt.Print("病种", patient_type)
 	treatmentmethod := int64(dataBody["treatmentMethod"].(float64))
 	fmt.Print("治疗方式", treatmentmethod)
+
+	//如果是血透病人
+	if bloodPatient == 1 {
+		//根据新表ID获取老表病人ID
+		patient, _ := service.GetNewPatient(id)
+		patients := models.Patients{
+			Name:              name,
+			Gender:            sex,
+			Birthday:          birth,
+			Age:               ages,
+			Phone:             phone,
+			Lapseto:           lapseto,
+			AdmissionNumber:   adminssionNumber,
+			FirstDialysisDate: fisttime,
+			Diagnose:          diagonse,
+			Source:            patientsoure,
+			DialysisNo:        dialysis,
+			UserOrgId:         orgid,
+			Status:            1,
+			CreatedTime:       time.Now().Unix(),
+			Avatar:            avatar,
+			IdCardNo:          idCard,
+			IsInfectious:      is_infectious,
+		}
+		err := service.UpdatedPatient(patients, patient.BloodId)
+		patientsNew := models.XtPatientsNew{
+			ID:                id,
+			Name:              name,
+			Gender:            sex,
+			Birthday:          birth,
+			Age:               ages,
+			Phone:             phone,
+			Lapseto:           lapseto,
+			AdmissionNumber:   adminssionNumber,
+			FirstDialysisDate: fisttime,
+			Diagnose:          diagonse,
+			Source:            patientsoure,
+			DialysisNo:        dialysis,
+			UserOrgId:         orgid,
+			Status:            1,
+			CreatedTime:       time.Now().Unix(),
+			Avatar:            avatar,
+			IdCardNo:          idCard,
+			IsInfectious:      is_infectious,
+		}
+		err = service.UpdateXtPatientNew(patientsNew, id)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patients": patientsNew,
+		})
+	}
+	if slowpatient == 1 {
+		patient, _ := service.GetNewPatient(id)
+		patients := models.CdmPatients{
+			Name:        name,
+			Gender:      sex,
+			Birthday:    birth,
+			Phone:       phone,
+			Diagnose:    diagonse,
+			Source:      patientsoure,
+			UserOrgId:   orgid,
+			Status:      1,
+			CreatedTime: time.Now().Unix(),
+			Avatar:      avatar,
+			IdCardNo:    idCard,
+		}
+		err := service.UpdateCustomer(patients, patient.SlowId)
+		fmt.Print("更新慢病患者失败", err)
+		xtPatientsNew := models.XtPatientsNew{
+			ID:                id,
+			Name:              name,
+			Gender:            sex,
+			Birthday:          birth,
+			Age:               ages,
+			Phone:             phone,
+			Lapseto:           lapseto,
+			AdmissionNumber:   adminssionNumber,
+			FirstDialysisDate: fisttime,
+			Diagnose:          diagonse,
+			Source:            patientsoure,
+			DialysisNo:        dialysis,
+			UserOrgId:         orgid,
+			Status:            1,
+			CreatedTime:       time.Now().Unix(),
+			Avatar:            avatar,
+			MemberPatients:    memberpatient,
+			BloodPatients:     bloodPatient,
+			SlowPatients:      slowpatient,
+			IsInfectious:      is_infectious,
+			IdCardNo:          idCard,
+			EquitmentId:       requipmentId,
+		}
+		err = service.UpdateXtPatientNew(xtPatientsNew, id)
+		fmt.Print("更新失败", err)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patients": xtPatientsNew,
+		})
+	}
+
+	if memberpatient == 1 {
+		patient, _ := service.GetNewPatient(id)
+		customer := models.SgjUserCustomer{
+			Name:        name,
+			UserOrgId:   orgid,
+			Mobile:      phone,
+			Gender:      sex,
+			Birthday:    birth,
+			IllDate:     memtime,
+			Status:      1,
+			CreatedTime: time.Now().Unix(),
+			Avatar:      avatar,
+			IllnessId:   patient_type,
+			TreatType:   treatmentmethod,
+		}
+		err := service.UpdatedCustomer(customer, patient.MemberId)
+
+		fmt.Print("更新失败", err)
+		patientsNew := models.XtPatientsNew{
+			ID:                id,
+			Name:              name,
+			Gender:            sex,
+			Birthday:          birth,
+			Age:               ages,
+			Phone:             phone,
+			Lapseto:           lapseto,
+			AdmissionNumber:   adminssionNumber,
+			FirstDialysisDate: fisttime,
+			Diagnose:          diagonse,
+			Source:            patientsoure,
+			DialysisNo:        dialysis,
+			UserOrgId:         orgid,
+			Status:            1,
+			CreatedTime:       time.Now().Unix(),
+			Avatar:            avatar,
+			MemberPatients:    memberpatient,
+			BloodPatients:     bloodPatient,
+			SlowPatients:      slowpatient,
+			IsInfectious:      is_infectious,
+			IdCardNo:          idCard,
+			MemberFistdate:    memtime,
+			MemberPatienttype: patient_type,
+			MemberTreatement:  treatmentmethod,
+		}
+		err = service.UpdateXtPatientNew(patientsNew, id)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patients": patientsNew,
+		})
+	}
 }

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

 	beego.Router("/m/api/patient/getdialysisrecord", &NewDialysisApiController{}, "Get:GetDialysisrecord")
 	beego.Router("/m/api/patient/getdoctoradvicedetail", &NewDialysisApiController{}, "Get:GetDoctorAdviceDetail")
 	beego.Router("/m/api/patient/deletemanagement", &NewDialysisApiController{}, "Delete:DeleteManagement")
+	beego.Router("/m/api/patient/updatedpatient", &NewDialysisApiController{}, "Post:UpdatedPatient")
 
 }

service/patientmanage_service.go

 }
 
 func SearchallPatient(keyword string, orgid int64) (patients []*models.XtPatientsNew, err error) {
-	likeKey := "%" + keyword + "%"
-	err = XTReadDB().Where("name like ? or dialysis_no = ? and user_org_id = ?", likeKey, keyword, orgid).Find(&patients).Error
+	db := XTReadDB().Table("xt_patients_new as x").Where("x.status = 1")
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ?", likeKey, likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.user_org_id,x.user_id,x.avatar,x.patient_type,x.dialysis_no,x.admission_number,x.source,x.lapseto,x.partition_id,x.bed_id,x.name,x.alias,x.gender,x.marital_status,x.id_card_no,x.birthday,x.reimbursement_way_id,x.health_care_type,x.health_care_no,x.health_care_due_date,x.height,x.blood_type,x.rh,x.health_care_due_alert_date,x.education_level,x.profession,x.phone,x.home_telephone,x.relative_phone,x.relative_relations,x.home_address,x.work_unit,x.unit_address,x.children,x.receiving_date,x.is_hospital_first_dialysis,x.first_dialysis_date,x.first_dialysis_hospital,x.predialysis_condition,x.pre_hospital_dialysis_frequency,x.pre_hospital_dialysis_times,x.hospital_first_dialysis_date,x.induction_period,x.initial_dialysis,x.total_dialysis,x.attending_doctor_id,x.head_nurse_id,x.evaluate,x.diagnose,x.remark,x.registrars_id,x.registrars,x.qr_code,x.binding_state,x.patient_complains,x.present_history,x.past_history,x.temperature,x.pulse,x.respiratory,x.sbp,x.dbp,x.status,x.created_time,x.updated_time,x.nation,x.native_place,x.age,x.infectious_next_record_time,x.is_infectious,x.remind_cycle,x.response_result,x.is_open_remind,x.first_treatment_date,x.dialysis_age,x.expense_kind,x.tell_phone,x.contact_name,x.blood_patients,x.slow_patients,x.member_patients,x.ecommer_patients,x.blood_id,x.slow_id,x.member_id,x.member_fistdate,x.member_patienttype,x.member_treatement,x.equitment_id").Find(&patients).Error
 	return patients, err
 }
 
 func GetSearchallBlood(keyword string, orgid int64) (patients []*models.XtPatientsNew, err error) {
-	likeKey := "%" + keyword + "%"
-	err = XTReadDB().Where("name like ? or dialysis_no = ? and user_org_id = ? and blood_patients = 1", likeKey, keyword, orgid).Find(&patients).Error
+
+	db := XTReadDB().Table("xt_patients_new as x").Where("x.status = 1 and x.blood_patients = 1")
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ?", likeKey, likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.user_org_id,x.user_id,x.avatar,x.patient_type,x.dialysis_no,x.admission_number,x.source,x.lapseto,x.partition_id,x.bed_id,x.name,x.alias,x.gender,x.marital_status,x.id_card_no,x.birthday,x.reimbursement_way_id,x.health_care_type,x.health_care_no,x.health_care_due_date,x.height,x.blood_type,x.rh,x.health_care_due_alert_date,x.education_level,x.profession,x.phone,x.home_telephone,x.relative_phone,x.relative_relations,x.home_address,x.work_unit,x.unit_address,x.children,x.receiving_date,x.is_hospital_first_dialysis,x.first_dialysis_date,x.first_dialysis_hospital,x.predialysis_condition,x.pre_hospital_dialysis_frequency,x.pre_hospital_dialysis_times,x.hospital_first_dialysis_date,x.induction_period,x.initial_dialysis,x.total_dialysis,x.attending_doctor_id,x.head_nurse_id,x.evaluate,x.diagnose,x.remark,x.registrars_id,x.registrars,x.qr_code,x.binding_state,x.patient_complains,x.present_history,x.past_history,x.temperature,x.pulse,x.respiratory,x.sbp,x.dbp,x.status,x.created_time,x.updated_time,x.nation,x.native_place,x.age,x.infectious_next_record_time,x.is_infectious,x.remind_cycle,x.response_result,x.is_open_remind,x.first_treatment_date,x.dialysis_age,x.expense_kind,x.tell_phone,x.contact_name,x.blood_patients,x.slow_patients,x.member_patients,x.ecommer_patients,x.blood_id,x.slow_id,x.member_id,x.member_fistdate,x.member_patienttype,x.member_treatement,x.equitment_id").Find(&patients).Error
 	return patients, err
 }
 
 func GetSlowSearchePatient(keyword string, orgid int64) (patients []*models.XtPatientsNew, err error) {
-	likeKey := "%" + keyword + "%"
-	err = XTReadDB().Where("name like ? or dialysis_no = ? and user_org_id = ? and slow_patients = 1", likeKey, keyword, orgid).Find(&patients).Error
+
+	db := XTReadDB().Table("xt_patients_new as x").Where("x.status = 1 and x.slow_patients = 1")
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ?", likeKey, likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.user_org_id,x.user_id,x.avatar,x.patient_type,x.dialysis_no,x.admission_number,x.source,x.lapseto,x.partition_id,x.bed_id,x.name,x.alias,x.gender,x.marital_status,x.id_card_no,x.birthday,x.reimbursement_way_id,x.health_care_type,x.health_care_no,x.health_care_due_date,x.height,x.blood_type,x.rh,x.health_care_due_alert_date,x.education_level,x.profession,x.phone,x.home_telephone,x.relative_phone,x.relative_relations,x.home_address,x.work_unit,x.unit_address,x.children,x.receiving_date,x.is_hospital_first_dialysis,x.first_dialysis_date,x.first_dialysis_hospital,x.predialysis_condition,x.pre_hospital_dialysis_frequency,x.pre_hospital_dialysis_times,x.hospital_first_dialysis_date,x.induction_period,x.initial_dialysis,x.total_dialysis,x.attending_doctor_id,x.head_nurse_id,x.evaluate,x.diagnose,x.remark,x.registrars_id,x.registrars,x.qr_code,x.binding_state,x.patient_complains,x.present_history,x.past_history,x.temperature,x.pulse,x.respiratory,x.sbp,x.dbp,x.status,x.created_time,x.updated_time,x.nation,x.native_place,x.age,x.infectious_next_record_time,x.is_infectious,x.remind_cycle,x.response_result,x.is_open_remind,x.first_treatment_date,x.dialysis_age,x.expense_kind,x.tell_phone,x.contact_name,x.blood_patients,x.slow_patients,x.member_patients,x.ecommer_patients,x.blood_id,x.slow_id,x.member_id,x.member_fistdate,x.member_patienttype,x.member_treatement,x.equitment_id").Find(&patients).Error
 	return patients, err
 }
 
 func GetMemberSearchPatient(keyword string, orgid int64) (patients []*models.XtPatientsNew, err error) {
-	likeKey := "%" + keyword + "%"
-	err = XTReadDB().Where("name like ? or dialysis_no = ? and user_org_id = ? and member_patients = 1", likeKey, keyword, orgid).Find(&patients).Error
+	db := XTReadDB().Table("xt_patients_new as x").Where("x.status = 1 and x.member_patients = 1")
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("x.name LIKE ? OR x.dialysis_no LIKE ?", likeKey, likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.user_org_id,x.user_id,x.avatar,x.patient_type,x.dialysis_no,x.admission_number,x.source,x.lapseto,x.partition_id,x.bed_id,x.name,x.alias,x.gender,x.marital_status,x.id_card_no,x.birthday,x.reimbursement_way_id,x.health_care_type,x.health_care_no,x.health_care_due_date,x.height,x.blood_type,x.rh,x.health_care_due_alert_date,x.education_level,x.profession,x.phone,x.home_telephone,x.relative_phone,x.relative_relations,x.home_address,x.work_unit,x.unit_address,x.children,x.receiving_date,x.is_hospital_first_dialysis,x.first_dialysis_date,x.first_dialysis_hospital,x.predialysis_condition,x.pre_hospital_dialysis_frequency,x.pre_hospital_dialysis_times,x.hospital_first_dialysis_date,x.induction_period,x.initial_dialysis,x.total_dialysis,x.attending_doctor_id,x.head_nurse_id,x.evaluate,x.diagnose,x.remark,x.registrars_id,x.registrars,x.qr_code,x.binding_state,x.patient_complains,x.present_history,x.past_history,x.temperature,x.pulse,x.respiratory,x.sbp,x.dbp,x.status,x.created_time,x.updated_time,x.nation,x.native_place,x.age,x.infectious_next_record_time,x.is_infectious,x.remind_cycle,x.response_result,x.is_open_remind,x.first_treatment_date,x.dialysis_age,x.expense_kind,x.tell_phone,x.contact_name,x.blood_patients,x.slow_patients,x.member_patients,x.ecommer_patients,x.blood_id,x.slow_id,x.member_id,x.member_fistdate,x.member_patienttype,x.member_treatement,x.equitment_id").Find(&patients).Error
 	return patients, err
 }
 
 	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("groupno=? and user_org_id = ?", groupid, orgid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
 	return err
 }
+
+func GetNewPatient(id int64) (models.XtPatientsNew, error) {
+	patientsNew := models.XtPatientsNew{}
+	err := XTReadDB().Model(&patientsNew).Where("id=?", id).Find(&patientsNew).Error
+	return patientsNew, err
+}
+
+func UpdatedPatient(patients models.Patients, id int64) error {
+
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious}).Error
+
+	return err
+}
+
+func UpdateXtPatientNew(patients models.XtPatientsNew, id int64) error {
+
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious}).Error
+
+	return err
+}
+
+func UpdateCustomer(cdmpatient models.CdmPatients, id int64) error {
+
+	err := PatientWriteDB().Model(&cdmpatient).Where("id=?", id).Update(map[string]interface{}{"name": cdmpatient.Name, "phone": cdmpatient.Phone, "gender": cdmpatient.Gender, "birthday": cdmpatient.Birthday, "diagnose": cdmpatient.Diagnose, "source": cdmpatient.Source, "avatar": cdmpatient.Avatar, "id_card_no": cdmpatient.IdCardNo, "updated_time": cdmpatient.UpdatedTime}).Error
+	return err
+}
+
+func UpdatedCustomer(customer models.SgjUserCustomer, id int64) error {
+
+	err := UserWriteDB().Model(&customer).Where("id = ?", id).Update(map[string]interface{}{"name": customer.Name, "mobile": customer.Mobile, "gender": customer.Gender, "birthday": customer.Birthday, "ill_date": customer.IllDate, "avatar": customer.Avatar, "illness_id": customer.IllnessId, "treat_type": customer.TreatType}).Error
+	return err
+}

service/vm_service.go

 	writeDb.Model(&models.VMOrgPatients{}).Create(&patients)
 }
 
+func CreateVMOrgNewPatient(patientsNew *models.XtPatientsNew) {
+	writeDb.Model(&models.XtPatientsNew{}).Create(&patientsNew)
+}
+
 func CreateVMZone(zone *models.VMDeviceZone) {
 	writeDb.Model(&models.VMDeviceZone{}).Create(&zone)
 }