时间选择更新

controllers/manage_api_controller.go

@@ -191,6 +191,13 @@ func (this *MachineApiController) SaveManageInfo() {
 		ids = append(ids, id)
 	}
 
+	//查询机位号是否绑定设备
+	thisAddmacher, err := service.GetEquitmentByBedID(bed_number, orgid)
+	if thisAddmacher.ID > 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisNoExist)
+		return
+	}
+
 	addmacher := &models.DeviceAddmacher{
 		SerialNumber: serial_numbe,
 		DeviceType:   device_type,

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -243,72 +243,91 @@ func (this *NewDialysisApiController) SavePatient() {
 
 	//如果是血透病人
 	if bloodPatient == 1 {
-		_, errcode := service.GetPatientData(phone, orgid)
-		if errcode == gorm.ErrRecordNotFound {
-			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.CreateOldPatient(&patients)
-			fmt.Print("报错", err)
-			patient, err := service.GetLastOldPatient(orgid)
-			fmt.Print("病人ID", patient.ID)
-			err = service.AddContagions(patient.ID, patient.CreatedTime, patient.UpdatedTime, ids)
-			fmt.Println("添加传染病失败", err)
-
-			patientsNew := models.XtPatientsNew{
-				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,
-				BloodId:           patient.ID,
-				IsInfectious:      is_infectious,
-				IdCardNo:          idCard,
-			}
-			err = service.CreateNewPatient(&patientsNew)
-			fmt.Print("报错", err)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"patient": patientsNew,
-			})
-		} else if errcode == nil {
-			fmt.Print("病人已存在")
+		//查询身份证号码是否存在
+		thisPatientOne, _ := service.FindPatientByIdCardNoOne(orgid, idCard)
+		if thisPatientOne.ID > 0 {
+			returnData := make(map[string]interface{}, 0)
+			returnData["msg"] = "身份证号码已存在"
+			this.ServeSuccessJSON(returnData)
 			return
-		} else {
+		}
+
+		//查询手机号码是否存在
+		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 {
+			returnData := make(map[string]interface{}, 0)
+			returnData["msg"] = "透析号已存在"
+			this.ServeSuccessJSON(returnData)
+			return
+		}
+
+		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.CreateOldPatient(&patients)
+		fmt.Print("报错", err)
+		patient, err := service.GetLastOldPatient(orgid)
+		fmt.Print("病人ID", patient.ID)
+		err = service.AddContagions(patient.ID, patient.CreatedTime, patient.UpdatedTime, ids)
+		fmt.Println("添加传染病失败", err)
+
+		patientsNew := models.XtPatientsNew{
+			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,
+			BloodId:           patient.ID,
+			IsInfectious:      is_infectious,
+			IdCardNo:          idCard,
+		}
+		err = service.CreateNewPatient(&patientsNew)
+		fmt.Print("报错", err)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patient": patientsNew,
+		})
 	}
 
 	fmt.Print("slowpatient", slowpatient)
@@ -511,7 +530,7 @@ func (this *NewDialysisApiController) SavePatient() {
 					MemberTreatement:  treatmentmethod,
 				}
 				err = service.CreateNewPatient(&patientsNew)
