修改redis清除数据时间

conf/app.conf

@@ -143,7 +143,7 @@ aliquid = 83
 [dev]
 mobile_token_expiration_second = 3600
 httpdomain = http://new_mobile.xt.api.sgjyun.com
-sso_domain = http://testsso.sgjyun.com
+sso_domain = http://localhost:8081
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
@@ -215,8 +215,8 @@ writesgjpatientmysqlname = sgj_patient
 
 
 #redishost = 120.77.235.13
-redishost = 112.74.16.180
-# redishost = localhost
+#redishost = 112.74.16.180
+redishost = localhost
 redisport = 6379
 redispasswrod = 123456
 redisdb = 0

controllers/dialysis_record_api_controller.go

@@ -1231,7 +1231,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				if out.ID > 0 {
 
 					if prescription.Niprocart > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, niprocart, prescription.Niprocart, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, niprocart, prescription.Niprocart, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1291,7 +1291,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Jms > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, jms, prescription.Jms, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, jms, prescription.Jms, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1353,7 +1353,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set, prescription.FistulaNeedleSet, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set, prescription.FistulaNeedleSet, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1415,7 +1415,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet16 > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1476,7 +1476,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Hemoperfusion > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, hemoperfusion, prescription.Hemoperfusion, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, hemoperfusion, prescription.Hemoperfusion, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1537,7 +1537,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.DialyserSterilised > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyser_sterilised, prescription.DialyserSterilised, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyser_sterilised, prescription.DialyserSterilised, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1599,7 +1599,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Filtryzer > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, filtryzer, prescription.Filtryzer, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, filtryzer, prescription.Filtryzer, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1661,7 +1661,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Dialyzers > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyzers, prescription.Dialyzers, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, dialyzers, prescription.Dialyzers, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1723,7 +1723,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Injector > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, injector, prescription.Injector, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, injector, prescription.Injector, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1785,7 +1785,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Bloodlines > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, bloodlines, prescription.Bloodlines, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, bloodlines, prescription.Bloodlines, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1847,7 +1847,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.TubingHemodialysis > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, tubingHemodialysis, prescription.TubingHemodialysis, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, tubingHemodialysis, prescription.TubingHemodialysis, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1909,7 +1909,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.Package > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, safe_package, prescription.Package, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, safe_package, prescription.Package, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1971,7 +1971,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 
 					if prescription.ALiquid > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, aliquid, prescription.ALiquid, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, aliquid, prescription.ALiquid, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -2342,7 +2342,6 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		tempassessmentAfterDislysis.InternalFistula = lastAssessmentAfterDislysis.InternalFistula
 		tempassessmentAfterDislysis.Catheter = lastAssessmentAfterDislysis.Catheter
 		tempassessmentAfterDislysis.Complication = lastAssessmentAfterDislysis.Complication
-		tempassessmentAfterDislysis.Remark = lastAssessmentAfterDislysis.Remark
 		tempassessmentAfterDislysis.DialysisIntakes = lastAssessmentAfterDislysis.DialysisIntakes
 		tempassessmentAfterDislysis.DialysisIntakesFeed = lastAssessmentAfterDislysis.DialysisIntakesFeed
 		tempassessmentAfterDislysis.DialysisIntakesTransfusion = lastAssessmentAfterDislysis.DialysisIntakesTransfusion

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -332,7 +332,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 {
+	if template.TemplateId == 22 || template.TemplateId == 17 {
 		dewater_amount = dewater_amount * 1000
 	}
 
@@ -949,11 +949,11 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"dialysistype": dialysistype,
-		"patient":      dialysisinfo,
-		"schedule":     sc,
-		"dryweight":    dry_weight,
-		"after_dry_weight":    after_dry_weight,
+		"dialysistype":     dialysistype,
+		"patient":          dialysisinfo,
+		"schedule":         sc,
+		"dryweight":        dry_weight,
+		"after_dry_weight": after_dry_weight,
 	})
 	return
 }

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2421,7 +2421,6 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.InternalFistula = lastAssessmentAfterDislysis.InternalFistula
 		tempassessmentAfterDislysis.Catheter = lastAssessmentAfterDislysis.Catheter
 		tempassessmentAfterDislysis.Complication = lastAssessmentAfterDislysis.Complication
