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

conf/app.conf

 writesgjpatientmysqlname = sgj_patient
 
 
+readpatienthost = shengws1.mysql.rds.aliyuncs.com
+readpatientport = 3306
+readpatientuser = syh
+readpatientpass = xhPECP2nFObR8aUK
+readpatientname = sgj_cdm
+
+writepatienthost = shengws1.mysql.rds.aliyuncs.com
+writepatientport = 3306
+writepatientuser = syh
+writepatientpass = xhPECP2nFObR8aUK
+writepatientname = sgj_cdm
 
 redishost = 349e580b2a524290.redis.rds.aliyuncs.com
 redisport = 6379

controllers/manage_api_controller.go

 	//查询机位号是否绑定设备
 	thisAddmacher, err := service.GetEquitmentByBedID(bed_number, orgid)
 	if thisAddmacher.ID > 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisNoExist)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEquitNoExist)
 		return
 	}
 
 	}
 	fmt.Println("ids", ids)
 	//service.GetModeName(unit_type)
+	thisAddmacher, err := service.GetEquitmentByBedID(bed_number, orgid)
+	if thisAddmacher.ID > 0 && thisAddmacher.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisNoExist)
+		return
+	}
 	addmacher := models.DeviceAddmacher{
 		ID:                  id,
 		SerialNumber:        serial_number,
 	//fmt.Println("基表消毒液", machinedisinfectant)
 
 	disinfectantway := int64(dataBody["disinfectant_way"].(float64))
-	//	fmt.Println("液路消毒方式", disinfectantway)
+	fmt.Println("液路消毒方式", disinfectantway)
 
 	disinfectant := int64(dataBody["disinfectant"].(float64))
 	//fmt.Println("液路消毒液", disinfectant)
 	//fmt.Println("签名", sign_name)
 
 	information, errinfor := service.GetInformation(eid, startdate, orgid)
-	fmt.Print("errinfor---------------------", errinfor)
+	fmt.Print("errinfor", errinfor)
 	fmt.Print("information", information)
 	if errinfor == gorm.ErrRecordNotFound {
 		infor := models.DeviceInformation{
-			Date:                  startdate,
-			Class:                 classtype,
-			Zone:                  zone,
+			Date:  startdate,
+			Class: classtype,
+			//	Zone:                  zone,
 			BedNumber:             bednumber,
 			PatientId:             patient_time,
 			Contagion:             contagion,
 	fmt.Println("清洁", clean)
 	sign_name := int64(dataBody["sign_name"].(float64))
 	fmt.Println("签名", sign_name)
+	equitment_id := int64(dataBody["equiment_id"].(float64))
+	fmt.Println("设备ID", equitment_id)
 
+	addmacher := models.DeviceAddmacher{
+		BedId: bednumber,
+	}
+	//更新床位号
+	err = service.UpdateAddMacherBedID(equitment_id, orgid, &addmacher)
+	fmt.Println("更新设备失败", err)
+	//更新区号
+	deviceNumber := models.DeviceNumber{
+		ZoneID: zone,
+	}
+	err = service.UpdatedZoneID(bednumber, orgid, &deviceNumber)
+	fmt.Println("更新区号失败---", err)
 	information := models.DeviceInformation{
 		Date:                  startdate,
 		Class:                 classtype,
 	fmt.Println("id", id)
 	addmacher, err := service.GetZoneForm(id)
 	bed, err := service.GetZoneId(addmacher.BedId, orgId)
+
 	number, err := service.GetBedForm(bed.ZoneID)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")
 func (this *MachineApiController) DeleteImages() {
 	id, _ := this.GetInt64("id")
 	err := service.DeleteImages(id)
-	fmt.Print("err", err)
+	fmt.Print("err========", err)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
 		return

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

 	treatmentmethod := int64(dataBody["treatmentMethod"].(float64))
 	fmt.Print("治疗方式", treatmentmethod)
 
+	//查询身份证号码是否存在
+	thisPatientOne, _ := service.FindPatientByIdCardNoOne(orgid, idCard)
+	if thisPatientOne.ID > 0 {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "身份证号码已存在"
+		this.ServeSuccessJSON(returnData)
+		return
+	}
+
+	//查询手机号码是否存在
+	thisPatient, err := service.FindPatientByMobileOne(phone, orgid)
+	if thisPatient.ID > 0 {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "手机号码已存在"
+		this.ServeSuccessJSON(returnData)
+		return
+	}
 	//如果是血透病人
 	if bloodPatient == 1 {
-		//查询身份证号码是否存在
-		thisPatientOne, _ := service.FindPatientByIdCardNoOne(orgid, idCard)
-		if thisPatientOne.ID > 0 {
-			returnData := make(map[string]interface{}, 0)
-			returnData["msg"] = "身份证号码已存在"
-			this.ServeSuccessJSON(returnData)
-			return
-		}
-
-		//查询手机号码是否存在
-		thisPatient, err := service.FindPatientByMobileOne(phone, orgid)
-		if thisPatient.ID > 0 {
-			returnData := make(map[string]interface{}, 0)
-			returnData["msg"] = "手机号码已存在"
-			this.ServeSuccessJSON(returnData)
-			return
-		}
-
 		//查询透析号是否存在
 		thisPatientTwo, _ := service.FindPatientByDialysisNoOne(orgid, dialysis)
 		if thisPatientTwo.ID > 0 {
 			MemberPatienttype: patient_type,
 			MemberTreatement:  treatmentmethod,
 		}
-		err = service.UpdateXtPatientNew(patientsNew, id)
+		err = service.UpdateXtPatientNewOne(patientsNew, id)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return

enums/error_code.go

 	ErrorCodeDelScheduleFailByDialysis      = 1041
 	ErrorCodeNotSelectLapsetoType           = 1042
 	ErrorCodeNotSelectLapsetoTime           = 1043
+	ErrorCodeEquitNoExist                   = 1045
 
 	ErrorCodeInspectionDateExit    = 1201
 	ErrorCodeInspectionAddFail     = 1202

service/manage_service.go

 	return information, err
 }
 
+func UpdateAddMacherBedID(id int64, orgid int64, addmacher *models.DeviceAddmacher) error {
+
+	err := UserWriteDB().Model(&addmacher).Where("id=? and user_org_id = ? and status =1", id, orgid).Update(map[string]interface{}{"bed_id": addmacher.BedId, "mtime": addmacher.Mtime}).Error
+	return err
+}
+
+func UpdatedZoneID(bedid int64, orgid int64, number *models.DeviceNumber) error {
+
+	err := XTWriteDB().Model(&number).Where("id=? and org_id = ?", bedid, orgid).Update(map[string]interface{}{"zone_id": number.ZoneID, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
 func UpadateForm(id int64, orgid int64, infor *models.DeviceInformation) error {
 
 	err := UserWriteDB().Model(&infor).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"date": infor.Date, "class": infor.Class, "zone": infor.Zone, "bed_number": infor.BedNumber, "contagion": infor.Contagion, "dialysis_mode": infor.DialysisMode, "start_time": infor.StartTime, "end_time": infor.EndTime, "dialysis_hour": infor.DialysisHour, "hyperfiltratio": infor.Hyperfiltratio, "weight_loss": infor.WeightLoss, "warning_value": infor.WarningValue, "user_total": infor.UserTotal, "move": infor.Move, "failure_stage": infor.FailureStage, "fault_description": infor.FaultDescription, "code_information": infor.CodeInformation, "disinfect_type": infor.DisinfectType, "disinfectant_type": infor.DisinfectType, "disinfection": infor.Disinfection, "machine_run": infor.MachineRun, "fluid_path": infor.FluidPath, "disinfectant": infor.Disinfectant, "disinfection_status": infor.DisinfectionStatus, "disinfection_residue": infor.DisinfectionResidue, "long_time": infor.LongTime, "disinfec_startime": infor.DisinfecStartime, "disinfec_endtime": infor.DisinfecEndtime, "dialysis_checked": infor.DialysisChecked, "dialysis_name": infor.DialysisName, "norms": infor.Norms, "dialysis_concentration": infor.DialysisConcentration,
 	err := UserWriteDB().Model(&repair).Where("id=?", id).Update(map[string]interface{}{"images": "", "image_name": ""}).Error
 	return err
 }
-
-func GetRoleName(adminid int64, orgid int64, appid int64) (models.Roles, error) {
-
-	role := models.Roles{}
-	err := UserReadDB().Model(&role).Where("creator = ? and org_id = ? and app_id = ? and status =1", adminid, orgid, appid).Find(&role).Error
-	return role, err
-}
-
-func GetPositionName(adminid int64, orgid int64, appid int64) (models.App_Role, error) {
-
-	role := models.App_Role{}
-	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and app_id = ?", adminid, orgid, appid).Find(&role).Error
-	return role, err
-}
-
-func GetPosition(id int64) (models.SgjUserAdminRole, error) {
-	roles := models.SgjUserAdminRole{}
-	err = UserReadDB().Model(&roles).Where("id=? and status = 1", id).Find(&roles).Error
-	return roles, err
-}

service/patientmanage_service.go

 	return
 }
 
-func FindPatientByIdCardNoOne(orgID int64, idCardNo string) (patient models.Patients, err error) {
+func FindPatientByIdCardNoOne(orgID int64, idCardNo string) (patient models.XtPatientsNew, err error) {
 	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and id_card_no=?", orgID, idCardNo).First(&patient).Error
 	return
 }
 	return
 }
 
-func FindPatientByMobileOne(mobile string, orgID int64) (patient models.Patients, err error) {
+func FindPatientByMobileOne(mobile string, orgID int64) (patient models.XtPatientsNew, err error) {
 	err = readDb.Model(&models.Patients{}).Where("phone=? and user_org_id=? and status=1", mobile, orgID).First(&patient).Error
 	return
 }
 	return err
 }
 
+func UpdateXtPatientNewOne(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, "adminssion_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, "member_patienttype": patients.MemberPatienttype, "member_treatement": patients.MemberTreatement}).Error
+	return err
+}
+
 func UpdateContagions(patientid int64) (models.XtPatientsInfectiousDiseases, error) {
 	diseases := models.XtPatientsInfectiousDiseases{}
 	err := XTWriteDB().Model(&diseases).Where("patient_id = ?", patientid).Update(map[string]interface{}{"status": 2, "updated_time": time.Now().Unix()}).Error
 	err := UserWriteDB().Model(&log).Create(&log).Error
 	return err
 }
+
+func GetRoleName(adminid int64, orgid int64, appid int64) (models.Roles, error) {
+
+	role := models.Roles{}
+	err := UserReadDB().Model(&role).Where("creator = ? and org_id = ? and app_id = ? and status =1", adminid, orgid, appid).Find(&role).Error
+	return role, err
+}
+
+func GetPositionName(adminid int64, orgid int64, appid int64) (models.App_Role, error) {
+
+	role := models.App_Role{}
+	err := UserReadDB().Model(&role).Where("admin_user_id = ? and org_id = ? and app_id = ?", adminid, orgid, appid).Find(&role).Error
+	return role, err
+}
+
+func GetPosition(id int64) (models.SgjUserAdminRole, error) {
+	roles := models.SgjUserAdminRole{}
+	err = UserReadDB().Model(&roles).Where("id=? and status = 1", id).Find(&roles).Error
+	return roles, err
+}