-				fmt.Print("报错-----------------------", err)
+				fmt.Print("报错", err)
 				if err != nil {
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 					return
@@ -578,7 +597,7 @@ func (this *NewDialysisApiController) GetDoctorAdvices() {
 	fmt.Print("开始时间", startime)
 	end := this.GetString("endtime")
 	fmt.Print("end", end)
-	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 00:00:00", loc)
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 23:59:59", loc)
 	endtime := endTimes.Unix()
 	fmt.Print("结束时间", endtime)
 	limit, _ := this.GetInt64("limit")
@@ -607,7 +626,8 @@ func (this *NewDialysisApiController) GetDryWeight() {
 	startime := startTimes.Unix()
 	fmt.Print("startime", startime)
 	end := this.GetString("endtime")
-	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 00:00:00", loc)
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 23:59:59", loc)
+
 	endtime := endTimes.Unix()
 	fmt.Print("endtime", endtime)
 	limit, _ := this.GetInt64("limit")
@@ -652,7 +672,7 @@ func (this *NewDialysisApiController) GetCourseManagement() {
 	startime := startTimes.Unix()
 	fmt.Print("startime", startime)
 	end := this.GetString("endtime")
-	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 00:00:00", loc)
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 23:59:59", loc)
 	endtime := endTimes.Unix()
 	fmt.Print("endtime", endtime)
 	limit, _ := this.GetInt64("limit")
@@ -814,7 +834,7 @@ func (this *NewDialysisApiController) GetRescuerecord() {
 	startime := startTimes.Unix()
 	fmt.Print("startime", startime)
 	end := this.GetString("endtime")
-	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 00:00:00", loc)
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end+" 23:59:59", loc)
 	endtime := endTimes.Unix()
 	fmt.Print("endtime", endtime)
 	limit, _ := this.GetInt64("limit")
@@ -1241,6 +1261,34 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 	if bloodPatient == 1 {
 		//根据新表ID获取老表病人ID
 		patient, _ := service.GetNewPatient(id)
+
+		//判断身份证号是否相同
+		thisPatient, _ := service.FindPatientByIdCardNoOne(orgid, idCard)
+		if thisPatient.ID > 0 && thisPatient.ID != patient.BloodId {
+			returnData := make(map[string]interface{}, 0)
+			returnData["msg"] = "身份证号码已存在"
+			this.ServeSuccessJSON(returnData)
+			return
+		}
+
+		//查询手机号码是否存在
+		thisPatientOne, err := service.FindPatientByMobileOne(phone, orgid)
+		if thisPatientOne.ID > 0 && thisPatientOne.ID != patient.BloodId {
+			returnData := make(map[string]interface{}, 0)
+			returnData["msg"] = "手机号码已存在"
+			this.ServeSuccessJSON(returnData)
+			return
+		}
+
+		//查询号透析号是否相同
+		thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis)
+		if thisPatientother.ID > 0 && thisPatientother.ID != patient.BloodId {
+			returnData := make(map[string]interface{}, 0)
+			returnData["msg"] = "透析号码已存在"
+			this.ServeSuccessJSON(returnData)
+			return
+		}
+
 		patients := models.Patients{
 			Name:              name,
 			Gender:            sex,
@@ -1260,7 +1308,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			IdCardNo:          idCard,
 			IsInfectious:      is_infectious,
 		}
-		err := service.UpdatedPatient(patients, patient.BloodId)
+		err = service.UpdatedPatient(patients, patient.BloodId)
 		patientsNew := models.XtPatientsNew{
 			ID:                id,
 			Name:              name,
@@ -1289,6 +1337,12 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"patients": patientsNew,
 		})
+		//更改传染病
+		updateContagions, err := service.UpdateContagions(patient.BloodId)
+		fmt.Print("更新传染病失败", err)
+		fmt.Print("up", updateContagions)
+		err = service.AddContagions(patient.BloodId, patient.CreatedTime, patient.UpdatedTime, ids)
+		fmt.Println("添加传染病失败", err)
 	}
 	if slowpatient == 1 {
 		patient, _ := service.GetNewPatient(id)

service/manage_service.go

@@ -29,6 +29,12 @@ func CreateEquimentName(equimentname models.DeviceEquimentname) error {
 	return err
 }
 
+func GetEquitmentByBedID(bedid int64, orgid int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Model(&addmacher).Where("bed_id = ? and user_org_id = ? and status = 1", bedid, orgid).First(&addmacher).Error
+	return addmacher, err
+}
+
 func CreateMacher(machers *models.DeviceAddmacher) error {
 
 	//err := writeDb.Create(&machers).Error

service/patient_service.go

@@ -316,7 +316,7 @@ func UpdatePatient(patient *models.Patients, contagions []int64, diseases []int6
 		return
 	}
 	err = utx.Model(&models.InfectiousDiseases{}).Where("patient_id=?", patient.ID).Update(map[string]interface{}{"Status": 2, "UpdatedTime": patient.UpdatedTime}).Error
-	fmt.Println("错误是什么。。。。。。。。。。。。。。。。。。。。。。。。。。。", err)
+	fmt.Println("err", err)
 	if err != nil {
 		utx.Rollback()
 		return

service/patientmanage_service.go

@@ -400,6 +400,21 @@ func CreatePatientTwo(patient *models.Patients, contagions []int64, diseases []i
 	return
 }
 
+func FindPatientByIdCardNoOne(orgID int64, idCardNo string) (patient models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and id_card_no=?", orgID, idCardNo).First(&patient).Error
+	return
+}
+
+func FindPatientByDialysisNoOne(orgID int64, dialysisNo string) (patient models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and dialysis_no=?", orgID, dialysisNo).First(&patient).Error
+	return
+}
+
+func FindPatientByMobileOne(mobile string, orgID int64) (patient models.Patients, err error) {
+	err = readDb.Model(&models.Patients{}).Where("phone=? and user_org_id=? and status=1", mobile, orgID).First(&patient).Error
+	return
+}
+
 func GetPatientData(phone string, orgid int64) (*models.XtPatientsNew, error) {
 	var patientnew models.XtPatientsNew
 	var err error
@@ -470,10 +485,10 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 	} else if advice_type == 0 {
 		db = db.Where("x.advice_type in (?)", []int{1, 3})
 	}
-	if start != 0 {
+	if start > 0 {
 		db = db.Where("x.start_time>=?", start)
 	}
-	if end != 0 {
+	if end > 0 {
 		db = db.Where("start_time<=?", end)
 	}
 	offset := (page - 1) * limit
@@ -634,7 +649,7 @@ func GetEducation(patientid int64, startime int64, endtime int64, limit int64, p
 		db = db.Where("x.assessment_date <= ?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Count(&total).Order("x.assessment_date").Offset(offset).Limit(limit).Group("x.id").
+	err = db.Count(&total).Order("x.assessment_date desc").Offset(offset).Limit(limit).Group("x.id").
 		Select("x.id,x.user_org_id,x.patient_id,x.assessment_date,x.dialysis_order_id,x.mission,x.dialysis_summary,x.change,x.sj_nurse,x.zl_nurse,x.hd_nurse,x.xj_nurse,x.zl_doctor,x.channel_image,x.puncture,x.puncture_needle,x.puncture_direction,x.status,x.created_time,x.updated_time,x.creater,x.modifier").Scan(&treatment).Error
 	return
 }
@@ -783,10 +798,10 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
 		Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Group("s.schedule_date")
 
-	if start != 0 {
+	if start > 0 {
 		db = db.Where("do.dialysis_date>=?", start)
 	}
-	if end != 0 {
+	if end > 0 {
 		db = db.Where("do.dialysis_date<=?", end)
 	}
 	if mode_id > 0 {
@@ -864,6 +879,12 @@ func UpdateXtPatientNew(patients models.XtPatientsNew, id int64) 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
+	return diseases, 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