-		tempassessmentAfterDislysis.Remark = lastAssessmentAfterDislysis.Remark
 		tempassessmentAfterDislysis.DialysisIntakes = lastAssessmentAfterDislysis.DialysisIntakes
 		tempassessmentAfterDislysis.DialysisIntakesFeed = lastAssessmentAfterDislysis.DialysisIntakesFeed
 		tempassessmentAfterDislysis.DialysisIntakesTransfusion = lastAssessmentAfterDislysis.DialysisIntakesTransfusion
@@ -2800,7 +2799,6 @@ func (this *DialysisAPIController) StartDialysis() {
 		hemoperfusion, _ := beego.AppConfig.Int64("hemoperfusion")
 		dialyser_sterilised, _ := beego.AppConfig.Int64("dialyser_sterilised")
 		filtryzer, _ := beego.AppConfig.Int64("filtryzer")
-
 		dialyzers, _ := beego.AppConfig.Int64("dialyzers")
 		injector, _ := beego.AppConfig.Int64("injector")
 		bloodlines, _ := beego.AppConfig.Int64("bloodlines")
@@ -3299,7 +3297,6 @@ func (this *DialysisAPIController) StartDialysis() {
 						}
 
 					}
-
 					if prescription.ALiquid > 0 {
 						warehouseOutInfo := &models.WarehouseOutInfo{
 							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -3344,7 +3341,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				if out.ID > 0 {
 
 					if prescription.Niprocart > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, niprocart, prescription.Niprocart, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, niprocart, prescription.Niprocart, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3404,7 +3401,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Jms > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, jms, prescription.Jms, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, jms, prescription.Jms, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3466,7 +3463,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set, prescription.FistulaNeedleSet, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set, prescription.FistulaNeedleSet, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3528,7 +3525,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.FistulaNeedleSet16 > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, fistula_needle_set_16, prescription.FistulaNeedleSet16, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3589,7 +3586,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Hemoperfusion > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, hemoperfusion, prescription.Hemoperfusion, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, hemoperfusion, prescription.Hemoperfusion, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3650,7 +3647,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.DialyserSterilised > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyser_sterilised, prescription.DialyserSterilised, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyser_sterilised, prescription.DialyserSterilised, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3712,7 +3709,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Filtryzer > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, filtryzer, prescription.Filtryzer, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, filtryzer, prescription.Filtryzer, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3774,7 +3771,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Dialyzers > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyzers, prescription.Dialyzers, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, dialyzers, prescription.Dialyzers, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3836,7 +3833,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Injector > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, injector, prescription.Injector, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, injector, prescription.Injector, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3898,7 +3895,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Bloodlines > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, bloodlines, prescription.Bloodlines, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, bloodlines, prescription.Bloodlines, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -3960,7 +3957,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.TubingHemodialysis > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, tubingHemodialysis, prescription.TubingHemodialysis, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, tubingHemodialysis, prescription.TubingHemodialysis, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -4022,7 +4019,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.Package > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, safe_package, prescription.Package, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, safe_package, prescription.Package, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -4084,7 +4081,7 @@ func (this *DialysisAPIController) StartDialysis() {
 					}
 
 					if prescription.ALiquid > 0 {
-						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, aliquid, prescription.ALiquid, out.WarehouseOutOrderNumber)
+						outInfo, err := service.FindStockOutInfoByTypeId(adminUserInfo.Org.Id, aliquid, prescription.ALiquid, out.ID)
 
 						if err == gorm.ErrRecordNotFound {
 							warehouseOutInfo := &models.WarehouseOutInfo{
@@ -4381,7 +4378,6 @@ func (c *DialysisAPIController) PostSolution() {
 				if order.ID > 0 {
 					if dialysisPrescription.Niprocart != niprocart {
 						//不一致，先将原有的商品订单数量进行减一的操作，并将原有使用记录进行修改商品信息(根据上机的日期和商品类型id，商品id)
-
 						//1.用上机透析日期查出当天的订单
 						_, out := service.FindStockOutOrderNumberByTime(order.DialysisDate, adminUserInfo.Org.Id)
 						//_, out := service.FindOldOrderInfoByGoodId(order.StartTime, adminUserInfo.Org.Id)
@@ -4811,8 +4807,6 @@ func (c *DialysisAPIController) PostSolution() {
 
 						//不一致，先将原有的商品订单数量进行减一的操作，并将原有使用记录进行修改商品信息(根据上机的日期和商品类型id，商品id)
 						service.UpdateOrderCount(dialyser_sterilised_good_type_id, dialysisPrescription.DialyserSterilised, out.WarehouseOutOrderNumber, adminUserInfo.Org.Id)
-						//_, out := service.FindOrderInfoByGoodId(dialyser_sterilised_good_type_id, dialysisPrescription.DialyserSterilised, order.StartTime, adminUserInfo.Org.Id)
-						//_, out := service.FindOrderInfoByGoodId(order.StartTime, adminUserInfo.Org.Id)
 
 						//判断前端更改后的商品id的出库记录在数据库中是否存在
 						err, newOut := service.FindOrderInfoByGoodId(dialyser_sterilised_good_type_id, dialyser_sterilised, out.WarehouseOutOrderNumber, adminUserInfo.Org.Id)
@@ -6384,3 +6378,29 @@ func (c *DialysisAPIController) GetPatientId() {
 		"patient": patientId,
 	})
 }
+
+func (this *DialysisAPIController) GetDialysisSchedule() {
+	schedualDate := this.GetString("date")
+	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
+	if parseDateErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgID := adminInfo.Org.Id
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
+	scheduals, _ := service.MobileGetDialysisScheduals(orgID, date.Unix(), 0)
+	if len(scheduals) > 0 {
+		//缓存数据
+		scheduals_json, err := json.Marshal(scheduals)
+		if err == nil {
+			redis.Set(key, scheduals_json, time.Second*30)
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"scheduals": scheduals,
+	})
+
+}

controllers/mobile_api_controllers/login_api_controller.go

@@ -32,8 +32,8 @@ func (this *LoginAPIController) LoginByPwd() {
 		return
 	}
 	ip := utils.GetIP(this.Ctx.Request)
-	ssoDomain := beego.AppConfig.String("sso_domain")
-	//ssoDomain := "http://localhost:8091"
+	//ssoDomain := beego.AppConfig.String("sso_domain")
+	ssoDomain := "http://localhost:8091"
 	api := ssoDomain + "/m/login/pwd"
 	values := make(url.Values)
 	values.Set("mobile", mobile)

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -114,4 +114,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/patient/search", &PatientApiController{}, "Get:GetSearchPatient")
 
+	beego.Router("/m/api/dialysis/schedule", &DialysisAPIController{}, "Get:GetDialysisSchedule")
+
 }

controllers/patient_api_controller.go

@@ -3801,7 +3801,6 @@ func (c *PatientApiController) ExportPatients() {
 				patient.DryWeight = dry_weights
 
 			}
-
 			patient.CreatedTime = time.Now().Unix()
 			patient.UpdatedTime = time.Now().Unix()
 			patient.Status = 1

controllers/schedule_api_controller.go

@@ -645,11 +645,108 @@ func (this *ScheduleApiController) UrgentScheduleData() {
 
 func (this *ScheduleApiController) SearchSchedulePatients() {
 	keywords := this.GetString("keywords")
-	adminUserInfo := this.GetAdminUserInfo()
-	list, _ := service.GetSchedualPatientsByKeywords(keywords, adminUserInfo.CurrentOrgId)
-	this.ServeSuccessJSON(map[string]interface{}{
-		"schdules": list,
-	})
+	week_type, _ := this.GetInt64("week_type", 0)
+
+	thisTime1 := time.Now()
+	thisTime2 := time.Now()
+
+	thisTime1 = thisTime1.AddDate(0, 0, 7)
+	thisTime2 = thisTime2.AddDate(0, 0, 14)
+
+	var start_time string
+	var end_time string
+
+	switch week_type {
+	case 1:
+
+		adminUserInfo := this.GetAdminUserInfo()
+		list, _ := service.GetSchedualPatientsByKeywords(keywords, adminUserInfo.CurrentOrgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schdules": list,
+		})
+
+		break
+	case 2:
+		days := make([]string, 0)
+
+		weekDay1 := int(thisTime1.Weekday())
+		if weekDay1 == 0 {
+			weekDay1 = 7
+		}
+		weekEnd1 := 7 - weekDay1
+		weekStart1 := weekEnd1 - 6
+		for index := weekStart1; index <= weekEnd1; index++ {
+			theDay := thisTime1.AddDate(0, 0, index)
+			days = append(days, theDay.Format("2006-01-02"))
+			if index == 0 {
+				start_time = theDay.Format("2006-01-02")
+			}
+
+			end_time = theDay.Format("2006-01-02")
+		}
+
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+
+		var theStartTime int64
+		if len(start_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+			theStartTime = theTime.Unix()
+		}
+		var theEndtTime int64
+		if len(end_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+			theEndtTime = theTime.Unix()
+		}
+
+		adminUserInfo := this.GetAdminUserInfo()
+		list, _ := service.GetSchedualPatientsByKeywordsAndWeek(keywords, adminUserInfo.CurrentOrgId, theStartTime, theEndtTime)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schdules": list,
+		})
+
+		break
+	case 3:
+		days := make([]string, 0)
+
+		weekDay2 := int(thisTime2.Weekday())
+		if weekDay2 == 0 {
+			weekDay2 = 7
+		}
+		weekEnd2 := 7 - weekDay2
+		weekStart2 := weekEnd2 - 6
+		for index := weekStart2; index <= weekEnd2; index++ {
+			theDay := thisTime2.AddDate(0, 0, index)
+			days = append(days, theDay.Format("2006-01-02"))
+			if index == 0 {
+				start_time = theDay.Format("2006-01-02")
+			}
+
+			end_time = theDay.Format("2006-01-02")
+		}
+
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+
+		var theStartTime int64
+		if len(start_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+			theStartTime = theTime.Unix()
+		}
+		var theEndtTime int64
+		if len(end_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+			theEndtTime = theTime.Unix()
+		}
+
+		adminUserInfo := this.GetAdminUserInfo()
+		list, _ := service.GetSchedualPatientsByKeywordsAndWeek(keywords, adminUserInfo.CurrentOrgId, theStartTime, theEndtTime)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schdules": list,
+		})
+
+		break
+	}
 
 }
 

routers/router.go

@@ -35,7 +35,7 @@ func init() {
 	controllers.ScheduleApiRegistRouters()
 	controllers.SignWeighAPIControllerRegistRouters()
 	controllers.InvoiceApiRegistRouters()
-	//controllers.StockApiRegistRouters()
+	controllers.StockApiRegistRouters()
 	controllers.StockGoodApiRegistRouters()
 	controllers.StockManagerApiRegistRouters()
 	controllers.PatientScheduleTemplateAPIControllerRegistRouters()

service/patient_service.go

@@ -291,7 +291,7 @@ func CreatePatientsNew(patientsNew *models.XtPatientsNew) error {
 
 func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto) (err error) {
 	utx := writeDb.Begin()
-	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"Lapseto": patient.Lapseto}).Error
+	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto}).Error
 	//err = utx.Model(&models.PatientLapseto{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto_type": patient.Lapseto, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		utx.Rollback()

