修改模版22超滤量和超滤率自动计算方式

controllers/dialysis_record_api_controller.go

@@ -1714,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)

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 {
 		// 保存透前相关数据
 		// 获取透析处方

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)
 				}
 			}
 
@@ -3827,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)

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 {

service/mobile_dialysis_service.go

@@ -74,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"`
@@ -91,7 +103,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", " org_id = ? AND good_type_id = ? AND status = 1", org_id, good_type_id).Where(" org_id = ? AND good_type_id = ?  AND status = 1 ", org_id, good_type_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
+}