时间选择更新

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1157,6 +1157,16 @@ func (this *NewDialysisApiController) DeleteManagement() {
 	return
 }
 
+func (this *NewDialysisApiController) DeleteChild() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteChild(id)
+	fmt.Println("错误是什么", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
 func (this *NewDialysisApiController) UpdatedPatient() {
 
 	adminInfo := this.GetMobileAdminUserInfo()
@@ -1512,6 +1522,8 @@ func (this *NewDialysisApiController) GetInspection() {
 	fmt.Print("limit", limit)
 	page, _ := this.GetInt64("page")
 	fmt.Print("page", page)
+	projectid, _ := this.GetInt64("projectid")
+	fmt.Print("projectid", projectid)
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
 	fmt.Print("patient", patient)
@@ -1522,7 +1534,7 @@ func (this *NewDialysisApiController) GetInspection() {
 	//if len(inspection) == 0 {
 	//
 	//}
-	inspection, total, err := service.GetInspection(patient.BloodId, startime, endtime, limit, page, orgid)
+	inspection, total, err := service.GetInspection(patient.BloodId, startime, endtime, limit, page, orgid, projectid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1615,3 +1627,16 @@ func (this *NewDialysisApiController) SaveFeed() {
 		"feedback": feedback,
 	})
 }
+
+func (this *NewDialysisApiController) DeleteInspection() {
+	admininfo := this.GetMobileAdminUserInfo()
+	orgid := admininfo.Org.Id
+	date, _ := this.GetInt64("date")
+	fmt.Println("date", date)
+	err := service.DeleteInspection(date, orgid)
+	fmt.Println("删除失败", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "手机号码已存在"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -94,4 +94,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getpatientname", &NewDialysisApiController{}, "Get:GetPatientName")
 	beego.Router("/m/api/patient/getinspectiondetail", &NewDialysisApiController{}, "Get:GetInspectionDetail")
 	beego.Router("/m/api/patient/savefeed", &NewDialysisApiController{}, "Get:SaveFeed")
+	beego.Router("/m/api/patient/deletechild", &NewDialysisApiController{}, "Delete:DeleteChild")
+	beego.Router("/m/api/patient/deleteinspection", &NewDialysisApiController{}, "Delete:DeleteInspection")
 }

service/patientmanage_service.go

@@ -491,8 +491,8 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 	if end > 0 {
 		db = db.Where("start_time<=?", end)
 	}
-	offset := (page - 1) * limit
-	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, 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.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Offset(offset).Limit(limit).Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
+	//offset := (page - 1) * limit
+	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, 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.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
 	fmt.Print("err", err)
 	return
 
@@ -848,7 +848,7 @@ func GetAllDoctorTwo(orgid int64, appid int64) (appRole []*models.SgjUserAdminRo
 func GetDoctorAdviceDetail(id int64, orgid int64) (advices []*models.DoctorAdvices, err error) {
 
 	db := XTReadDB().Table("xt_doctor_advice as x")
-	err = db.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.groupno = ? 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.groupno = ? and x.status = 1 and x.user_org_id = ?", id, orgid).Scan(&advices).Error
 
 	return advices, err
 }
@@ -859,6 +859,12 @@ func DeleteManagement(groupid int64, orgid int64) error {
 	return err
 }
 
+func DeleteChild(id int64) error {
+
+	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("id=?", id).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
@@ -910,33 +916,13 @@ func GetInspectionByOrgId(orgid int64) (*models.XtInspectionReference, error) {
 
 }
 
-//func GetInspectionById(patientid int64,startime int64,endtime int64,orgId int64)(inspection []*models.XtInspectionReference,err error)  {
-//
-//  db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
-//  if patientid > 0 {
-//    db = db.Where("x.patient_id = ?", patientid)
-//  }
-//  if startime > 0 {
-//    db = db.Where("x.inspect_date >= ?", startime)
-//  }
-//  if endtime > 0 {
-//    db = db.Where("x.inspect_date<=?", endtime)
-//  }
-//  if orgId > 0 {
-//    db = db.Where("x.org_id = ?", orgId)
-//  }
-//  err = db.Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.created_time").Find(inspection).Error
-//
-//  return inspection,err
-//}
-
 func GetAllInspection(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
 	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1", orgid).Group("project_name").Find(&inspection).Error
 	return inspection, err
 }
 
-func GetInspection(patientid int64, startime int64, endtime int64, limit int64, page int64, orgid int64) (inspection []*models.Inspection, total int64, err error) {
+func GetInspection(patientid int64, startime int64, endtime int64, limit int64, page int64, orgid int64, projectid int64) (inspection []*models.Inspection, total int64, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
 	if patientid > 0 {
@@ -951,6 +937,9 @@ func GetInspection(patientid int64, startime int64, endtime int64, limit int64,
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
+	if projectid > 0 {
+		db = db.Where("x.project_id = ?", projectid)
+	}
 	err = db.Count(&total).Order("x.inspect_date desc").Group("x.id").
 		Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.created_time").Find(&inspection).Error
 	return inspection, total, err
@@ -984,3 +973,9 @@ func CreateFeedBack(feedback *models.XtPatientFeedback) error {
 	err := XTWriteDB().Model(&feedback).Create(&feedback).Error
 	return err
 }
+
+func DeleteInspection(date int64, orgid int64) error {
+
+	err := XTWriteDB().Model(models.Inspection{}).Where("inspect_date = ? and org_id = ?", date, orgid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	return err
+}