service/schedule_service.go

@@ -213,6 +213,23 @@ func GetPrinitWeekSchedules(orgID int64, start, end int64) ([]*WeekSchedulePrint
 // 	return nil
 // }
 
+func GetSchedualPatientsByKeywordsAndWeek(keywords string, org_id int64, start_time int64, end_time int64) (schedule []*models.Schedule, err error) {
+	likeKey := "%" + keywords + "%"
+	err = readDb.
+		Table("xt_schedule as s").
+		Preload("PatientInfectiousDiseases", "status = 1 ").
+		Preload("DeviceZone", "status = 1 ").
+		Preload("DeviceNumber", "status = 1 ").
+		Preload("TreatmentMode", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).
+		Where("s.user_org_id=? and s.schedule_date >= ? and s.schedule_date <= ? and s.status=1", org_id, start_time, end_time).
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Order("schedule_date asc").
+		Find(&schedule).Error
+	return
+
+}
+
 func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*models.Schedule, err error) {
 	likeKey := "%" + keywords + "%"
 

service/stock_service.go

@@ -1215,8 +1215,8 @@ func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
 
 }
 
-func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, number string) (out models.WarehouseOutInfo, err error) {
-	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND  warehouse_out_order_number = ?", org_id, good_type_id, good_id, number).First(&out).Error
+func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, out_id int64) (out models.WarehouseOutInfo, err error) {
+	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND  warehouse_out_id = ?", org_id, good_type_id, good_id, out_id).First(&out).Error
 	return
 }