11月8日库存管理

controllers/dialysis_api_controller.go

 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
-	dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-	patientInfo.TotalDialysis = dialysis_count
+	if adminUserInfo.CurrentOrgId != 10101 {
+		dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+		patientInfo.TotalDialysis = dialysis_count
+	}
 
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)

controllers/doctors_api_controller.go

 	beego.Router("/api/patient/gettemplatesummaryprintdetail", &DoctorsApiController{}, "Get:GetTemplateSummaryPrintDetail")
 	beego.Router("/api/patient/updatetemplatesummary", &DoctorsApiController{}, "Post:UpdateTempalteSummary")
 	beego.Router("/api/patient/deletesummary", &DoctorsApiController{}, "Get:DeleteSummary")
-	beego.Router("/api/patient/hospitalsummary", &DoctorsApiController{}, "Get:HospitalSummary")
+	beego.Router("/api/patient/hospitalsummary", &DoctorsApiController{}, "Post:HospitalSummary")
 	beego.Router("/api/patient/gethospitalsummarylist", &DoctorsApiController{}, "Get:GetHospitalSummaryList")
 	beego.Router("/api/patient/gethospitalsummaydetail", &DoctorsApiController{}, "Get:GetHospitalSummaryDetail")
-	beego.Router("/api/patient/updatehospitalsummary", &DoctorsApiController{}, "Get:UpdateHospitalSummary")
+	beego.Router("/api/patient/updatehospitalsummary", &DoctorsApiController{}, "Post:UpdateHospitalSummary")
 	beego.Router("/api/patient/deletehospitalsummary", &DoctorsApiController{}, "Get:DeleteHospitalSummary")
 	beego.Router("/api/patient/getpatientinfo", &DoctorsApiController{}, "Get:GetPatientInfo")
 }
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	fmt.Println("hhhhhhhhhhhhhh777777", endTime.Unix())
+
 	list, err := service.GetTemplateSummaryList(patient_id, orgId, startTime.Unix(), endTime.Unix())
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	id := int64(dataBody["id"].(float64))
-	title := dataBody["title"].(string)
-	dryWeight := dataBody["dry_weight"].(string)
+
+	id, _ := this.GetInt64("id")
+	title := this.GetString("title")
+
+	dryWeight := this.GetString("dry_weight")
 	dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	dialysis_count := int64(dataBody["dialysis_count"].(float64))
-	hd_count := int64(dataBody["hd_count"].(float64))
-	hdf_count := int64(dataBody["hdf_count"].(float64))
-	hp_count := int64(dataBody["hp_count"].(float64))
-	other_count := int64(dataBody["other_count"].(float64))
-	dialzer_apparatus := dataBody["dialzer_apparatus"].(string)
-	perfusion_apparatus := dataBody["perfusion_apparatus"].(string)
-	anticoagulant := int64(dataBody["anticoagulant"].(float64))
-	kaliumstr := dataBody["kalium"].(string)
+	dialysis_count, _ := this.GetInt64("dialysis_count")
+	hd_count, _ := this.GetInt64("hd_count")
+	hdf_count, _ := this.GetInt64("hdf_count")
+	hp_count, _ := this.GetInt64("hp_count")
+	other_count, _ := this.GetInt64("other_count")
+	dialzer_apparatus := this.GetString("dialzer_apparatus")
+	perfusion_apparatus := this.GetString("perfusion_apparatus")
+	anticoagulant, _ := this.GetInt64("anticoagulant")
+	kaliumstr := this.GetString("kalium")
 	kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-	autunitestr := dataBody["autunite"].(string)
+
+	autunitestr := this.GetString("autunite")
 	autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	natriumstr := dataBody["natrium"].(string)
+	natriumstr := this.GetString("natrium")
 	natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	hour := int64(dataBody["hour"].(float64))
-	minute := int64(dataBody["minute"].(float64))
-	beforWeight := dataBody["befor_weight"].(string)
+	hour, _ := this.GetInt64("hour")
+	minute, _ := this.GetInt64("minute")
+	beforWeight := this.GetString("befor_weight")
 	befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	afterWeight := dataBody["after_weight"].(string)
+	afterWeight := this.GetString("after_weight")
 	after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	befor_pressure := dataBody["befor_pressure"].(string)
-	template_summary_content := dataBody["template_summary_content"].(string)
-	template_plan_content := dataBody["template_plan_content"].(string)
-	admin_user_id := int64(dataBody["admin_user_id"].(float64))
-	record_time := dataBody["record_time"].(string)
+	befor_pressure := this.GetString("befor_pressure")
+	template_summary_content := this.GetString("template_summary_content")
+	template_plan_content := this.GetString("template_plan_content")
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+	record_time := this.GetString("record_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	after_pressure := dataBody["after_pressure"].(string)
-	template_summary_id := int64(dataBody["template_summary_id"].(float64))
-	template_plan_id := int64(dataBody["template_plan_id"].(float64))
-	patient_id := int64(dataBody["patient_id"].(float64))
+	after_pressure := this.GetString("after_pressure")
+	template_summary_id, _ := this.GetInt64("template_summary_id")
+	template_plan_id, _ := this.GetInt64("template_plan_id")
+	template_inspection_id, _ := this.GetInt64("template_inspection_id")
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println("patient_id", patient_id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	inspect_date := dataBody["inspect_date"].(string)
-	project_id := dataBody["project_id"].(string)
-	template_inspection_id := int64(dataBody["template_inspection_id"].(float64))
-
-	//id, _ := this.GetInt64("id")
-	//title := this.GetString("title")
-	//
-	//dryWeight := this.GetString("dry_weight")
-	//dry_weight, _ := strconv.ParseFloat(dryWeight, 64)
-	//dialysis_count, _ := this.GetInt64("dialysis_count")
-	//hd_count, _ := this.GetInt64("hd_count")
-	//hdf_count, _ := this.GetInt64("hdf_count")
-	//hp_count, _ := this.GetInt64("hp_count")
-	//other_count, _ := this.GetInt64("other_count")
-	//dialzer_apparatus := this.GetString("dialzer_apparatus")
-	//perfusion_apparatus := this.GetString("perfusion_apparatus")
-	//anticoagulant, _ := this.GetInt64("anticoagulant")
-	//kaliumstr := this.GetString("kalium")
-	//kalium, _ := strconv.ParseFloat(kaliumstr, 64)
-	//
-	//autunitestr := this.GetString("autunite")
-	//autunite, _ := strconv.ParseFloat(autunitestr, 64)
-	//natriumstr := this.GetString("natrium")
-	//natrium, _ := strconv.ParseFloat(natriumstr, 64)
-	//hour, _ := this.GetInt64("hour")
-	//minute, _ := this.GetInt64("minute")
-	//beforWeight := this.GetString("befor_weight")
-	//befor_weight, _ := strconv.ParseFloat(beforWeight, 64)
-	//afterWeight := this.GetString("after_weight")
-	//after_weight, _ := strconv.ParseFloat(afterWeight, 64)
-	//befor_pressure := this.GetString("befor_pressure")
-	//template_summary_content := this.GetString("template_summary_content")
-	//template_plan_content := this.GetString("template_plan_content")
-	//admin_user_id, _ := this.GetInt64("admin_user_id")
-	//record_time := this.GetString("record_time")
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	//recordTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_time, loc)
-	//after_pressure := this.GetString("after_pressure")
-	//template_summary_id, _ := this.GetInt64("template_summary_id")
-	//template_plan_id, _ := this.GetInt64("template_plan_id")
-	//template_inspection_id, _ := this.GetInt64("template_inspection_id")
-	//patient_id, _ := this.GetInt64("patient_id")
-	//fmt.Println("patient_id", patient_id)
-	//orgId := this.GetAdminUserInfo().CurrentOrgId
-	//inspect_date := this.GetString("inspect_date")
-	//project_id := this.GetString("project_id")
+	inspect_date := this.GetString("inspect_date")
+	project_id := this.GetString("project_id")
 	summary := models.XtTemplateSummary{
 		ID:                     id,
 		StartYear:              0,
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	admission_time := this.GetString("admission_time")
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Print("err", err)
+	admission_time := dataBody["admission_time"].(string)
 	admissionTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", admission_time+" 00:00:00", loc)
 	admissiontime := admissionTimes.Unix()
+	admitting_diagnosis := dataBody["admitting_diagnosis"].(string)
+	admitting_diagnosis_id := dataBody["admitting_diagnosis_id"].(string)
+	connecticut := dataBody["connecticut"].(string)
+	dean := int64(dataBody["dean"].(float64))
+	discharge_diagnosis := dataBody["discharge_diagnosis"].(string)
+	discharge_diagnosis_id := dataBody["discharge_diagnosis_id"].(string)
+	diagnosis_admission := dataBody["diagnosis_admission"].(string)
+	diagnosis_admission_id := dataBody["diagnosis_admission_id"].(string)
+	discharge_advice_id := dataBody["discharge_advice_id"].(string)
+	discharge_advice := dataBody["discharge_advice"].(string)
+	discharge_time := dataBody["discharge_time"].(string)
 
-	admitting_diagnosis := this.GetString("admitting_diagnosis")
-	admitting_diagnosis_id := this.GetString("admitting_diagnosis_id")
-
-	connecticut := this.GetString("connecticut")
-	dean, _ := this.GetInt64("dean")
-	discharge_diagnosis := this.GetString("discharge_diagnosis")
-
-	discharge_diagnosis_id := this.GetString("discharge_diagnosis_id")
-	diagnosis_admission := this.GetString("diagnosis_admission")
-	diagnosis_admission_id := this.GetString("diagnosis_admission_id")
-	discharge_advice_id := this.GetString("discharge_advice_id")
-	discharge_advice := this.GetString("discharge_advice")
-
-	discharge_time := this.GetString("discharge_time")
 	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", discharge_time+" 00:00:00", loc)
 	dischargetime := dischargeTimes.Unix()
-	doctor, _ := this.GetInt64("doctor")
-	illness_discharge_id := this.GetString("illness_discharge_id")
-	illness_discharge := this.GetString("illness_discharge")
-	nuclear_magnetic_resonance := this.GetString("nuclear_magnetic_resonance")
-	pathology := this.GetString("pathology")
-	record_date := this.GetString("record_date")
+	doctor := int64(dataBody["doctor"].(float64))
+	illness_discharge_id := dataBody["illness_discharge_id"].(string)
+	illness_discharge := dataBody["illness_discharge"].(string)
+	nuclear_magnetic_resonance := dataBody["nuclear_magnetic_resonance"].(string)
+	pathology := dataBody["pathology"].(string)
+	record_date := dataBody["record_date"].(string)
 	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordtime := recordDates.Unix()
-	sick_personnel := this.GetString("sick_personnel")
-	title := this.GetString("title")
-	treatment_id := this.GetString("treatment_id")
-	treatment := this.GetString("treatment")
-	ultrasound := this.GetString("ultrasound")
-	xray := this.GetString("xray")
-	patient_id, _ := this.GetInt64("patient_id")
+	sick_personnel := dataBody["sick_personnel"].(string)
+	title := dataBody["title"].(string)
+	treatment_id := dataBody["treatment_id"].(string)
+	treatment := dataBody["treatment"].(string)
+	ultrasound := dataBody["ultrasound"].(string)
+	xray := dataBody["xray"].(string)
+	patient_id := int64(dataBody["patient_id"].(float64))
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	summary := models.XtHospitalSummary{
 		PatientId:                patient_id,
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	admission_time := this.GetString("admission_time")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Print("err", err)
+	admission_time := dataBody["admission_time"].(string)
 	admissionTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", admission_time+" 00:00:00", loc)
 	admissiontime := admissionTimes.Unix()
+	admitting_diagnosis := dataBody["admitting_diagnosis"].(string)
+	admitting_diagnosis_id := dataBody["admitting_diagnosis_id"].(string)
+	connecticut := dataBody["connecticut"].(string)
+	dean := int64(dataBody["dean"].(float64))
+	discharge_diagnosis := dataBody["discharge_diagnosis"].(string)
+	discharge_diagnosis_id := dataBody["discharge_diagnosis_id"].(string)
+	diagnosis_admission := dataBody["diagnosis_admission"].(string)
+	diagnosis_admission_id := dataBody["diagnosis_admission_id"].(string)
+	discharge_advice_id := dataBody["discharge_advice_id"].(string)
+	discharge_advice := dataBody["discharge_advice"].(string)
+	discharge_time := dataBody["discharge_time"].(string)
 
-	id, _ := this.GetInt64("id")
-	admitting_diagnosis := this.GetString("admitting_diagnosis")
-	admitting_diagnosis_id := this.GetString("admitting_diagnosis_id")
-
-	connecticut := this.GetString("connecticut")
-	dean, _ := this.GetInt64("dean")
-	discharge_diagnosis := this.GetString("discharge_diagnosis")
-
-	discharge_diagnosis_id := this.GetString("discharge_diagnosis_id")
-	diagnosis_admission := this.GetString("diagnosis_admission")
-	diagnosis_admission_id := this.GetString("diagnosis_admission_id")
-	discharge_advice_id := this.GetString("discharge_advice_id")
-	discharge_advice := this.GetString("discharge_advice")
-
-	discharge_time := this.GetString("discharge_time")
 	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", discharge_time+" 00:00:00", loc)
 	dischargetime := dischargeTimes.Unix()
-	doctor, _ := this.GetInt64("doctor")
-	illness_discharge_id := this.GetString("illness_discharge_id")
-	illness_discharge := this.GetString("illness_discharge")
-	nuclear_magnetic_resonance := this.GetString("nuclear_magnetic_resonance")
-	pathology := this.GetString("pathology")
-	record_date := this.GetString("record_date")
+	doctor := int64(dataBody["doctor"].(float64))
+	illness_discharge_id := dataBody["illness_discharge_id"].(string)
+	illness_discharge := dataBody["illness_discharge"].(string)
+	nuclear_magnetic_resonance := dataBody["nuclear_magnetic_resonance"].(string)
+	pathology := dataBody["pathology"].(string)
+	record_date := dataBody["record_date"].(string)
 	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordtime := recordDates.Unix()
-	sick_personnel := this.GetString("sick_personnel")
-	title := this.GetString("title")
-	treatment_id := this.GetString("treatment_id")
-	treatment := this.GetString("treatment")
-	ultrasound := this.GetString("ultrasound")
-	xray := this.GetString("xray")
-	patient_id, _ := this.GetInt64("patient_id")
-
+	sick_personnel := dataBody["sick_personnel"].(string)
+	title := dataBody["title"].(string)
+	treatment_id := dataBody["treatment_id"].(string)
+	treatment := dataBody["treatment"].(string)
+	ultrasound := dataBody["ultrasound"].(string)
+	xray := dataBody["xray"].(string)
+	patient_id := int64(dataBody["patient_id"].(float64))
+	id := int64(dataBody["id"].(float64))
 	summary := models.XtHospitalSummary{
 		PatientId:                patient_id,
 		AdmissionTime:            admissiontime,
 		DeanId:                   dean,
 		DischargeDiagnosisId:     discharge_diagnosis_id,
 	}
-	err := service.UpdateHospital(id, summary)
+	err = service.UpdateHospital(id, summary)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"detail": summary,
 
 func (this *DoctorsApiController) DeleteHospitalSummary() {
 
-	id, _ := this.GetInt64("id")
-	err := service.DeleteHospitalSummary(id)
+	schIDStr := this.GetString("ids")
+	idStrs := strings.Split(schIDStr, ",")
+	err := service.DeleteHospitalSummary(idStrs)
 	fmt.Println(err)
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"

controllers/mobile_api_controllers/doctor_advice_api_controller.go

 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"strconv"
+	"time"
 )
 
 type DoctorAdviceAPIController struct {
 // @param date:string (yyyy-mm-dd)
 // @param advice_type:int 1长期医嘱 3临时医嘱 其他:全部
 func (this *DoctorAdviceAPIController) ScheduleAdvices() {
+
 	schedualDate := this.GetString("date")
 	adviceType, _ := this.GetInt("advice_type")
 	patientType, _ := this.GetInt("patient_type")
 
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
+	redis := service.RedisClient()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
+	redis.Set(key, "", time.Second)
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesTwo(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
 	//获取所有的患者
-	blood_patients, _ := service.GetAllPatientListByListTwo(orgID)
+	blood_patients, _ := service.GetAllPatientListByListSeven(orgID)
 	//获取透析处方
 	blood_prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
 	//获取上机
 			}
 		}
 
-
 		//获取所有的患者
 		patients, _ := service.GetAllPatientListByListTwo(orgID)
 

service/auto_clear_schedules_service.go

 	scheduleDate := utils.ZeroHourTimeOfDay(time.Now())
 	for _, item := range schedules {
 		//将今天(不包括今天)以前的的排班数据进行软删除
-		writeDb.
-			Table("xt_schedule as s").
+		writeDb.Table("xt_schedule as s").
 			Where("s.schedule_date < ? AND s.status = 1 AND "+
 				"s.user_org_id = ? AND "+
 				"NOT EXISTS (Select * FROM `xt_dialysis_order` as d Where  d.`status` = 1 AND"+

service/auto_create_staff_schedule_service.go

 	// 获取所有机构信息
 	orgs, _ := GetAllOrgs()
 	for _, item := range orgs {
-		fmt.Println(item)
 		//查询该机构是否开启连续排班功能
 		schdule, _ := GetAutoContinueSchdule(item.ID)
 		//如果状态值未开启不生成连续排班
 }
 
 func AddSchedules(schedule *models.StaffSchedule) error {
-
+	tx := writeDb.Begin()
 	err := XTWriteDB().Model(&schedule).Create(&schedule).Error
-	return err
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	tx.Commit()
+	return nil
 }
 
 func GetNextWeekData(orgid int64, docid int64, scheduledate int64) (*models.StaffSchedule, error) {

service/patient_service.go

 	}
 }
 
+func GetAllPatientListByListSeven(orgID int64) (patients []*MSchedualPatientVM, err error) {
+
+	err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+	return patients, nil
+}
+
 func GetAllPatientListByListTwo(orgID int64) (patients []*MSchedualPatientVM, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/patientmanage_service.go

 	return err
 }
 
-func DeleteHospitalSummary(id int64) error {
-	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+func DeleteHospitalSummary(id []string) error {
+	err := XTWriteDB().Model(models.XtHospitalSummary{}).Where("id in (?) and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

 	for _, item := range schedules {
 		dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
 		fmt.Println(dialysis_count)
-		item.Patient.TotalDialysis = dialysis_count
+		if orgID != 10101 {
+			item.Patient.TotalDialysis = dialysis_count
+		}
+
 		fmt.Println(item.Patient.TotalDialysis)
 
 	}