更新数据

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1000,6 +1000,7 @@ func (this *NewDialysisApiController) ToSearchePatient() {
 	fmt.Print("关键字", keyword)
 	adminUserinfo := this.GetMobileAdminUserInfo()
 	orgid := adminUserinfo.Org.Id
+	fmt.Println("j击鼓ID=--------------------------", orgid)
 	patient, err := service.ToSearchePatient(keyword, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1137,7 +1138,11 @@ func (this *NewDialysisApiController) GetDoctorAdviceDetail() {
 	orgid := adminUser.Org.Id
 	appid := adminUser.App.Id
 	id, _ := this.GetInt64("id")
-	doctorAdvicedetail, err := service.GetDoctorAdviceDetail(id, orgid)
+	bloodTwo, _ := service.GetPatientDetailTwo(id)
+	fmt.Println("id", bloodTwo.BloodId)
+	date, _ := this.GetInt64("date")
+	doctorAdvicedetail, err := service.GetDoctorAdviceDetail(date, bloodTwo.BloodId, orgid)
+	fmt.Println("err-------------------------------", err)
 	doctorDetail, err := service.GetAllDoctorTwo(orgid, appid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

service/patientmanage_service.go

@@ -733,7 +733,7 @@ func DeleteRescueRecord(id int64) error {
 
 func ToSearchePatient(keyword string, orgId int64) (paitents []*models.XtPatientsNew, err error) {
 	likeKey := "%" + keyword + "%"
-	err = XTReadDB().Where("name like ? or dialysis_no like ? and user_org_id = ?", likeKey, likeKey, orgId).Find(&paitents).Error
+	err = XTReadDB().Where("user_org_id = ? and name like ? or dialysis_no like ?", orgId, likeKey, likeKey).Find(&paitents).Error
 	return paitents, err
 }
 
@@ -879,10 +879,10 @@ func GetAllDoctorTwo(orgid int64, appid int64) (appRole []*models.SgjUserAdminRo
 	return appRole, err
 }
 
-func GetDoctorAdviceDetail(id int64, orgid int64) (advices []*models.DoctorAdvices, err error) {
+func GetDoctorAdviceDetail(state int64, id int64, orgid int64) (advices []*models.DoctorAdvices, err error) {
 
 	db := XTReadDB().Table("xt_doctor_advice as x")
-	err = db.Order("x.id desc").Select("x.id,x.user_org_id,x.patient_id,x.advice_type,x.advice_date,x.start_time,x.advice_name,x.advice_desc,x.reminder_date,x.single_dose,x.single_dose_unit,x.prescribing_number,x.prescribing_number_unit,x.delivery_way,x.execution_frequency,x.advice_doctor,x.status,x.created_time,x.updated_time,x.advice_affirm,x.remark,x.stop_time,x.stop_reason,x.stop_doctor,x.stop_state,x.parent_id,x.execution_time,x.execution_staff,x.execution_state,x.checker,x.record_date,x.dialysis_order_id,x.check_time,x.check_state,x.drug_spec,x.drug_spec_unit,x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.template_id,x.modifier,s.name").Joins("left join xt_patients as s on s.id=x.patient_id").Where("x.start_time = ? and x.status = 1 and x.user_org_id = ?", id, orgid).Scan(&advices).Error
+	err = db.Order("x.id desc").Select("x.id,x.user_org_id,x.patient_id,x.advice_type,x.advice_date,x.start_time,x.advice_name,x.advice_desc,x.reminder_date,x.single_dose,x.single_dose_unit,x.prescribing_number,x.prescribing_number_unit,x.delivery_way,x.execution_frequency,x.advice_doctor,x.status,x.created_time,x.updated_time,x.advice_affirm,x.remark,x.stop_time,x.stop_reason,x.stop_doctor,x.stop_state,x.parent_id,x.execution_time,x.execution_staff,x.execution_state,x.checker,x.record_date,x.dialysis_order_id,x.check_time,x.check_state,x.drug_spec,x.drug_spec_unit,x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.template_id,x.modifier,s.name").Joins("left join xt_patients as s on s.id=x.patient_id").Where("x.start_time = ? and x.patient_id = ? and x.user_org_id = ? and x.status = 1", state, id, orgid).Scan(&advices).Error
 
 	return advices, err
 }