医嘱

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -1269,3 +1269,15 @@ func (c *MobileHisApiController) GetPatientPlan() {
 	})
 	return
 }
+
+func (c *MobileHisApiController) ToGetPatient() {
+
+	order, _ := service.GetDialysisOrderList(10340)
+	for _, item := range order {
+		service.UpdatePatientDialysisOrder(item.PatientId, item.Url)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -181,5 +181,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/prescription/create", &MobileHisApiController{}, "Post:CreateHisPrescription")
 
 	beego.Router("/m/api/patient/getpatientplan", &MobileHisApiController{}, "Get:GetPatientPlan")
+	beego.Router("/m/api/patient/togetpatient", &MobileHisApiController{}, "Get:ToGetPatient")
 
 }

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -49,10 +49,40 @@ func (this *StaffScheduleApiController) GetMobileDoctorList() {
 func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
 
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	start_time, _ := this.GetInt64("start_time")
-	fmt.Println("staft_time", start_time)
-	end_time, _ := this.GetInt64("end_time")
-	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	//start_time, _ := this.GetInt64("start_time")
+	//fmt.Println("staft_time", start_time)
+	//end_time, _ := this.GetInt64("end_time")
+	//fmt.Println("start_time",start_time)
+	//fmt.Println("end_time",end_time)
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	fmt.Println("start_time_one--------", len(start_time_one))
+	fmt.Println("end_time_one-------", end_time_one)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	fmt.Println("starti_time233232323232", startTime)
+	fmt.Println("end_time2323223232323", endTime)
+	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -66,10 +96,33 @@ func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
 func (this *StaffScheduleApiController) GetMobileNextWeekScheduleLIst() {
 
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	start_time, _ := this.GetInt64("start_time")
-	end_time, _ := this.GetInt64("end_time")
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
 
-	staffList, err := service.GetStaffScheduleList(orgId, start_time, end_time)
+	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -82,10 +135,33 @@ func (this *StaffScheduleApiController) GetMobileNextWeekScheduleLIst() {
 
 func (this *StaffScheduleApiController) GetScheduleByUserType() {
 	doctor_id, _ := this.GetInt64("doctor_id")
-	start_time, _ := this.GetInt64("start_time")
-	end_time, _ := this.GetInt64("end_time")
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	staffList, err := service.GetScheduleByDoctorId(doctor_id, start_time, end_time, orgId)
+	staffList, err := service.GetScheduleByDoctorId(doctor_id, startTime, endTime, orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -100,9 +176,34 @@ func (this *StaffScheduleApiController) GetSearchPatientByDoctorId() {
 
 	orgId := this.GetMobileAdminUserInfo().Org.Id
 	user_name := this.GetString("user_name")
-	start_time, _ := this.GetInt64("start_time")
-	end_time, _ := this.GetInt64("end_time")
-	staffList, err := service.ToSearchSeacheduleList(user_name, start_time, end_time, orgId)
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
+
+	start_time_one := this.GetString("start_time_one")
+	end_time_one := this.GetString("end_time_one")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time_one) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_one+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	//
+	staffList, err := service.ToSearchSeacheduleList(user_name, startTime, endTime, orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -812,7 +913,7 @@ func (c *StaffScheduleApiController) ChangeScheduleById() {
 	patient_id, _ := c.GetInt64("patient_id")
 	org_id := c.GetMobileAdminUserInfo().Org.Id
 	err := service.ChangeScheduleById(id, mode_id)
-	fmt.Println("9999999999999999", err)
+	fmt.Println("err", err)
 	err = service.ChangeDialysisSolution(patient_id, schedule_date, org_id, mode_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",

controllers/pharmacy_controller.go

@@ -35,7 +35,7 @@ func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/routeofadministration", &PharmacyController{}, "get:RouteOfAdministration") //获取当前机构的给药途径
 }
 
-//测试
+// 测试
 func (this *PharmacyController) Tlili() {
 	var err error
 	defer func() {
@@ -65,7 +65,7 @@ func (this *PharmacyController) GetCurrentName() {
 	return
 }
 
-//查询今天的待发药，已发药人数
+// 查询今天的待发药，已发药人数
 func (this *PharmacyController) TodayNumber() {
 	var err error
 	defer func() {
@@ -166,7 +166,15 @@ func (this *PharmacyController) IssuedDrug() {
 	}
 
 	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 {
-		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1)
+
+		//获取排班班次
+		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+		var ids []int64
+		for _, item := range schedule {
+			ids = append(ids, item.PatientId)
+		}
+
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
 		fmt.Println("list23323232323232", list)
 		var flist []models.TmpPatientOne
 		if len(list) > 0 {
@@ -247,6 +255,7 @@ func (this *PharmacyController) WaitingDrug() {
 			return
 		}
 		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -261,7 +270,15 @@ func (this *PharmacyController) WaitingDrug() {
 	//当天已发药的人数
 	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
 
-		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0)
+		//获取排班班次
+		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+		fmt.Println("schedule--------", schedule)
+		var ids []int64
+		for _, item := range schedule {
+			ids = append(ids, item.PatientId)
+		}
+
+		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0, ids)
 
 		var flist []models.TmpPatientOne
 		if len(list) > 0 {
@@ -278,7 +295,6 @@ func (this *PharmacyController) WaitingDrug() {
 
 }
 
-//
 func (this *PharmacyController) GetPharmacyContent() {
 	var err error
 	defer func() {
@@ -320,7 +336,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 
 }
 
-//发药按钮点击
+// 发药按钮点击
 func (this *PharmacyController) DispensingMedicine() {
 	var err error
 	defer func() {
@@ -399,7 +415,7 @@ func (this *PharmacyController) DispensingMedicine() {
 	return
 }
 
-//退药按钮点击
+// 退药按钮点击
 func (this *PharmacyController) DrugWithdrawal() {
 	var err error
 	defer func() {
@@ -437,7 +453,7 @@ func (this *PharmacyController) DrugWithdrawal() {
 
 }
 
-//发药明细列表
+// 发药明细列表
 func (this *PharmacyController) DispensingDetails() {
 	var err error
 	defer func() {
@@ -485,7 +501,7 @@ func (this *PharmacyController) DispensingDetails() {
 	return
 }
 
-//处方详情
+// 处方详情
 func (this *PharmacyController) PrescriptionDetails() {
 	var err error
 	defer func() {
@@ -518,7 +534,7 @@ func (this *PharmacyController) PrescriptionDetails() {
 	return
 }
 
-//已发药品的信息
+// 已发药品的信息
 func (this *PharmacyController) DispenseMedicine() {
 	var err error
 	defer func() {
@@ -563,7 +579,7 @@ func (this *PharmacyController) DispenseMedicine() {
 	return
 }
 
-//待发药的药品信息
+// 待发药的药品信息
 func (this *PharmacyController) WaitingMedicine() {
 	var err error
 	defer func() {
@@ -608,7 +624,7 @@ func (this *PharmacyController) WaitingMedicine() {
 	return
 }
 
-//获取药品的所有患者信息
+// 获取药品的所有患者信息
 func (this *PharmacyController) GetPatientsWithDrugs() {
 	var err error
 	defer func() {
@@ -675,7 +691,7 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 	return
 }
 
-//药品管理发药按钮点击
+// 药品管理发药按钮点击
 func (this *PharmacyController) MedicineDeparture() {
 	var err error
 	defer func() {

models/dialysis.go

@@ -888,6 +888,7 @@ type XtDialysisOrder struct {
 	Number         int64  `gorm:"column:number" json:"number" form:"number"`
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	Url            string `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (XtDialysisOrder) TableName() string {

models/patient_models.go

@@ -1177,6 +1177,7 @@ type XtPatients struct {
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
+	Url                          string  `gorm:"column:url" json:"url" form:"url"`
 }
 
 func (XtPatients) TableName() string {

service/his_service.go

@@ -618,7 +618,7 @@ func GetMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int
 	return
 }
 
-//未收费
+// 未收费
 func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -637,7 +637,7 @@ func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_
 	return
 }
 
-//已收费
+// 已收费
 func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -2235,7 +2235,7 @@ func GetHisPrescriptionTemplate(template_id int64, org_id int64) (prescription [
 	return
 }
 
-//组
+// 组
 func GetHisPrescriptionTemplateL(template_id int64, org_id int64) (prescription []*models.HisPrescriptionInfoTemplateL, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfoTemplateL{}).
 		Preload("HisPrescriptionAdviceTemplate", func(db *gorm.DB) *gorm.DB {
@@ -2343,7 +2343,7 @@ func GetChargeHisPrescriptionSeven(org_id int64, patient_id int64, order_number
 	return
 }
 
-//已收费
+// 已收费
 func GetChargeMonthHisPrescriptionFive(org_id int64, patient_id int64, order_number string, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -2714,3 +2714,15 @@ func UpdatePatienPlan(id int64, trement_plan string) error {
 	err := XTWriteDB().Model(&models.XtPatientsNew{}).Where("blood_id = ? and status = 1", id).Update(map[string]interface{}{"treatment_plan": trement_plan}).Error
 	return err
 }
+
+func GetDialysisOrderList(orgid int64) (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status= 1 and url<>''", orgid).Group("patient_id").Find(&order).Error
+	return order, err
+}
+
+func UpdatePatientDialysisOrder(patient_id int64, url string) error {
+
+	err := XTWriteDB().Model(&models.XtPatients{}).Where("id =? and status=1", patient_id).Updates(map[string]interface{}{"url": url}).Error
+	return err
+}

service/pharmacy_service.go

@@ -96,7 +96,33 @@ func GetTodayAdviceCount(stime, etime, orgid, is_medicine int64) (num int, err e
 	return len(tmp), err
 }
 
-func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+func GetSchedulePatientId(start_time int64, end_time int64, org_id int64, class_type int64, partion_type int64) (schedule []*models.XtSchedules, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status = 1")
+
+	if start_time > 0 {
+		db = db.Where("schedule_date >=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("schedule_date <=?", end_time)
+	}
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if class_type > 0 {
+		db = db.Where("schedule_type =?", class_type)
+	}
+	if partion_type > 0 {
+		db = db.Where("partition_id = ?", partion_type)
+	}
+	err = db.Find(&schedule).Error
+
+	return schedule, err
+}
+
+func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine int64, ids []int64) (advice []*models.HisDoctorAdviceInfo, err error) {
 
 	db := XTReadDB().Model(&advice).Where("status=1 and is_medicine = ?", is_medicine)
 	if stime > 0 {
@@ -108,6 +134,9 @@ func GetTodayAdviceCountOne(stime int64, etime int64, orgid int64, is_medicine i
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)
 	}
+	if len(ids) > 0 {
+		db = db.Where("patient_id in(?)", ids)
+	}
 
 	err = db.Group("patient_id").Find(&advice).Error
 	return advice, err
@@ -1828,7 +1857,8 @@ func PartitionAndLayout(stime, etime, orgid, shift, partition int64, flist []*mo
 	if shift == 0 && partition == 0 {
 		return flist, nil
 	}
-	err = XTWriteDB().Model(&models.XtScheduleTwo{}).Where(s, orgid, stime, etime).Find(&sch).Error
+	err = XTReadDB().Model(&models.XtScheduleTwo{}).Where(s, orgid, stime, etime).Find(&sch).Error
+
 	if err != nil {
 		return
 	}