新功能

controllers/dialysis_api_controller.go

 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
 	record.UltrafiltrationVolume = 0
-	if template.TemplateId == 1 {
+	if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 		if ultrafiltration_rate > 0 {
 			value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", float64(record.OperateTime+3600-fristrecord.OperateTime)/3600*ultrafiltration_rate), 6)
 			record.UltrafiltrationVolume = value

controllers/dialysis_record_api_controller.go

 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院
-				if template.TemplateId == 1 {
+				if template.TemplateId == 1 && adminUserInfo.CurrentOrgId != 9849 {
 					value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 					ultrafiltration_rate = value
 				}

controllers/mobile_api_controllers/dialysis_api_controller.go

 	}
 
 	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecord(adminInfo.Org.Id, patientID, date.Unix())
-	fmt.Println("----------------------------", getDialysisOrderErr)
 	if getDialysisOrderErr != nil {
 		this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.Org.Id, adminInfo.App.Id, models.SpecialPermissionTypeHeadNurse)
+	//headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.Org.Id, adminInfo.App.Id, models.SpecialPermissionTypeHeadNurse)
 
 	_, gobalConfig := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 	goodTypes, _ := service.FindAllGoodTypeByType(1)          //查出所有库存配置的系统类型
 		"last_predialysis_evaluation":    lastPredialysisEvaluation,
 		"last_assessment_after_dislysis": lastAssessmentAfterDislysis,
 		"last_monitor_record":            lastMonitorRecord,
-		"special_premission":             headNurses,
-		"config":                         gobalConfig,
-		"types":                          goodTypes,
-		"goodInfos":                      goodInfos,
-		"dry_weight":                     lastDryWeightDislysis,
-		"system_prescription":            systemDialysisPrescribe,
+		//"special_premission":             headNurses,
+		"config":              gobalConfig,
+		"types":               goodTypes,
+		"goodInfos":           goodInfos,
+		"dry_weight":          lastDryWeightDislysis,
+		"system_prescription": systemDialysisPrescribe,
 	}
 	this.ServeSuccessJSON(returnData)
 }
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminUserInfo.Org.Id != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 			}
 			}
 
 			// 只针对方济医院
-			if template.TemplateId == 1 {
+			if template.TemplateId == 1 && adminInfo.Org.Id != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
 				ultrafiltration_rate = value
 				record.UltrafiltrationRate = ultrafiltration_rate
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
 	record.UltrafiltrationVolume = 0
-	if template.TemplateId == 1 { //adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535
+	if template.TemplateId == 1 && adminInfo.Org.Id != 9849 { //adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535adminInfo.Org.Id == 3907 || adminInfo.Org.Id == 4 || adminInfo.Org.Id == 12 || adminInfo.Org.Id == 13 || adminInfo.Org.Id == 9535
 		if ultrafiltration_rate > 0 {
 			value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", float64(record.OperateTime+3600-fristrecord.OperateTime)/3600*ultrafiltration_rate), 6)
 			record.UltrafiltrationVolume = value

models/dialysis.go

 }
 
 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"`
-	DialysisOrderId             int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	DryWeight                   float64 `gorm:"column:dry_weight" json:"dry_weight"`
-	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	WeightAfterLastTransparency float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency"`
-	WeighingWay                 string  `gorm:"column:weighing_way" json:"weighing_way"`
-	WeighingBefore              float64 `gorm:"column:weighing_before" json:"weighing_before"`
-	AdditionalWeight            float64 `gorm:"column:additional_weight" json:"additional_weight"`
-	WeightBefore                float64 `gorm:"column:weight_before" json:"weight_before"`
-	Evaluator                   int64   `gorm:"column:evaluator" json:"evaluator"`
-	Creater                     int64   `gorm:"column:creater" json:"creater"`
-	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time"`
+	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"`
 }
 
 func (PredialysisEvaluationList) TableName() string {

models/patient_models.go

 	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"`
-	ModeId     int64 `gorm:"column:mode_id" json:"mode_id"`
 	RecordDate int64 `gorm:"column:record_date" json:"record_date"`
 	RecordId   int64 `gorm:"column:record_id" json:"record_id"`
 	Creater    int64 `gorm:"column:creater" json:"creater"`
-	Modifier   int64 `gorm:"column:modifier" json:"modifier"`
 }
 
 func (DialysisPrescriptionList) TableName() string {

service/dialysis_service.go

 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
-		Preload("TreatmentSummary", "status = 1 AND user_org_id = ?", orgID).
 		// Preload("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("MonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time desc")
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time asc")
 		}).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)

service/mobile_dialysis_service.go

 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-		Preload("TreatmentMode", "status = 1").
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 
 	SchedualPatient          *MSchedualPatientVMList           `gorm:"ForeignKey:PatientId" json:"patient"`
 	DeviceNumber             *MDeviceNumberVM                  `gorm:"ForeignKey:BedId" json:"device_number"`
-	DeviceZone               *models.DeviceZone                `gorm:"ForeignKey:PartitionId" json:"device_zone"`
-	TreatmentMode            *models.TreatmentMode             `gorm:"ForeignKey:ModeId" json:"treatment_mode"`
 	DialysisOrder            *MDialysisOrderVMList             `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
 	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"`
-	TreatmentSummary         *models.TreatmentSummary          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
-	Advices                  []*models.DoctorAdvice            `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
+	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
 	// PrescriptionId int64  `gorm:"column:prescription_id" json:"prescription_id"`
 	Stage int64 `gorm:"column:stage" json:"stage"`
 	// Remark         string `gorm:"column:remark" json:"remark"`
-	BedID          int64            `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse     int64            `gorm:"column:start_nurse" json:"start_nurse"`
-	FinishNurse    int64            `gorm:"column:finish_nurse" json:"finish_nurse"`
-	Status         int64            `gorm:"column:status" json:"status"`
-	PunctureNurse  int64            `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	DeviceNumber   *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
-	Creator        int64            `gorm:"column:creator" json:"creator"`
-	Modifier       int64            `gorm:"column:modifier" json:"modifier"`
-	FinishCreator  int64            `gorm:"column:finish_creator" json:"finish_creator"`
-	FinishModifier int64            `gorm:"column:finish_modifier" json:"finish_modifier"`
-	SchedualType   int64            `gorm:"column:schedual_type" json:"schedual_type"`
+	BedID        int64            `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse   int64            `gorm:"column:start_nurse" json:"start_nurse"`
+	Status       int64            `gorm:"column:status" json:"status"`
+	DeviceNumber *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
+	Creator      int64            `gorm:"column:creator" json:"creator"`
 }
 
 func (MDialysisOrderVMList) TableName() string {
 	return "xt_dialysis_order"
 }
 
+type VMDoctorAdvice struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	GroupNo        int64 `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceDate     int64 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	RecordDate     int64 `gorm:"column:record_date" json:"record_date"`
+}
+
+func (VMDoctorAdvice) TableName() string {
+	return "xt_doctor_advice"
+}
+
 // 获取透析记录
 func MobileGetDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder