Merge branch '20200710_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20200710_xt_api_new_branch

conf/app.conf

@@ -143,33 +143,33 @@ aliquid = 83
 [dev]
 mobile_token_expiration_second = 3600
 httpdomain = http://new_mobile.xt.api.sgjyun.com
-sso_domain = https://testsso.sgjyun.com
+sso_domain = http://testsso.sgjyun.com
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = sgj_xt
+readmysqlname = test_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = sgj_xt
+writemysqlname = test_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = sgj_users
+readusername = test_users
 
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = sgj_users
+writeusername = test_users
 
 
 
@@ -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_api_controller.go

@@ -3303,7 +3303,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 {
+			if templateInfo.TemplateId == 17 && templateInfo.TemplateId == 22 {
 				dewater_amount = dewater_amount * 1000
 			}
 			if dewater_amount <= 0 {
@@ -4863,7 +4863,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 20 || template.TemplateId == 22 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -4885,7 +4885,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/dialysis_record_api_controller.go

@@ -741,9 +741,11 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 						}
 						//查出入库记录中最后一条记录
 						stockInInfo, _ := service.FindLastStockInInfoRecord(prescription.Niprocart, adminUserInfo.CurrentOrgId)
+
 						warehouseOutInfo.Price = stockInInfo.Price
 						warehouseOutInfo.GoodId = prescription.Niprocart
 						warehouseOutInfo.GoodTypeId = niprocart
+
 						err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 
 						if err == nil {
@@ -762,6 +764,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 							service.AddSigleAutoReduceRecordInfo(details)
 						}
 					}
+
 					if prescription.Jms > 0 {
 						warehouseOutInfo := &models.WarehouseOutInfo{
 							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1711,7 +1714,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 								Status:                  1,
 								RecordTime:              startDate.Unix(),
 								OrgId:                   adminUserInfo.CurrentOrgId,
-								GoodId:                  prescription.Dialyzer,
+								GoodId:                  prescription.Dialyzers,
 								GoodTypeId:              dialyzers,
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
@@ -2155,7 +2158,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 || template.TemplateId == 20 {
+				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -330,6 +330,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 	// 	return
 	// }
 
+	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
+
+	if template.TemplateId == 22 {
+		dewater_amount = dewater_amount * 1000
+	}
+
 	if dialysistype == 1 {
 		// 保存透前相关数据
 		// 获取透析处方
@@ -846,6 +852,8 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 	// 获取患者透前干体重或者获取患者透前体重
 	var dry_weight map[string]interface{}
 	dry_weight = make(map[string]interface{})
+	var after_dry_weight map[string]interface{}
+	after_dry_weight = make(map[string]interface{})
 	if dialysistype == 1 {
 
 		lastPredialysisEvaluation, getLPEErr := service.MobileGetLastTimePredialysisEvaluation(adminUserInfo.Org.Id, id, endTime)
@@ -900,6 +908,44 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 				dry_weight["dry_weight"] = predialysisEvaluation.WeightBefore
 			}
 		}
+
+		lastPredialysisEvaluation, getLPEErr := service.MobileGetLastTimePredialysisEvaluation(adminUserInfo.Org.Id, id, endTime)
+		weight, err := service.FindLastDryWeightAdjust(adminUserInfo.Org.Id, id)
+		if err == gorm.ErrRecordNotFound {
+			if getLPEErr != nil {
+				after_dry_weight["code"] = 1
+				after_dry_weight["dry_weight"] = nil
+			} else {
+				if lastPredialysisEvaluation == nil {
+					after_dry_weight["code"] = 1
+					after_dry_weight["dry_weight"] = nil
+				} else {
+					// 传输的干体重实际为干体重加上衣服重
+					after_dry_weight["code"] = 0
+					after_dry_weight["dry_weight"] = lastPredialysisEvaluation.DryWeight + lastPredialysisEvaluation.AdditionalWeight
+				}
+			}
+		} else {
+			if err != nil {
+				after_dry_weight["code"] = 1
+				after_dry_weight["dry_weight"] = nil
+			} else {
+				after_dry_weight["code"] = 0
+				if getLPEErr != nil {
+					after_dry_weight["code"] = 0
+					after_dry_weight["dry_weight"] = weight.DryWeight
+				} else {
+					if lastPredialysisEvaluation == nil {
+						after_dry_weight["code"] = 1
+						after_dry_weight["dry_weight"] = weight.DryWeight
+					} else {
+						// 传输的干体重实际为干体重加上衣服重
+						after_dry_weight["code"] = 0
+						after_dry_weight["dry_weight"] = weight.DryWeight + lastPredialysisEvaluation.AdditionalWeight
+					}
+				}
+			}
+		}
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -907,6 +953,7 @@ func (c *CheckWeightApiController) GetPatientInfoDialysis() {
 		"patient":      dialysisinfo,
 		"schedule":     sc,
 		"dryweight":    dry_weight,
+		"after_dry_weight":    after_dry_weight,
 	})
 	return
 }

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -99,7 +99,7 @@ func (this *DialysisAPIController) Scheduals() {
 				//缓存数据
 				scheduals_json, err := json.Marshal(scheduals)
 				if err == nil {
-					redis.Set(key, scheduals_json, time.Minute*1)
+					redis.Set(key, scheduals_json, time.Second*30)
 				}
 			}
 
@@ -111,6 +111,7 @@ func (this *DialysisAPIController) Scheduals() {
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
 
 		var dat []map[string]interface{}
+
 		if err := json.Unmarshal([]byte(scheduals_json_str), &dat); err == nil {
 
 		} else {
@@ -161,7 +162,7 @@ func (this *DialysisAPIController) WaitingScheduals() {
 				//缓存数据
 				wait_scheduals_json, err := json.Marshal(scheduals)
 				if err == nil {
-					redis.Set(key, wait_scheduals_json, time.Minute*2)
+					redis.Set(key, wait_scheduals_json, time.Second*30)
 				}
 			}
 
@@ -2750,7 +2751,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
-			if template.TemplateId == 20 { //adminUserInfo.Org.Id == 9538
+			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 			}
 
@@ -3826,7 +3827,7 @@ func (this *DialysisAPIController) StartDialysis() {
 								Status:                  1,
 								RecordTime:              startDate.Unix(),
 								OrgId:                   adminUserInfo.Org.Id,
-								GoodId:                  prescription.Dialyzer,
+								GoodId:                  prescription.Dialyzers,
 								GoodTypeId:              dialyzers,
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
@@ -5593,20 +5594,23 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	fristrecord, _ := service.FindFirstMonitorRecordToday(patientID, adminInfo.Org.Id, monitorDate)
 
 	template, _ := service.GetOrgInfoTemplate(adminInfo.Org.Id)
-	fmt.Println("1122233333")
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
 	if prescription.ID > 0 {
+		fmt.Println("444444444")
+
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
+			fmt.Println("4444444445555")
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 			if template.TemplateId == 6 {
+				fmt.Println("12222222")
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 20 {
+			if template.TemplateId == 20 || template.TemplateId == 22 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -5628,9 +5632,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
-			fmt.Println("11222344444444443333")
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -885,9 +885,12 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	dewater_amount = 0
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-		if template.TemplateId == 17 {
+
+		if template.TemplateId == 17 || template.TemplateId == 22 {
 			dewater_amount = dewater_amount * 1000
+
 		}
+
 		if dewater_amount <= 0 {
 			dewater_amount = 0
 		}

controllers/new_mobile_api_controllers/management_analyse_api_controller.go

@@ -82,10 +82,13 @@ func (this *ManagementAnalyseApiController) StatisticsPatientChart() {
 	data, total_one, _ := management_service.GetPatientChartData(adminUserInfo.Org.Id, startTime, endTime, statistics_type)
 	total, _ := management_service.GetLapsetoPatientTotal(adminUserInfo.Org.Id, statistics_type)
 
+	total_three, _ := management_service.GetLapsetoPatientTotal(adminUserInfo.Org.Id, 2)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"chart_data": data,
-		"total_one":  total_one,
-		"total":      total,
+		"chart_data":  data,
+		"total_one":   total_one,
+		"total":       total,
+		"total_three": total + total_three,
 	})
 
 }

controllers/schedule_api_controller.go

@@ -547,6 +547,8 @@ func (c *ScheduleApiController) ChangeSchedule() {
 // @param date:string yyyy-MM-dd 要打印的那一周中的任一天
 func (this *ScheduleApiController) PrintInitData() {
 	dateStr := this.GetString("date")
+	//week_type, _ := this.GetInt64("type", 0)
+
 	var date *time.Time
 	if len(dateStr) == 0 {
 		now := time.Now()
@@ -562,7 +564,21 @@ func (this *ScheduleApiController) PrintInitData() {
 
 	adminUserInfo := this.GetAdminUserInfo()
 	// 获取本周的排班
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(date)
+	var monday time.Time
+	var sunday time.Time
+	//switch week_type {
+	//case 1:
+	monday, sunday = utils.GetMondayAndSundayOfWeekDate(date)
+
+	//	break
+	//case 2:
+	//	monday, sunday = utils.GetMondayAndSundayOfNextWeekDate(date)
+	//
+	//	break
+	//case 3:
+	//	monday, sunday = utils.GetMondayAndSundayOfNextNextWeekDate(date)
+	//	break
+	//}
 	schedules, getScheduleErr := service.GetPrinitWeekSchedules(adminUserInfo.CurrentOrgId, monday.Unix(), sunday.Unix())
 	if getScheduleErr != nil {
 		this.ErrorLog("获取周排班失败：%v", getScheduleErr)
@@ -570,7 +586,7 @@ func (this *ScheduleApiController) PrintInitData() {
 		return
 	}
 
-	thisTime := time.Now()
+	thisTime := date
 
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {

models/dialysis.go

@@ -274,11 +274,14 @@ func (PredialysisEvaluation) TableName() string {
 }
 
 type PredialysisEvaluationList struct {
-	ID             int64   `gorm:"column:id" json:"id"`
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id"`
-	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
-	WeightBefore   float64 `gorm:"column:weight_before" json:"weight_before"`
+	ID                     int64   `gorm:"column:id" json:"id"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate         int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightBefore           float64 `gorm:"column:weight_before" json:"weight_before"`
+	CreatedTime            int64   `gorm:"column:created_time" json:"created_time"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 }
 
 func (PredialysisEvaluationList) TableName() string {

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/management_service/management_analyse_service.go

@@ -17,8 +17,8 @@ func GetPatientChartData(user_org_id int64, start_time int64, end_time int64, st
 		break
 	case 2:
 		//err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
-		//err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
-		err = db.Raw("select from_unixtime(created_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.created_time >=? AND patient.created_time <=? AND patient.status = 1   AND patient.lapseto = 2  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		//err = db.Raw("select from_unixtime(updated_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.updated_time >=? AND patient.updated_time <=? AND patient.status = 1   AND patient.lapseto = 2  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
 
 		break
 	}
@@ -45,9 +45,18 @@ func GetPatientTableData(orgID int64, page, limit, start, end int64, statistics_
 	var err error
 	var patients []*PatientTableStruct
 	readDb := service.XTReadDB()
-	//db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
-	db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.created_time >= ? AND patient.created_time <= ?  ", orgID, statistics_type, start, end)
-	err = db.Order("patient.created_time desc").Scan(&patients).Error
+	if statistics_type == 1 {
+		db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.created_time >= ? AND patient.created_time <= ?  ", orgID, statistics_type, start, end)
+		err = db.Order("patient.created_time desc").Scan(&patients).Error
+
+	} else {
+
+		db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
+		//db := readDb.Raw("select from_unixtime(patient.`updated_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.updated_time >= ? AND patient.updated_time <= ?  ", orgID, statistics_type, start, end)
+		err = db.Group("lapseto.`patient_id`").Order("lapseto.lapseto_time desc").Scan(&patients).Error
+
+	}
+
 	return patients, total, err
 }
 

service/mobile_dialysis_service.go

@@ -35,6 +35,7 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("TreatmentSummary", "status = 1  AND user_org_id = ?", orgID).
 		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
 		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
 		// }).
@@ -63,6 +64,7 @@ func MobileGetWaitingScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSch
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2 ", orgID).
 		Preload("TreatmentMode", "status = 1").
+		Preload("TreatmentSummary", "status = 1  AND user_org_id = ?", orgID).
 		Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -72,6 +74,18 @@ func MobileGetWaitingScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSch
 	return vms, err
 }
 
+type VMTreatmentSummary struct {
+	ID              int64  `gorm:"column:id" json:"id"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId       int64  `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate  int64  `gorm:"column:assessment_date" json:"assessment_date"`
+	DialysisSummary string `gorm:"column:dialysis_summary" json:"dialysis_summary" form:"dialysis_summary"`
+}
+
+func (VMTreatmentSummary) TableName() string {
+	return "xt_treatment_summary"
+}
+
 type MDialysisScheduleVM struct {
 	ID           int64 `gorm:"column:id" json:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
@@ -90,7 +104,7 @@ type MDialysisScheduleVM struct {
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
 	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
-	TreatmentSummary         *models.TreatmentSummary          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
+	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {

service/stock_service.go

@@ -1186,7 +1186,7 @@ func FindAllGoodTypeByType(types int64) (goodType []*models.GoodsType, err error
 }
 
 func FindWarehouseInfoByGoodType(good_type_id int64, org_id int64) (info []*models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Preload("GoodInfo", "status = 1 AND org_id = ?", org_id).Where("good_type_id = ? AND status = 1 AND org_id = ?", good_type_id, org_id).Find(&info).Error
+	err = readDb.Model(&models.WarehousingInfo{}).Preload("GoodInfo", " org_id = ? AND good_type_id = ? AND status = 1 AND specification_name <> '' ", org_id, good_type_id).Where(" org_id = ? AND good_type_id = ?  AND status = 1 ", org_id, good_type_id).Find(&info).Error
 	return info, err
 
 }

utils/tools.go

@@ -229,3 +229,33 @@ func GetMondayAndSundayOfWeekDate(date *time.Time) (time.Time, time.Time) {
 	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 7-weekday).Format("2006-01-02")+" 23:59:59", loc)
 	return monday, sunday
 }
+
+func GetMondayAndSundayOfNextWeekDate(date *time.Time) (time.Time, time.Time) {
+	if date == nil {
+		now := time.Now()
+		date = &now
+	}
+	weekday := int(date.Weekday())
+	if weekday == 0 {
+		weekday = 7
+	}
+	loc, _ := time.LoadLocation("Local")
+	monday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 8-weekday).Format("2006-01-02")+" 00:00:00", loc)
+	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 14-weekday).Format("2006-01-02")+" 23:59:59", loc)
+	return monday, sunday
+}
+
+func GetMondayAndSundayOfNextNextWeekDate(date *time.Time) (time.Time, time.Time) {
+	if date == nil {
+		now := time.Now()
+		date = &now
+	}
+	weekday := int(date.Weekday())
+	if weekday == 0 {
+		weekday = 7
+	}
+	loc, _ := time.LoadLocation("Local")
+	monday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 15-weekday).Format("2006-01-02")+" 00:00:00", loc)
+	sunday, _ := time.ParseInLocation("2006-01-02 15:04:05", date.AddDate(0, 0, 21-weekday).Format("2006-01-02")+" 23:59:59", loc)
+	return monday, sunday
+}