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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

controllers/data_api_controller.go

@@ -892,8 +892,7 @@ func (c *DataApiController) DeleteExecutionFrequency() {
 func (c *DataApiController) CreateAdviceTemplate() {
 	templateName := c.GetString("template_name")
 	advice_type, _ := c.GetInt64("advice_type")
-
-	fmt.Println(templateName)
+	sort, _ := c.GetInt64("sort")
 
 	if templateName == "" {
 		utils.ErrorLog("模版名称不能为空")
@@ -921,13 +920,6 @@ func (c *DataApiController) CreateAdviceTemplate() {
 		}
 	}
 
-	//total := service.FindTemplateRecordByName(adminUserInfo.CurrentOrgId, templateName);
-	//if total > 0 {
-	//	utils.ErrorLog("模版名称已经存在")
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNameWrong)
-	//	return
-	//}
-
 	template := &models.DoctorAdviceParentTemplate{
 		Name:        templateName,
 		OrgId:       adminUserInfo.CurrentOrgId,
@@ -935,6 +927,7 @@ func (c *DataApiController) CreateAdviceTemplate() {
 		CreatedTime: time.Now().Unix(),
 		UpdatedTime: time.Now().Unix(),
 		AdviceType:  advice_type,
+		Sort:        sort,
 	}
 
 	createErr := service.CreateTemplate(template)
@@ -1326,7 +1319,7 @@ func (c *DataApiController) CreateSubAdviceTemplate() {
 func (this *DataApiController) ModifyTemplateName() {
 	template_name := this.GetString("template_name")
 	template_id, _ := this.GetInt64("template_id", 0)
-
+	sort, _ := this.GetInt64("sort")
 	if len(template_name) <= 0 {
 		utils.ErrorLog("模版名字不能为空")
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamEmptyWrong)
@@ -1344,7 +1337,7 @@ func (this *DataApiController) ModifyTemplateName() {
 	template, _ := service.FindParentTemplateRecordById(adminUserInfo.CurrentOrgId, template_id)
 	var err error
 	if template.Name == template_name {
-		err = service.ModifyTemplateName(template_id, template_name)
+		err = service.ModifyTemplateNameOne(template_id, template_name, sort)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 			return
@@ -1356,7 +1349,7 @@ func (this *DataApiController) ModifyTemplateName() {
 		//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNameWrong)
 		//	return
 		//}
-		err = service.ModifyTemplateName(template_id, template_name)
+		err = service.ModifyTemplateNameOne(template_id, template_name, sort)
 
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)

controllers/dialysis_api_controller.go

@@ -249,6 +249,14 @@ func (c *DialysisApiController) PostPrescription() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
+	single_time := c.GetString("single_time")
+	single_water := c.GetString("single_water")
+	replacement_flow := c.GetString("replacement_flow")
+	plasma_separator := c.GetString("plasma_separator")
+	bilirubin_adsorption_column := c.GetString("bilirubin_adsorption_column")
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -332,6 +340,13 @@ func (c *DialysisApiController) PostPrescription() {
 		DialysisIrrigation:         dialysis_irrigation,
 		AntioxidantCommodityName:   antioxidant_commodity_name,
 		DisplaceSpeed:              displace_speed,
+		Illness:                    illness,
+		Amylaceum:                  amylaceum,
+		SingleTime:                 single_time,
+		SingleWater:                single_water,
+		ReplacementFlow:            replacement_flow,
+		PlasmaSeparator:            plasma_separator,
+		BilirubinAdsorptionColumn:  bilirubin_adsorption_column,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -567,6 +582,13 @@ func (c *DialysisApiController) PostSoulution() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
+	single_time := c.GetString("single_time")
+	single_water := c.GetString("single_water")
+	replacement_flow := c.GetString("replacement_flow")
+	plasma_separator := c.GetString("plasma_separator")
+	bilirubin_adsorption_column := c.GetString("bilirubin_adsorption_column")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -661,6 +683,13 @@ func (c *DialysisApiController) PostSoulution() {
 		DialysisDialyszers:        dialysis_dialyszers,
 		AntioxidantCommodityName:  antioxidant_commodity_name,
 		DisplaceSpeed:             displace_speed,
+		Illness:                   illness,
+		Amylaceum:                 amylaceum,
+		SingleTime:                single_time,
+		SingleWater:               single_water,
+		ReplacementFlow:           replacement_flow,
+		PlasmaSeparator:           plasma_separator,
+		BilirubinAdsorptionColumn: bilirubin_adsorption_column,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -971,7 +1000,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 	precaution_other := c.GetString("precaution_other")
 	psychological_other := c.GetString("psychological_other")
 	admission_number := c.GetString("admission_number")
-
+	tumble, _ := c.GetInt64("tumble")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1019,6 +1048,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 		PrecautionOther:              precaution_other,
 		PsychologicalOther:           psychological_other,
 		AdmissionNumber:              admission_number,
+		Tumble:                       tumble,
 	}
 
 	if receiveTreatment.ID == 0 { //新增
@@ -1066,6 +1096,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 }
 
 func (c *DialysisApiController) PostAssessmentAfterDislysis() {
+
 	patient, _ := c.GetInt64("patient", 0)
 	recordDateStr := c.GetString("record_date")
 	fmt.Println(recordDateStr)
@@ -1164,6 +1195,14 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.AdditionalWeight = data.AdditionalWeight
 	assessment.OtherComplication = data.OtherComplication
 	assessment.Ktv = data.Ktv
+
+	assessment.Urr = data.Urr
+	assessment.Hypertenison = data.Hypertenison
+	assessment.Hypopiesia = data.Hypopiesia
+	assessment.LeaveOfficeMethod = data.LeaveOfficeMethod
+	assessment.Lapse = data.Lapse
+	assessment.Consciousness = data.Consciousness
+	assessment.Fallrisk = data.Fallrisk
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -1295,6 +1334,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	thrombus_av := c.GetString("thrombus_av")
 	thrombus_v := c.GetString("thromubus_v")
 	dehydration := c.GetString("dehydration")
+	pre_dialysis_drugs := c.GetString("pre_dialysis_drugs")
+	period, _ := c.GetInt64("period")
+	estimated_food_intake := c.GetString("estimated_food_intake")
+	blood_pressure_during_dialysis := c.GetString("blood_pressure_during_dialysis")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1357,6 +1400,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		ThromubusA:                     thrombus_a,
 		ThromubusV:                     thrombus_v,
 		Dehydration:                    dehydration,
+		PreDialysisDrugs:               pre_dialysis_drugs,
+		Period:                         period,
+		EstimatedFoodIntake:            estimated_food_intake,
+		BloodPressureDuringDialysis:    blood_pressure_during_dialysis,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -3047,6 +3094,11 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.CurrentOrgId)
+	//针对福建医师汇 获取透前评估预增脱水量
+
+	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, theAssessmentDateTime, adminInfo.CurrentOrgId)
+	fmt.Println("透前评估数据", evaluation)
+
 	if prescription.ID > 0 {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
@@ -3055,6 +3107,13 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+			if template.TemplateId == 6 && adminInfo.CurrentOrgId == 9671 {
+
+				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
+
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
 
 			if template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
@@ -3070,7 +3129,9 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
+
 	record.UltrafiltrationVolume = 0
+
 	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)
@@ -3083,6 +3144,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
+
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{

controllers/dialysis_record_api_controller.go

@@ -322,37 +322,39 @@ type EditMonitorParamObject struct {
 	MonitoringDate int64 `json:"monitoring_date"`
 	OperateTime    int64 `json:"operate_time"`
 	// MonitoringTime        string  `json:"monitoring_time"`
-	SystolicBP                float64 `json:"systolic_bp"`
-	DiastolicBP               float64 `json:"diastolic_bp"`
-	PulseFrequency            float64 `json:"pulse_frequency"`
-	BreathingRated            float64 `json:"breathing_rated"`
-	BloodFlowVolume           float64 `json:"blood_flow_volume"`
-	VenousPressure            float64 `json:"venous_pressure"`
-	VenousPressureType        int64   `json:"venous_pressure_type"`
-	TransmembranePressure     float64 `json:"transmembrane_pressure"`
-	TransmembranePressureType int64   `json:"transmembrane_pressure_type"`
-	UltrafiltrationVolume     float64 `json:"ultrafiltration_volume"`
-	UltrafiltrationRate       float64 `json:"ultrafiltration_rate"`
-	ArterialPressure          float64 `json:"arterial_pressure"`
-	ArterialPressureType      int64   `json:"arterial_pressure_type"`
-	SodiumConcentration       float64 `json:"sodium_concentration"`
-	DialysateTemperature      float64 `json:"dialysate_temperature"`
-	Temperature               float64 `json:"temperature"`
-	ReplacementRate           float64 `json:"replacement_rate"`
-	DisplacementQuantity      float64 `json:"displacement_quantity"`
-	KTV                       float64 `json:"ktv"`
-	Symptom                   string  `json:"symptom"`
-	Dispose                   string  `json:"dispose"`
-	Result                    string  `json:"result"`
-	Conductivity              float64 `json:"conductivity"`
-	DisplacementFlowQuantity  float64 `json:"displacement_flow_quantity"`
-	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	Urr                       string  `gorm:"column:urr" json:"urr" form:"urr"`
-	BloodSugar                float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
-	MonitorAnticoagulant      int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
-	MonitorAnticoagulantValue string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	SystolicBP                  float64 `json:"systolic_bp"`
+	DiastolicBP                 float64 `json:"diastolic_bp"`
+	PulseFrequency              float64 `json:"pulse_frequency"`
+	BreathingRated              float64 `json:"breathing_rated"`
+	BloodFlowVolume             float64 `json:"blood_flow_volume"`
+	VenousPressure              float64 `json:"venous_pressure"`
+	VenousPressureType          int64   `json:"venous_pressure_type"`
+	TransmembranePressure       float64 `json:"transmembrane_pressure"`
+	TransmembranePressureType   int64   `json:"transmembrane_pressure_type"`
+	UltrafiltrationVolume       float64 `json:"ultrafiltration_volume"`
+	UltrafiltrationRate         float64 `json:"ultrafiltration_rate"`
+	ArterialPressure            float64 `json:"arterial_pressure"`
+	ArterialPressureType        int64   `json:"arterial_pressure_type"`
+	SodiumConcentration         float64 `json:"sodium_concentration"`
+	DialysateTemperature        float64 `json:"dialysate_temperature"`
+	Temperature                 float64 `json:"temperature"`
+	ReplacementRate             float64 `json:"replacement_rate"`
+	DisplacementQuantity        float64 `json:"displacement_quantity"`
+	KTV                         float64 `json:"ktv"`
+	Symptom                     string  `json:"symptom"`
+	Dispose                     string  `json:"dispose"`
+	Result                      string  `json:"result"`
+	Conductivity                float64 `json:"conductivity"`
+	DisplacementFlowQuantity    float64 `json:"displacement_flow_quantity"`
+	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Urr                         string  `gorm:"column:urr" json:"urr" form:"urr"`
+	BloodSugar                  float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
+	MonitorAnticoagulant        int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue   string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	Complication                int64   `gorm:"column:complication" json:"complication" form:"complication"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -429,42 +431,44 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringDate:  monitorParam.MonitoringDate,
 			OperateTime:     monitorParam.OperateTime,
 			// MonitoringTime:         monitorParam.MonitoringTime,
-			PulseFrequency:            monitorParam.PulseFrequency,
-			BreathingRate:             monitorParam.BreathingRated,
-			SystolicBloodPressure:     monitorParam.SystolicBP,
-			DiastolicBloodPressure:    monitorParam.DiastolicBP,
-			BloodFlowVolume:           monitorParam.BloodFlowVolume,
-			VenousPressure:            monitorParam.VenousPressure,
-			VenousPressureType:        monitorParam.VenousPressureType,
-			ArterialPressure:          monitorParam.ArterialPressure,
-			ArterialPressureType:      monitorParam.ArterialPressureType,
-			TransmembranePressure:     monitorParam.TransmembranePressure,
-			TransmembranePressureType: monitorParam.TransmembranePressureType,
-			UltrafiltrationRate:       monitorParam.UltrafiltrationRate,
-			UltrafiltrationVolume:     monitorParam.UltrafiltrationVolume,
-			SodiumConcentration:       monitorParam.SodiumConcentration,
-			DialysateTemperature:      monitorParam.DialysateTemperature,
-			Temperature:               monitorParam.Temperature,
-			ReplacementRate:           monitorParam.ReplacementRate,
-			DisplacementQuantity:      monitorParam.DisplacementQuantity,
-			Ktv:                       monitorParam.KTV,
-			Symptom:                   monitorParam.Symptom,
-			Dispose:                   monitorParam.Dispose,
-			Result:                    monitorParam.Result,
-			MonitoringNurse:           adminUserInfo.AdminUser.Id,
-			Conductivity:              monitorParam.Conductivity,
-			DisplacementFlowQuantity:  monitorParam.DisplacementFlowQuantity,
-			Status:                    1,
-			CreatedTime:               time.Now().Unix(),
-			UpdatedTime:               time.Now().Unix(),
-			BloodOxygenSaturation:     monitorParam.BloodOxygenSaturation,
-			Creator:                   adminUserInfo.AdminUser.Id,
-			Heparin:                   monitorParam.Heparin,
-			DialysateFlow:             monitorParam.DialysateFlow,
-			Urr:                       monitorParam.Urr,
-			BloodSugar:                monitorParam.BloodSugar,
-			MonitorAnticoagulant:      monitorParam.MonitorAnticoagulant,
-			MonitorAnticoagulantValue: monitorParam.MonitorAnticoagulantValue,
+			PulseFrequency:              monitorParam.PulseFrequency,
+			BreathingRate:               monitorParam.BreathingRated,
+			SystolicBloodPressure:       monitorParam.SystolicBP,
+			DiastolicBloodPressure:      monitorParam.DiastolicBP,
+			BloodFlowVolume:             monitorParam.BloodFlowVolume,
+			VenousPressure:              monitorParam.VenousPressure,
+			VenousPressureType:          monitorParam.VenousPressureType,
+			ArterialPressure:            monitorParam.ArterialPressure,
+			ArterialPressureType:        monitorParam.ArterialPressureType,
+			TransmembranePressure:       monitorParam.TransmembranePressure,
+			TransmembranePressureType:   monitorParam.TransmembranePressureType,
+			UltrafiltrationRate:         monitorParam.UltrafiltrationRate,
+			UltrafiltrationVolume:       monitorParam.UltrafiltrationVolume,
+			SodiumConcentration:         monitorParam.SodiumConcentration,
+			DialysateTemperature:        monitorParam.DialysateTemperature,
+			Temperature:                 monitorParam.Temperature,
+			ReplacementRate:             monitorParam.ReplacementRate,
+			DisplacementQuantity:        monitorParam.DisplacementQuantity,
+			Ktv:                         monitorParam.KTV,
+			Symptom:                     monitorParam.Symptom,
+			Dispose:                     monitorParam.Dispose,
+			Result:                      monitorParam.Result,
+			MonitoringNurse:             adminUserInfo.AdminUser.Id,
+			Conductivity:                monitorParam.Conductivity,
+			DisplacementFlowQuantity:    monitorParam.DisplacementFlowQuantity,
+			Status:                      1,
+			CreatedTime:                 time.Now().Unix(),
+			UpdatedTime:                 time.Now().Unix(),
+			BloodOxygenSaturation:       monitorParam.BloodOxygenSaturation,
+			Creator:                     adminUserInfo.AdminUser.Id,
+			Heparin:                     monitorParam.Heparin,
+			DialysateFlow:               monitorParam.DialysateFlow,
+			Urr:                         monitorParam.Urr,
+			BloodSugar:                  monitorParam.BloodSugar,
+			MonitorAnticoagulant:        monitorParam.MonitorAnticoagulant,
+			MonitorAnticoagulantValue:   monitorParam.MonitorAnticoagulantValue,
+			BloodPressureMonitoringSite: monitorParam.BloodPressureMonitoringSite,
+			Complication:                monitorParam.Complication,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -553,7 +557,6 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 func (this *DialysisRecordAPIController) StartDialysis() {
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("date")
-	fmt.Println("上机日期222222222222222222222222", recordDateStr)
 	nurseID, _ := this.GetInt64("nurse")
 	punctureNurseId, _ := this.GetInt64("puncture_nurse")
 	startDateStr := this.GetString("start_time")
@@ -758,13 +761,25 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 		var ultrafiltration_rate float64
 		_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.CurrentOrgId)
+
+		//获取预增水量
+		_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.CurrentOrgId)
 		if prescription.ID > 0 {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36 {
+				if (template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36) && adminUserInfo.CurrentOrgId != 9671 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
+
+				//针对福建医师汇
+				if template.TemplateId == 6 && adminUserInfo.CurrentOrgId == 9671 {
+					if evaluation.ID > 0 {
+						dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+						ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
+					}
+				}
+
 				// 只针对方济医院
 				if template.TemplateId == 1 && adminUserInfo.CurrentOrgId != 9849 {
 					value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)

controllers/doctors_api_controller.go

@@ -351,39 +351,66 @@ func (this *DoctorsApiController) SaveVasularAccess() {
 	creator := adminUserInfo.AdminUser.Id
 
 	//查询改日期是否存在
-	_, errcode := service.GetDialysisDateByDate(startTime.Unix(), patient_id, orgId)
-	if errcode == gorm.ErrRecordNotFound {
-		access := models.XtPatientVascularAccess{
-			AccessProject:          access_project,
-			BloodAccessPartId:      blood_access_part_id,
-			BloodAccessPartOperaId: blood_access_part_opera_id,
-			FirstStartTime:         firstStartTime.Unix(),
-			InflowPass:             inflow_pass,
-			Remark:                 remark,
-			StartTime:              startTime.Unix(),
-			StopReason:             stop_reason,
-			UserStatus:             user_status,
-			Creator:                creator,
-			UserOrgId:              orgId,
-			Status:                 1,
-			Ctime:                  time.Now().Unix(),
-			StopTime:               stopTime.Unix(),
-			PatientId:              patient_id,
-			OtherVascular:          other_vascular,
-			CiType:                 ci_type,
-			BloodCultupe:           blood_cultupe,
-			SequelaeType:           sequelae_type,
-		}
-		err := service.SaveVascularAccess(&access)
-		if err == nil {
-			this.ServeSuccessJSON(map[string]interface{}{
-				"access": access,
-			})
-			return
-		}
-	} else if errcode == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+	access := models.XtPatientVascularAccess{
+		AccessProject:          access_project,
+		BloodAccessPartId:      blood_access_part_id,
+		BloodAccessPartOperaId: blood_access_part_opera_id,
+		FirstStartTime:         firstStartTime.Unix(),
+		InflowPass:             inflow_pass,
+		Remark:                 remark,
+		StartTime:              startTime.Unix(),
+		StopReason:             stop_reason,
+		UserStatus:             user_status,
+		Creator:                creator,
+		UserOrgId:              orgId,
+		Status:                 1,
+		Ctime:                  time.Now().Unix(),
+		StopTime:               stopTime.Unix(),
+		PatientId:              patient_id,
+		OtherVascular:          other_vascular,
+		CiType:                 ci_type,
+		BloodCultupe:           blood_cultupe,
+		SequelaeType:           sequelae_type,
+	}
+	err := service.SaveVascularAccess(&access)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"access": access,
+		})
 		return
+		//_, errcode := service.GetDialysisDateByDate(startTime.Unix(), patient_id, orgId)
+		//if errcode == gorm.ErrRecordNotFound {
+		//	access := models.XtPatientVascularAccess{
+		//		AccessProject:          access_project,
+		//		BloodAccessPartId:      blood_access_part_id,
+		//		BloodAccessPartOperaId: blood_access_part_opera_id,
+		//		FirstStartTime:         firstStartTime.Unix(),
+		//		InflowPass:             inflow_pass,
+		//		Remark:                 remark,
+		//		StartTime:              startTime.Unix(),
+		//		StopReason:             stop_reason,
+		//		UserStatus:             user_status,
+		//		Creator:                creator,
+		//		UserOrgId:              orgId,
+		//		Status:                 1,
+		//		Ctime:                  time.Now().Unix(),
+		//		StopTime:               stopTime.Unix(),
+		//		PatientId:              patient_id,
+		//		OtherVascular:          other_vascular,
+		//		CiType:                 ci_type,
+		//		BloodCultupe:           blood_cultupe,
+		//		SequelaeType:           sequelae_type,
+		//	}
+		//	err := service.SaveVascularAccess(&access)
+		//	if err == nil {
+		//		this.ServeSuccessJSON(map[string]interface{}{
+		//			"access": access,
+		//		})
+		//		return
+		//	}
+		//} else if errcode == nil {
+		//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+		//	return
 	}
 
 }
@@ -467,20 +494,29 @@ func (this *DoctorsApiController) UpdateVasularAccess() {
 		CiType:                 ci_type,
 		BloodCultupe:           blood_cultupe,
 		SequelaeType:           sequelae_type,
+		PatientId:              patientId,
 	}
-	_, errcode := service.GetDialysisDateByDateOne(startTime.Unix(), patientId, orgId, id)
-	if errcode == gorm.ErrRecordNotFound {
-		err := service.UpdateVascularAccess(&access, id)
-		if err == nil {
-			this.ServeSuccessJSON(map[string]interface{}{
-				"access": access,
-			})
-			return
-		}
-	} else if errcode == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+
+	err := service.UpdateVascularAccess(&access, id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"access": access,
+		})
 		return
 	}
+	//_, errcode := service.GetDialysisDateByDateOne(startTime.Unix(), patientId, orgId, id)
+	//if errcode == gorm.ErrRecordNotFound {
+	//	err := service.UpdateVascularAccess(&access, id)
+	//	if err == nil {
+	//		this.ServeSuccessJSON(map[string]interface{}{
+	//			"access": access,
+	//		})
+	//		return
+	//	}
+	//} else if errcode == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderRepeatBed)
+	//	return
+	//}
 
 }
 

controllers/gobal_config_api_controller.go

@@ -85,6 +85,7 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/order/addorderconfig", &GobalConfigApiController{}, "Get:AddOrderConfig")
 	beego.Router("/api/order/getorderconfig", &GobalConfigApiController{}, "Get:GetOrderConfig")
 	beego.Router("/api/drugstock/getdrugautomaticlist", &GobalConfigApiController{}, "Get:GetDrugAutoMaticList")
+	beego.Router("/api/drugstock/getdrugwarehouseorderinfo", &GobalConfigApiController{}, "Get:GetDrugWarehuseOrderInfo")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1721,3 +1722,13 @@ func (c *GobalConfigApiController) GetDrugAutoMaticList() {
 		"drugList":   drugList,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugWarehuseOrderInfo() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, _ := service.GetDrugWarehuseOrderInfo(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/manage_api_controller.go

@@ -123,6 +123,7 @@ func ManageRouters() {
 	beego.Router("/api/manage/deletehadwater", &MachineApiController{}, "Get:DeleteHadWater")
 	beego.Router("/api/manage/deletewater", &MachineApiController{}, "Get:DeleteWater")
 	beego.Router("/api/manage/deletedeviceph", &MachineApiController{}, "Get:DeleteDevicePh")
+
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -1192,35 +1193,35 @@ func (this *MachineApiController) SaveInformation() {
 			Date:  startdate,
 			Class: classtype,
 			//	Zone:                  zone,
-			BedNumber:           bednumber,
-			PatientId:           patient_time,
-			Contagion:           contagion,
-			DialysisMode:        dialysis_mode,
-			StartTime:           startDate.Unix(),
-			EndTime:             endDate.Unix(),
-			DialysisHour:        dialysis_time,
-			Hyperfiltratio:      hyperfiletration,
-			WeightLoss:          weight_loss,
-			WarningValue:        warining_value,
-			UserTotal:           user_total,
-			Move:                run,
-			FailureStage:        failure_stage,
-			FaultDescription:    falult_desciription,
-			CodeInformation:     code_information,
-			DisinfectantType:    disinfectant_type,
-			DisinfectType:       disinfect_type,
-			Disinfection:        disinfection,
-			MachineRun:          machine_run,
-			FluidPath:           fluid_path,
-			Disinfectant:        disinfectant,
-			DisinfectionStatus:  disinfection_status,
-			DisinfectionResidue: disinfection_residue,
-			LongTime:            longtime,
-			DisinfecStartime:    start_Date.Unix(),
-			DisinfecEndtime:     end_Date.Unix(),
-			DialysisChecked:     dialysis_checked,
-			DialysisName:        dialysis_name,
-			Norms:               norms,
+			BedNumber:             bednumber,
+			PatientId:             patient_time,
+			Contagion:             contagion,
+			DialysisMode:          dialysis_mode,
+			StartTime:             startDate.Unix(),
+			EndTime:               endDate.Unix(),
+			DialysisHour:          dialysis_time,
+			Hyperfiltratio:        hyperfiletration,
+			WeightLoss:            weight_loss,
+			WarningValue:          warining_value,
+			UserTotal:             user_total,
+			Move:                  run,
+			FailureStage:          failure_stage,
+			FaultDescription:      falult_desciription,
+			CodeInformation:       code_information,
+			DisinfectantType:      disinfectant_type,
+			DisinfectType:         disinfect_type,
+			Disinfection:          disinfection,
+			MachineRun:            machine_run,
+			FluidPath:             fluid_path,
+			Disinfectant:          disinfectant,
+			DisinfectionStatus:    disinfection_status,
+			DisinfectionResidue:   disinfection_residue,
+			LongTime:              longtime,
+			DisinfecStartime:      start_Date.Unix(),
+			DisinfecEndtime:       end_Date.Unix(),
+			DialysisChecked:       dialysis_checked,
+			DialysisName:          dialysis_name,
+			Norms:                 norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -1241,38 +1242,38 @@ func (this *MachineApiController) SaveInformation() {
 		})
 	} else if errinfor == nil {
 		infor := models.DeviceInformation{
-			Date:                startdate,
-			Class:               classtype,
-			Zone:                zone,
-			BedNumber:           bednumber,
-			PatientId:           patient_time,
-			Contagion:           contagion,
-			DialysisMode:        dialysis_mode,
-			StartTime:           startDate.Unix(),
-			EndTime:             endDate.Unix(),
-			DialysisHour:        dialysis_time,
-			Hyperfiltratio:      hyperfiletration,
-			WeightLoss:          weight_loss,
-			WarningValue:        warining_value,
-			UserTotal:           user_total,
-			Move:                run,
-			FailureStage:        failure_stage,
-			FaultDescription:    falult_desciription,
-			CodeInformation:     code_information,
-			DisinfectantType:    disinfectant_type,
-			DisinfectType:       disinfect_type,
-			Disinfection:        disinfection,
-			MachineRun:          machine_run,
-			FluidPath:           fluid_path,
-			Disinfectant:        disinfectant,
-			DisinfectionStatus:  disinfection_status,
-			DisinfectionResidue: disinfection_residue,
-			LongTime:            longtime,
-			DisinfecStartime:    start_Date.Unix(),
-			DisinfecEndtime:     end_Date.Unix(),
-			DialysisChecked:     dialysis_checked,
-			DialysisName:        dialysis_name,
-			Norms:               norms,
+			Date:                  startdate,
+			Class:                 classtype,
+			Zone:                  zone,
+			BedNumber:             bednumber,
+			PatientId:             patient_time,
+			Contagion:             contagion,
+			DialysisMode:          dialysis_mode,
+			StartTime:             startDate.Unix(),
+			EndTime:               endDate.Unix(),
+			DialysisHour:          dialysis_time,
+			Hyperfiltratio:        hyperfiletration,
+			WeightLoss:            weight_loss,
+			WarningValue:          warining_value,
+			UserTotal:             user_total,
+			Move:                  run,
+			FailureStage:          failure_stage,
+			FaultDescription:      falult_desciription,
+			CodeInformation:       code_information,
+			DisinfectantType:      disinfectant_type,
+			DisinfectType:         disinfect_type,
+			Disinfection:          disinfection,
+			MachineRun:            machine_run,
+			FluidPath:             fluid_path,
+			Disinfectant:          disinfectant,
+			DisinfectionStatus:    disinfection_status,
+			DisinfectionResidue:   disinfection_residue,
+			LongTime:              longtime,
+			DisinfecStartime:      start_Date.Unix(),
+			DisinfecEndtime:       end_Date.Unix(),
+			DialysisChecked:       dialysis_checked,
+			DialysisName:          dialysis_name,
+			Norms:                 norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -2488,37 +2489,37 @@ func (this *MachineApiController) UpdateForm() {
 	err = service.UpdatedZoneID(bednumber, orgid, &deviceNumber)
 	fmt.Println("更新区号失败", err)
 	information := models.DeviceInformation{
-		Date:                startdate,
-		Class:               classtype,
-		Zone:                zone,
-		BedNumber:           bednumber,
-		Contagion:           contagion,
-		DialysisMode:        dialysis_mode,
-		StartTime:           startDate.Unix(),
-		EndTime:             endDate.Unix(),
-		DialysisHour:        dialysis_time,
-		Hyperfiltratio:      hyperfiletration,
-		WeightLoss:          weight_loss,
-		WarningValue:        warining_value,
-		UserTotal:           user_total,
-		Move:                run,
-		FailureStage:        failure_stage,
-		FaultDescription:    falult_desciription,
-		CodeInformation:     code_information,
-		DisinfectantType:    disinfectant_type,
-		DisinfectType:       disinfect_type,
-		Disinfection:        disinfection,
-		MachineRun:          machine_run,
-		FluidPath:           fluid_path,
-		Disinfectant:        disinfectant,
-		DisinfectionStatus:  disinfection_status,
-		DisinfectionResidue: disinfection_residue,
-		LongTime:            longtime,
-		DisinfecStartime:    distartime,
-		DisinfecEndtime:     diendtime,
-		DialysisChecked:     dialysis_checked,
-		DialysisName:        dialysis_name,
-		Norms:               norms,
+		Date:                  startdate,
+		Class:                 classtype,
+		Zone:                  zone,
+		BedNumber:             bednumber,
+		Contagion:             contagion,
+		DialysisMode:          dialysis_mode,
+		StartTime:             startDate.Unix(),
+		EndTime:               endDate.Unix(),
+		DialysisHour:          dialysis_time,
+		Hyperfiltratio:        hyperfiletration,
+		WeightLoss:            weight_loss,
+		WarningValue:          warining_value,
+		UserTotal:             user_total,
+		Move:                  run,
+		FailureStage:          failure_stage,
+		FaultDescription:      falult_desciription,
+		CodeInformation:       code_information,
+		DisinfectantType:      disinfectant_type,
+		DisinfectType:         disinfect_type,
+		Disinfection:          disinfection,
+		MachineRun:            machine_run,
+		FluidPath:             fluid_path,
+		Disinfectant:          disinfectant,
+		DisinfectionStatus:    disinfection_status,
+		DisinfectionResidue:   disinfection_residue,
+		LongTime:              longtime,
+		DisinfecStartime:      distartime,
+		DisinfecEndtime:       diendtime,
+		DialysisChecked:       dialysis_checked,
+		DialysisName:          dialysis_name,
+		Norms:                 norms,
 		DialysisConcentration: dialysis_concentration,
 		GermChecked:           germ_checked,
 		GermName:              germ_name,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -688,6 +688,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 	psychological_other := c.GetString("psychological_other")
 
 	admission_number := c.GetString("admission_number")
+	tumble, _ := c.GetInt64("tumble")
 
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -741,6 +742,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		PrecautionOther:              precaution_other,
 		PsychologicalOther:           psychological_other,
 		AdmissionNumber:              admission_number,
+		Tumble:                       tumble,
 	}
 
 	if receiveTreatment.ID == 0 { //新增
@@ -847,6 +849,13 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	diastolic_pressure := c.GetString("diastolic_pressure")
 	other_complication := c.GetString("other_complication")
 	ktv := c.GetString("ktv")
+	urr := c.GetString("urr")
+	hypertenison, _ := c.GetInt64("hypertenison")
+	hypopiesia, _ := c.GetInt64("hypopiesia")
+	leave_office_method, _ := c.GetInt64("leave_office_method")
+	lapse, _ := c.GetInt64("lapse")
+	consciousness, _ := c.GetInt64("consciousness")
+	fallrisk, _ := c.GetInt64("fallrisk")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -940,6 +949,13 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		DiastolicPressure:            diastolic_pressure,
 		OtherComplication:            other_complication,
 		Ktv:                          ktv,
+		Urr:                          urr,
+		Hypopiesia:                   hypopiesia,
+		Hypertenison:                 hypertenison,
+		Lapse:                        lapse,
+		LeaveOfficeMethod:            leave_office_method,
+		Consciousness:                consciousness,
+		Fallrisk:                     fallrisk,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -1078,6 +1094,13 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
+	single_time := c.GetString("single_time")
+	single_water := c.GetString("single_water")
+	replacement_flow := c.GetString("replacement_flow")
+	plasma_separator := c.GetString("plasma_separator")
+	bilirubin_adsorption_column := c.GetString("bilirubin_adsorption_column")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
@@ -1165,6 +1188,13 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DialysisIrrigation:         dialysis_irrigation,
 		AntioxidantCommodityName:   antioxidant_commodity_name,
 		DisplaceSpeed:              displace_speed,
+		Illness:                    illness,
+		Amylaceum:                  amylaceum,
+		SingleTime:                 single_time,
+		SingleWater:                single_water,
+		ReplacementFlow:            replacement_flow,
+		PlasmaSeparator:            plasma_separator,
+		BilirubinAdsorptionColumn:  bilirubin_adsorption_column,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1788,14 +1818,23 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
+	//后期预增脱水量
+	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
+	fmt.Println(evaluation)
 	if prescription.ID > 0 {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 || template.TemplateId == 32 { //adminUserInfo.Org.Id == 9538
+			if (template.TemplateId == 6 || template.TemplateId == 32) && adminUserInfo.Org.Id != 9671 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
+			//针对医师汇
+			if template.TemplateId == 6 && adminUserInfo.Org.Id == 9671 {
+				dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+				ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
+			}
+
 			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 			}
@@ -1958,6 +1997,13 @@ func (c *DialysisAPIController) PostSolution() {
 	dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	displace_speed := c.GetString("displace_speed")
+	illness, _ := c.GetInt64("illness")
+	amylaceum := c.GetString("amylaceum")
+	single_time := c.GetString("single_time")
+	single_water := c.GetString("single_water")
+	replacement_flow := c.GetString("replacement_flow")
+	plasma_separator := c.GetString("plasma_separator")
+	bilirubin_adsorption_column := c.GetString("bilirubin_adsorption_column")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2046,6 +2092,13 @@ func (c *DialysisAPIController) PostSolution() {
 		DialysisIrrigation:        dialysis_irrigation,
 		AntioxidantCommodityName:  antioxidant_commodity_name,
 		DisplaceSpeed:             displace_speed,
+		Illness:                   illness,
+		Amylaceum:                 amylaceum,
+		SingleWater:               single_water,
+		SingleTime:                single_time,
+		ReplacementFlow:           replacement_flow,
+		PlasmaSeparator:           plasma_separator,
+		BilirubinAdsorptionColumn: bilirubin_adsorption_column,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2276,16 +2329,24 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
+
+	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
+	fmt.Println(evaluation)
 	if prescription.ID > 0 {
 
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 {
+			if template.TemplateId == 6 && adminInfo.Org.Id != 9671 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+			//if template.TemplateId == 6 && adminInfo.Org.Id ==9671{
+			//  dehydration, _ := strconv.ParseFloat(evaluation.Dehydration, 64)
+			//  ultrafiltration_rate = math.Floor((prescription.TargetUltrafiltration + dehydration) / float64(totalMin) * 60 * 1000)
+			//  record.UltrafiltrationRate = ultrafiltration_rate
+			//}
 
 			if template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 {
 
@@ -2307,7 +2368,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 	// record.UltrafiltrationRate = ultrafiltration_rate
+
 	record.UltrafiltrationVolume = 0
+
 	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)
@@ -3555,7 +3618,7 @@ func (c *DialysisAPIController) EditConsumables() {
 		if dataBody["goods"] != nil && reflect.TypeOf(dataBody["goods"]).String() == "[]interface {}" {
 
 			goods, _ := dataBody["goods"].([]interface{})
-			fmt.Println("goods2222222222222", goods)
+
 			if len(goods) > 0 {
 				for _, item := range goods {
 					items := item.(map[string]interface{})
@@ -3639,7 +3702,7 @@ func (c *DialysisAPIController) EditConsumables() {
 				}
 			}
 		}
-		fmt.Println("hhhhhhhhhhhhhhhhhhhh", beforePrepares)
+
 		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
@@ -3699,7 +3762,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 		//查询是否有出库单
 		out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-		fmt.Println("是否有出库单22222222222222222222222", err)
+
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
 			timeStr := time.Now().Format("2006-01-02")
@@ -3848,7 +3911,7 @@ func (c *DialysisAPIController) EditConsumables() {
 							}
 							service.AddSigleAutoReduceRecordInfo(details)
 						} else if count == 1 {
-							fmt.Println("llllllllllllllllllllll")
+
 							service.UpdateUserInfoDetails(item.GoodTypeId, item.GoodId, record_time, adminInfo.Org.Id, patient_id, item.Count, &outInfo)
 						}
 						//details := &models.AutomaticReduceDetail{

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -80,7 +80,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	replacementRate, _ := this.GetFloat("replacement_rate")
 	displacementQuantity, _ := this.GetFloat("displacement_quantity")
 	ktv, _ := this.GetFloat("ktv")
-	fmt.Println("ktv -------------------", ktv)
+
 	symptom := this.GetString("symptom")
 	dispose := this.GetString("dispose")
 	conductivity, _ := this.GetFloat("conductivity")
@@ -94,6 +94,8 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	blood_sugar, _ := this.GetFloat("blood_sugar")
 	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
 	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
+	blood_pressure_monitoring_site, _ := this.GetInt64("blood_pressure_monitoring_site")
+	complication, _ := this.GetInt64("complication")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -112,44 +114,46 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		MonitoringDate:  date,
 		OperateTime:     operateTime,
 		// MonitoringTime:            recordTime,
-		PulseFrequency:            pulseFrequency,
-		BreathingRate:             breathingRated,
-		SystolicBloodPressure:     systolicBP,
-		DiastolicBloodPressure:    diastolicBP,
-		BloodPressureType:         int64(BPType),
-		BloodFlowVolume:           bloodFlowVolume,
-		VenousPressure:            venousPressure,
-		VenousPressureType:        venousPressureType,
-		ArterialPressure:          arterialPressure,
-		ArterialPressureType:      arterialPressureType,
-		TransmembranePressure:     transmembranePressure,
-		TransmembranePressureType: transmembranePressureType,
-		UltrafiltrationRate:       ultrafiltrationRate,
-		UltrafiltrationVolume:     ultrafiltrationVolume,
-		SodiumConcentration:       sodiumConcentration,
-		DialysateTemperature:      dialysateTemperature,
-		Temperature:               temperature,
-		ReplacementRate:           replacementRate,
-		DisplacementQuantity:      displacementQuantity,
-		Ktv:                       ktv,
-		Symptom:                   symptom,
-		Dispose:                   dispose,
-		Result:                    result,
-		MonitoringNurse:           monitoringNurse,
-		Status:                    1,
-		CreatedTime:               time.Now().Unix(),
-		UpdatedTime:               time.Now().Unix(),
-		Conductivity:              conductivity,
-		DisplacementFlowQuantity:  displacement_flow_quantity,
-		BloodOxygenSaturation:     blood_oxygen_saturation,
-		Creator:                   adminInfo.AdminUser.Id,
-		Modify:                    0,
-		Heparin:                   heparin,
-		DialysateFlow:             dialysate_flow,
-		Urr:                       urr,
-		BloodSugar:                blood_sugar,
-		MonitorAnticoagulant:      monitor_anticoagulant,
-		MonitorAnticoagulantValue: monitor_anticoagulant_value,
+		PulseFrequency:              pulseFrequency,
+		BreathingRate:               breathingRated,
+		SystolicBloodPressure:       systolicBP,
+		DiastolicBloodPressure:      diastolicBP,
+		BloodPressureType:           int64(BPType),
+		BloodFlowVolume:             bloodFlowVolume,
+		VenousPressure:              venousPressure,
+		VenousPressureType:          venousPressureType,
+		ArterialPressure:            arterialPressure,
+		ArterialPressureType:        arterialPressureType,
+		TransmembranePressure:       transmembranePressure,
+		TransmembranePressureType:   transmembranePressureType,
+		UltrafiltrationRate:         ultrafiltrationRate,
+		UltrafiltrationVolume:       ultrafiltrationVolume,
+		SodiumConcentration:         sodiumConcentration,
+		DialysateTemperature:        dialysateTemperature,
+		Temperature:                 temperature,
+		ReplacementRate:             replacementRate,
+		DisplacementQuantity:        displacementQuantity,
+		Ktv:                         ktv,
+		Symptom:                     symptom,
+		Dispose:                     dispose,
+		Result:                      result,
+		MonitoringNurse:             monitoringNurse,
+		Status:                      1,
+		CreatedTime:                 time.Now().Unix(),
+		UpdatedTime:                 time.Now().Unix(),
+		Conductivity:                conductivity,
+		DisplacementFlowQuantity:    displacement_flow_quantity,
+		BloodOxygenSaturation:       blood_oxygen_saturation,
+		Creator:                     adminInfo.AdminUser.Id,
+		Modify:                      0,
+		Heparin:                     heparin,
+		DialysateFlow:               dialysate_flow,
+		Urr:                         urr,
+		BloodSugar:                  blood_sugar,
+		MonitorAnticoagulant:        monitor_anticoagulant,
+		MonitorAnticoagulantValue:   monitor_anticoagulant_value,
+		BloodPressureMonitoringSite: blood_pressure_monitoring_site,
+		Complication:                complication,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -246,6 +250,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	adminInfo := this.GetMobileAdminUserInfo()
 	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
 	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
+	blood_pressure_monitoring_site, _ := this.GetInt64("blood_pressure_monitoring_site")
+	complication, _ := this.GetInt64("complication")
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -295,6 +301,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.BloodSugar = blood_sugar
 	monitor.MonitorAnticoagulant = monitor_anticoagulant
 	monitor.MonitorAnticoagulantValue = monitor_anticoagulant_value
+	monitor.BloodPressureMonitoringSite = blood_pressure_monitoring_site
+	monitor.Complication = complication
 	err = service.UpdateMonitor(monitor)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorUpdate)

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -41,7 +41,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminInfo.AdminUser.Id, delivery_way)
 	//获取his医嘱数据
 	fmt.Println("date.un222222", date.Unix())
-	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way)
+	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
 	config, _ := service.GetHisDoctorConfig(orgID)
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
 	if err != nil {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2407,6 +2407,22 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		dehydration := dataBody["dehydration"].(string)
 		evaluation.Dehydration = dehydration
 	}
+
+	if dataBody["period"] != nil && reflect.TypeOf(dataBody["period"]).String() == "float64" {
+		period := int64(dataBody["period"].(float64))
+		evaluation.Period = period
+	}
+
+	if dataBody["estimated_food_intake"] != nil && reflect.TypeOf(dataBody["estimated_food_intake"]).String() == "string" {
+		estimated_food_intake := dataBody["estimated_food_intake"].(string)
+		evaluation.EstimatedFoodIntake = estimated_food_intake
+	}
+
+	if dataBody["blood_pressure_during_dialysis"] != nil && reflect.TypeOf(dataBody["blood_pressure_during_dialysis"]).String() == "string" {
+		blood_pressure_during_dialysis := dataBody["blood_pressure_during_dialysis"].(string)
+		evaluation.BloodPressureDuringDialysis = blood_pressure_during_dialysis
+	}
+
 	return
 }
 

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -220,7 +220,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid": vid,
+			"vid":                 vid,
 		})
 	} else {
 		itemId, err := service.GetIdByItemId(detail.InspectionMinor, orgId)
@@ -230,7 +230,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid": itemId.ID,
+			"vid":                 itemId.ID,
 		})
 	}
 
@@ -513,19 +513,23 @@ func (this *CommonApiController) GetDialysisModeType() {
 	loc, _ := time.LoadLocation("Local")
 	startime := this.GetString("startime")
 	endtime := this.GetString("endtime")
-	//fmt.Println("endtime", endtime)
+
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
 	startimes := startTimes.Unix()
-	// fmt.Println("startime",startimes)
+
 	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 00:00:00", loc)
 	endtimeData := endtimes.Unix()
-	// fmt.Println("结束日期",endtimeData)
+
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
+
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	//统计透析总量
-	_, total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid)
-
-	modeType, err := service.GetDialysisCountMode(startimes, endtimeData, orgid)
+	total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid, lapsetotype, sourcetype)
+	fmt.Println("total3333333333333", total)
+	modeType, err := service.GetDialysisCountMode(startimes, endtimeData, orgid, lapsetotype, sourcetype)
+	fmt.Println("modetype555555555555555", modeType)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -547,19 +551,21 @@ func (this *CommonApiController) GetTotalLapseCount() {
 	endtime := this.GetString("endtime")
 	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
 	endunix := endtimes.Unix()
-
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计该机构的转出人数
-	patients, err := service.GetTotalRollOutPatients(orgid, startnunix, endunix)
+	patients, err := service.GetTotalRollOutPatients(orgid, startnunix, endunix, lapsetotype, sourcetype)
+
 	//统计该机构转出病人
-	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startnunix, endunix)
-	count := service.GetPatientTotalCount(orgid)
+	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startnunix, endunix, lapsetotype, sourcetype)
+	count := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
 	//统计当前机构转出的人数
-	rollout, err := service.GetCountRollout(orgid, startnunix, endunix)
+	rollout, err := service.GetCountRollout(orgid, startnunix, endunix, lapsetotype, sourcetype)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patients":   patients,
 		"count":      count,
@@ -576,17 +582,22 @@ func (this *CommonApiController) GetTotalSexCount() {
 	fmt.Println("开始时间", startime)
 	endtime, _ := this.GetInt64("endtime")
 	fmt.Println("结束时间", endtime)
-	total := service.GetPatientTotalCount(orgid)
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
+
+	_, totalSex, err := service.GetManPatientTotal(orgid, lapsetotype, sourcetype)
 
-	_, totalSex, err := service.GetManPatientTotal(orgid)
+	_, totalWoman, err := service.GetWoManPatientTotal(orgid, lapsetotype, sourcetype)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":    total,
-		"totalSex": totalSex,
+		"total":      total,
+		"totalSex":   totalSex,
+		"totalWoman": totalWoman,
 	})
 }
 
@@ -602,10 +613,13 @@ func (this *CommonApiController) GetTotalInfectiouscount() {
 	endtime := this.GetString("endtime")
 	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
 	endunix := endtimes.Unix()
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
+
 	//统计透析总人数
-	total := service.GetPatientTotalCount(orgid)
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
 	//统计透析人数传染病所占比例
-	count, err := service.GetPatientInfectiousCount(orgid, startnunix, endunix)
+	count, err := service.GetPatientInfectiousCount(orgid, startnunix, endunix, lapsetotype, sourcetype)
 	//统计其他
 	_, otherTotal, err := service.GetPatientOtherInfectious(orgid)
 	if err != nil {
@@ -627,9 +641,12 @@ func (this *CommonApiController) GetTotalAgeCount() {
 	fmt.Println("开始时间", startime)
 	endtime, _ := this.GetInt64("endtime")
 	fmt.Println("结束时间", endtime)
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计透析总人数
-	total := service.GetPatientTotalCount(orgid)
-	agecount, err := service.GetTotalAgeCount(orgid)
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
+	agecount, err := service.GetTotalAgeCount(orgid, lapsetotype, sourcetype)
+	fmt.Println("ageCount22222222222", agecount)
 	//two, err := service.GetTotalAgeCountTwo(orgid, startime, endtime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -653,15 +670,17 @@ func (this *CommonApiController) GetTotalDialysisCount() {
 	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	fmt.Println("parseDateErr", parseDateErr)
 	nowtime := recordDate.Unix()
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计透析总人数
-	total := service.GetPatientTotalCount(orgid)
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
 	fmt.Println("total", total)
 	//获取该机构下的所有病人数据
 	patients, err := service.GetTotalDialysisAgeCount(orgid)
 	fmt.Println("patients", patients)
 
 	//统计透年龄
-	dataage, _ := service.GetDialysisAgeData(orgid)
+	dataage, _ := service.GetDialysisAgeData(orgid, lapsetotype, sourcetype)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2104,11 +2123,13 @@ func (this *CommonApiController) GetRolloutCount() {
 
 	start_time, _ := this.GetInt64("start_time")
 	end_time, _ := this.GetInt64("end_time")
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 
 	//统计当前机构转出的人数
-	rollout, err := service.GetCountRollout(orgId, start_time, end_time)
+	rollout, err := service.GetCountRollout(orgId, start_time, end_time, lapsetotype, sourcetype)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/new_mobile_api_controllers/good_types.json

@@ -28,7 +28,8 @@
       "status": 1,
       "type": 1,
       "number": 2,
-      "out_stock": 1
+      "out_stock": 1,
+      "stock_attribute": 2,
     },
     {
       "id": 10002,
@@ -43,7 +44,8 @@
       "status": 1,
       "type": 1,
       "number": 3,
-      "out_stock": 1
+      "out_stock": 1,
+      "stock_attribute": 3,
     },
     {
       "id": 10003,

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -31,10 +31,14 @@ func (this *NewCommonApiController) GetTotalDialysis() {
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
 
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
+
 	//统计透析总量
-	_, total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid)
+	total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid, lapsetotype, sourcetype)
+
+	modeType, err := service.GetDialysisCountMode(startimes, endtimeData, orgid, lapsetotype, sourcetype)
 
-	modeType, err := service.GetDialysisCountMode(startimes, endtimeData, orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -52,10 +56,16 @@ func (this *NewCommonApiController) GetMobileTotalLapseCount() {
 
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计转出的病人
-	patient, err := service.GetTotalRollOutPatients(orgid, startime, endtime)
-	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startime, endtime)
-	count := service.GetPatientTotalCount(orgid)
+	patient, err := service.GetTotalRollOutPatients(orgid, startime, endtime, lapsetotype, sourcetype)
+
+	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startime, endtime, lapsetotype, sourcetype)
+	count := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
+	//统计当前机构转出的人数
+	rollout, err := service.GetCountRollout(orgid, startime, endtime, lapsetotype, sourcetype)
+	fmt.Println("roullout", rollout)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -64,6 +74,7 @@ func (this *NewCommonApiController) GetMobileTotalLapseCount() {
 		"patient":    patient,
 		"count":      count,
 		"patienttwo": patienttwo,
+		"rollout":    rollout,
 	})
 }
 
@@ -72,17 +83,21 @@ func (this *NewCommonApiController) GetMobileTotalSexCount() {
 	//fmt.Println("startime", startime)
 	//endtime, _ := this.GetInt64("endtime")
 	//fmt.Println("endtime", endtime)
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
-	total := service.GetPatientTotalCount(orgid)
-	_, totalSex, err := service.GetManPatientTotal(orgid)
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
+	_, totalSex, err := service.GetManPatientTotal(orgid, lapsetotype, sourcetype)
+	_, totalWoman, err := service.GetWoManPatientTotal(orgid, lapsetotype, sourcetype)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":    total,
-		"totalSex": totalSex,
+		"total":      total,
+		"totalSex":   totalSex,
+		"totalWoman": totalWoman,
 	})
 }
 
@@ -93,10 +108,13 @@ func (this *NewCommonApiController) GetMobileTotalInfectiousCout() {
 
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
+
 	//统计透析总人数
-	total := service.GetPatientTotalCount(orgid)
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
 	//统计透析人数传染病所占比例
-	count, err := service.GetPatientInfectiousCount(orgid, startime, endtime)
+	count, err := service.GetPatientInfectiousCount(orgid, startime, endtime, lapsetotype, sourcetype)
 	//统计其他
 	_, otherTotal, err := service.GetPatientOtherInfectious(orgid)
 	if err != nil {
@@ -114,11 +132,12 @@ func (this *NewCommonApiController) GetMobileTotalAgeCount() {
 	//startime, _ := this.GetInt64("startime")
 	//
 	//endtime, _ := this.GetInt64("endtime")
-
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
-	total := service.GetPatientTotalCount(orgid)
-	agecount, err := service.GetTotalAgeCount(orgid)
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
+	agecount, err := service.GetTotalAgeCount(orgid, lapsetotype, sourcetype)
 	//two, err := service.GetTotalAgeCountTwo(orgid, startime, endtime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -141,10 +160,12 @@ func (this *NewCommonApiController) GetMobileTotalDialysisCount() {
 	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	fmt.Println(parseDateErr)
 	nowtime := recordDate.Unix()
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计透析总人数
-	total := service.GetPatientTotalCount(orgid)
+	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
 	//获取该机构下的所有病人数据
-	ageData, err := service.GetDialysisAgeData(orgid)
+	ageData, err := service.GetDialysisAgeData(orgid, lapsetotype, sourcetype)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2123,8 +2144,10 @@ func (this *NewCommonApiController) GetMobileRolloutCount() {
 
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	orgId := adminUserInfo.Org.Id
+	lapsetotype, _ := this.GetInt64("lapsetotype")
+	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计当前机构转出的人数
-	rollout, err := service.GetCountRollout(orgId, startimes, endtimeData)
+	rollout, err := service.GetCountRollout(orgId, startimes, endtimeData, lapsetotype, sourcetype)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -172,6 +172,7 @@ func (this *NewDialysisApiController) SavePatient() {
 	birth := theTime.Unix()
 	fmt.Print(birth)
 	phone := dataBody["phone"].(string)
+	relative_phone := dataBody["relative_phone"].(string)
 	fmt.Print("电话号码", phone)
 	patientType := dataBody["result"].([]interface{})
 	fmt.Print("患者标签", patientType)
@@ -290,6 +291,7 @@ func (this *NewDialysisApiController) SavePatient() {
 			IdCardNo:          idCard,
 			IsInfectious:      is_infectious,
 			RegistrarsId:      adminInfo.AdminUser.Id,
+			RelativePhone:     relative_phone,
 		}
 		err = service.CreateOldPatient(&patients)
 		fmt.Print("报错", err)
@@ -331,6 +333,7 @@ func (this *NewDialysisApiController) SavePatient() {
 			IsInfectious:      is_infectious,
 			IdCardNo:          idCard,
 			RegistrarsId:      adminInfo.AdminUser.Id,
+			RelativePhone:     relative_phone,
 		}
 		err = service.CreateNewPatient(&patientsNew)
 		fmt.Print("报错", err)
@@ -455,6 +458,7 @@ func (this *NewDialysisApiController) SavePatient() {
 								MemberFistdate:    memtime,
 								MemberPatienttype: patient_type,
 								MemberTreatement:  treatmentmethod,
+								RelativePhone:     relative_phone,
 							}
 							err = service.CreateNewPatient(&patientsNew)
 							fmt.Print("报错", err)
@@ -541,6 +545,7 @@ func (this *NewDialysisApiController) SavePatient() {
 					MemberFistdate:    memtime,
 					MemberPatienttype: patient_type,
 					MemberTreatement:  treatmentmethod,
+					RelativePhone:     relative_phone,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				fmt.Print("报错", err)
@@ -1254,6 +1259,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 	fmt.Print(birth)
 	phone := dataBody["phone"].(string)
 	fmt.Print("电话号码", phone)
+	relative_phone := dataBody["relative_phone"].(string)
 	patientType := dataBody["result"].([]interface{})
 	fmt.Print("患者标签", patientType)
 	dialysis := dataBody["dialysis"].(string)
@@ -1387,6 +1393,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Lapseto:           lapseto,
 			DeathTime:         death_time,
 			OutReason:         out_reason,
+			RelativePhone:     relative_phone,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
 		//patientLapseto := models.PatientLapseto{
@@ -1417,6 +1424,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			Lapseto:           lapseto,
 			OutReason:         out_reason,
 			DeathTime:         death_time,
+			RelativePhone:     relative_phone,
 		}
 		err = service.UpdateXtPatientNew(patientsNew, id)
 		if err != nil {
@@ -1474,6 +1482,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			EquitmentId:       requipmentId,
 			OutReason:         out_reason,
 			DeathTime:         death_time,
+			RelativePhone:     relative_phone,
 		}
 		err = service.UpdateXtPatientNew(xtPatientsNew, id)
 		fmt.Print("更新失败", err)
@@ -1530,6 +1539,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			MemberTreatement:  treatmentmethod,
 			OutReason:         out_reason,
 			DeathTime:         death_time,
+			RelativePhone:     relative_phone,
 		}
 		err = service.UpdateXtPatientNewOne(patientsNew, id)
 		if err != nil {

controllers/patient_api_controller.go

@@ -254,29 +254,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             0,
-		Avatar:             patients.Avatar,
-		PatientType:        patients.PatientType,
-		DialysisNo:         patients.DialysisNo,
-		AdmissionNumber:    patients.AdmissionNumber,
-		Source:             patients.Source,
-		Lapseto:            patients.Lapseto,
-		PartitionId:        patients.PartitionId,
-		BedId:              patients.BedId,
-		Name:               patients.Name,
-		Alias:              patients.Alias,
-		Gender:             patients.Gender,
-		MaritalStatus:      patients.MaritalStatus,
-		IdCardNo:           patients.IdCardNo,
-		Birthday:           patients.Birthday,
-		ReimbursementWayId: patients.ReimbursementWayId,
-		HealthCareType:     patients.HealthCareType,
-		HealthCareNo:       patients.HealthCareNo,
-		HealthCareDueDate:  patients.HealthCareDueDate,
-		Height:             patients.Height,
-		BloodType:          patients.BloodType,
-		Rh:                 patients.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       0,
+		Avatar:                       patients.Avatar,
+		PatientType:                  patients.PatientType,
+		DialysisNo:                   patients.DialysisNo,
+		AdmissionNumber:              patients.AdmissionNumber,
+		Source:                       patients.Source,
+		Lapseto:                      patients.Lapseto,
+		PartitionId:                  patients.PartitionId,
+		BedId:                        patients.BedId,
+		Name:                         patients.Name,
+		Alias:                        patients.Alias,
+		Gender:                       patients.Gender,
+		MaritalStatus:                patients.MaritalStatus,
+		IdCardNo:                     patients.IdCardNo,
+		Birthday:                     patients.Birthday,
+		ReimbursementWayId:           patients.ReimbursementWayId,
+		HealthCareType:               patients.HealthCareType,
+		HealthCareNo:                 patients.HealthCareNo,
+		HealthCareDueDate:            patients.HealthCareDueDate,
+		Height:                       patients.Height,
+		BloodType:                    patients.BloodType,
+		Rh:                           patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -322,28 +322,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
-		IsInfectious:             patients.IsInfectious,
-		RemindCycle:              patients.RemindCycle,
-		ResponseResult:           patients.ResponseResult,
-		IsOpenRemind:             patients.IsOpenRemind,
-		FirstTreatmentDate:       patients.FirstTreatmentDate,
-		DialysisAge:              patients.DialysisAge,
-		ExpenseKind:              patients.ExpenseKind,
-		TellPhone:                patients.TellPhone,
-		ContactName:              patients.ContactName,
-		BloodPatients:            1,
-		SlowPatients:             0,
-		MemberPatients:           0,
-		EcommerPatients:          "",
-		BloodId:                  patients.ID,
-		SlowId:                   0,
-		MemberId:                 0,
-		MemberFistdate:           0,
-		MemberPatienttype:        0,
-		MemberTreatement:         0,
-		EquitmentId:              "",
-		UserSysBeforeCount:       patient.UserSysBeforeCount,
+		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
+		IsInfectious:                 patients.IsInfectious,
+		RemindCycle:                  patients.RemindCycle,
+		ResponseResult:               patients.ResponseResult,
+		IsOpenRemind:                 patients.IsOpenRemind,
+		FirstTreatmentDate:           patients.FirstTreatmentDate,
+		DialysisAge:                  patients.DialysisAge,
+		ExpenseKind:                  patients.ExpenseKind,
+		TellPhone:                    patients.TellPhone,
+		ContactName:                  patients.ContactName,
+		BloodPatients:                1,
+		SlowPatients:                 0,
+		MemberPatients:               0,
+		EcommerPatients:              "",
+		BloodId:                      patients.ID,
+		SlowId:                       0,
+		MemberId:                     0,
+		MemberFistdate:               0,
+		MemberPatienttype:            0,
+		MemberTreatement:             0,
+		EquitmentId:                  "",
+		UserSysBeforeCount:           patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -481,28 +481,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          patient.UserOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		PartitionId:        patient.PartitionId,
-		BedId:              patient.BedId,
-		Name:               patient.Name,
-		Alias:              patient.Alias,
-		Gender:             patient.Gender,
-		MaritalStatus:      patient.MaritalStatus,
-		IdCardNo:           patient.IdCardNo,
-		Birthday:           patient.Birthday,
-		ReimbursementWayId: patient.ReimbursementWayId,
-		HealthCareType:     patient.HealthCareType,
-		HealthCareNo:       patient.HealthCareNo,
-		HealthCareDueDate:  patient.HealthCareDueDate,
-		Height:             patient.Height,
-		BloodType:          patient.BloodType,
-		Rh:                 patient.Rh,
+		UserOrgId:                 patient.UserOrgId,
+		UserId:                    patient.UserId,
+		Avatar:                    patient.Avatar,
+		PatientType:               patient.PatientType,
+		DialysisNo:                patient.DialysisNo,
+		AdmissionNumber:           patient.AdmissionNumber,
+		Source:                    patient.Source,
+		PartitionId:               patient.PartitionId,
+		BedId:                     patient.BedId,
+		Name:                      patient.Name,
+		Alias:                     patient.Alias,
+		Gender:                    patient.Gender,
+		MaritalStatus:             patient.MaritalStatus,
+		IdCardNo:                  patient.IdCardNo,
+		Birthday:                  patient.Birthday,
+		ReimbursementWayId:        patient.ReimbursementWayId,
+		HealthCareType:            patient.HealthCareType,
+		HealthCareNo:              patient.HealthCareNo,
+		HealthCareDueDate:         patient.HealthCareDueDate,
+		Height:                    patient.Height,
+		BloodType:                 patient.BloodType,
+		Rh:                        patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -544,19 +544,19 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		ContactName:              patient.ContactName,
-		UpdatedTime:              time.Now().Unix(),
-		BloodPatients:            1,
-		Lapseto:                  patient.Lapseto,
+		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
+		IsInfectious:              patient.IsInfectious,
+		RemindCycle:               patient.RemindCycle,
+		ResponseResult:            patient.ResponseResult,
+		IsOpenRemind:              patient.IsOpenRemind,
+		FirstTreatmentDate:        patient.FirstTreatmentDate,
+		DialysisAge:               patient.DialysisAge,
+		ExpenseKind:               patient.ExpenseKind,
+		TellPhone:                 patient.TellPhone,
+		ContactName:               patient.ContactName,
+		UpdatedTime:               time.Now().Unix(),
+		BloodPatients:             1,
+		Lapseto:                   patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -856,6 +856,8 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 		DialysateTemperature:       solution.DialysateTemperature,
 		DialysisIrrigation:         solution.DialysisIrrigation,
 		DialysisDialyszers:         solution.DialysisDialyszers,
+		PlasmaSeparator:            solution.PlasmaSeparator,
+		BilirubinAdsorptionColumn:  solution.BilirubinAdsorptionColumn,
 	}
 	service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	if err != nil {
@@ -3410,6 +3412,16 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		solution.DialysisIrrigation = dialysisIrrigation
 	}
 
+	if dataBody["plasma_separator"] != nil && reflect.TypeOf(dataBody["plasma_separator"]).String() == "string" {
+		plasmaSeparator := dataBody["plasma_separator"].(string)
+		solution.PlasmaSeparator = plasmaSeparator
+	}
+
+	if dataBody["bilirubin_adsorption_column"] != nil && reflect.TypeOf(dataBody["bilirubin_adsorption_column"]).String() == "string" {
+		bilirubinAdsorptionColumn := dataBody["bilirubin_adsorption_column"].(string)
+		solution.BilirubinAdsorptionColumn = bilirubinAdsorptionColumn
+	}
+
 	return
 }
 

controllers/schedule_api_controller.go

@@ -22,6 +22,7 @@ type ScheduleApiController struct {
 
 func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/weekpanel", &ScheduleApiController{}, "Get:GetWeekPanels")
+
 	beego.Router("/api/schedule/schedules", &ScheduleApiController{}, "Get:GetSchedules")
 	beego.Router("/api/excel_date/init", &ScheduleApiController{}, "Get:GetInitExcelInitDate")
 
@@ -46,6 +47,23 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/schedule/getallzones", &ScheduleApiController{}, "Get:GetAllZones")
 
 	beego.Router("/api/schedule/copypatientschedules", &ScheduleApiController{}, "Get:GetCopyPatientSchedules")
+
+	beego.Router("/api/schedule/saveremindprint", &ScheduleApiController{}, "Get:SaveRemindPrint")
+
+	beego.Router("/api/schedule/getremindprintlist", &ScheduleApiController{}, "Get:GetRemindPrintList")
+
+	beego.Router("/api/schedule/getbloodschedulelist", &ScheduleApiController{}, "Get:GetBloodScheduleList")
+
+	beego.Router("/api/schedule/getprintlist", &ScheduleApiController{}, "Get:GetPrintList")
+
+	beego.Router("/api/schedule/getallzonelist", &ScheduleApiController{}, "Get:GetAllZoneList")
+
+	beego.Router("/api/schedule/getpatientschedulecount", &ScheduleApiController{}, "Get:GetPatientScheduleCount")
+
+	beego.Router("/api/schedule/weekpanelone", &ScheduleApiController{}, "Get:GetWeekPanelsOne")
+	beego.Router("/api/schedule/schedulesone", &ScheduleApiController{}, "Get:GetScheduleOne")
+	beego.Router("/api/schedule/postscheduletemplate", &ScheduleApiController{}, "Get:SaveScheduleTemplate")
+	beego.Router("/api/schedule/getscheduletemplate", &ScheduleApiController{}, "Get:GetScheduleTemplate")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -790,6 +808,7 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 func (this *ScheduleApiController) GetWeekDaySchedule() {
 	week_type, _ := this.GetInt64("week_type", -1)
 	week_time, _ := this.GetInt64("week_time")
+
 	thisTime := time.Now()
 	weekDay := int(thisTime.Weekday())
 	if weekDay == 0 {
@@ -810,7 +829,14 @@ func (this *ScheduleApiController) GetWeekDaySchedule() {
 	fmt.Println(days)
 
 	var targetDayStr string
+	var startTime string
+	var endTime string
 	switch week_type {
+	case 0:
+		{
+			startTime = days[0]
+			endTime = days[6]
+		}
 	case 1:
 		targetDayStr = days[0]
 		break
@@ -840,14 +866,17 @@ func (this *ScheduleApiController) GetWeekDaySchedule() {
 		break
 	}
 	targetDay, parseErr := utils.ParseTimeStringToTime("2006-01-02", targetDayStr)
-
+	startDay, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
+	endDay, _ := utils.ParseTimeStringToTime("2006-01-02", endTime)
+	fmt.Println(startDay, endDay)
 	if parseErr != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
 
-	adminUserInfo := this.GetAdminUserInfo()
-	list, _ := service.GetWeekDayScheduleTwo(adminUserInfo.CurrentOrgId, targetDay.Unix(), targetDay, week_time)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetWeekDayScheduleTwo(orgId, targetDay.Unix(), targetDay, week_time)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"schdules": list,
@@ -1324,10 +1353,11 @@ func (this *ScheduleApiController) ExportSchedule() {
 			if err == nil {
 				for _, item := range schedules {
 					//查找当天日期是否存在
-					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId)
+					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId, item.ModeId, item.ScheduleType)
 					if errcode == gorm.ErrRecordNotFound {
 						service.CreateSchedule(item)
 					} else if errcode == nil {
+
 						schedule := models.XtSchedule{
 							PartitionId:  item.PartitionId,
 							BedId:        item.BedId,
@@ -1338,7 +1368,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 							ModeId:       item.ModeId,
 							Status:       1,
 						}
-						service.UpdateScheduleByOrgId(item.PatientId, item.ScheduleDate, item.UserOrgId, &schedule)
+
+						service.UpdateScheduleByOrgId(item.PatientId, item.ScheduleDate, item.UserOrgId, item.ModeId, item.ScheduleType, &schedule)
 					}
 
 				}
@@ -1947,10 +1978,10 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 	week_time, _ := this.GetInt64("week_time")
 	start_time, _ := this.GetInt64("start_time")
 	end_time, _ := this.GetInt64("end_time")
-
+	zone, _ := this.GetInt64("zone")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId)
+	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -2188,3 +2219,407 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 	//	}
 	//}
 }
+
+func (this *ScheduleApiController) SaveRemindPrint() {
+
+	id, _ := this.GetInt64("id")
+	anticoagulants, _ := this.GetInt64("anticoagulant")
+	anticoagulant_zongliang, _ := this.GetInt64("anticoagulant_zongliang")
+	classes, _ := this.GetInt64("classes")
+	dialyzers, _ := this.GetInt64("dialyzers")
+	doctor_advice, _ := this.GetInt64("doctor_advice")
+	mode, _ := this.GetInt64("mode")
+	name, _ := this.GetInt64("name")
+	number, _ := this.GetInt64("number")
+	perfusion_apparatus, _ := this.GetInt64("perfusion_apparatus")
+	prescription_status, _ := this.GetInt64("prescription_status")
+	week, _ := this.GetInt64("week")
+	zone, _ := this.GetInt64("zone")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	setting := models.XtRemindPrintSetting{
+		Anticoagulant:          anticoagulants,
+		Classes:                classes,
+		AnticoagulantZongliang: anticoagulant_zongliang,
+		Dialyzers:              dialyzers,
+		DoctorAdvice:           doctor_advice,
+		Mode:                   mode,
+		Name:                   name,
+		Number:                 number,
+		PerfusionApparatus:     perfusion_apparatus,
+		PrescriptionStatus:     prescription_status,
+		Week:                   week,
+		Zone:                   zone,
+		UserOrgId:              orgId,
+		Status:                 1,
+		Ctime:                  time.Now().Unix(),
+	}
+	_, errcode := service.GetSettingById(id)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.CreateSetting(&setting)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"setting": setting,
+		})
+	} else if errcode == nil {
+		err := service.UpdatedRemindPrint(&setting, id)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"setting": setting,
+		})
+	}
+
+}
+func (this *ScheduleApiController) GetRemindPrintList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, err := service.GetRemindPrintList(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *ScheduleApiController) GetBloodScheduleList() {
+
+	week_type, _ := this.GetInt64("week_type", -1)
+	week_time, _ := this.GetInt64("week_time")
+	zone, _ := this.GetInt64("zone")
+	thisTime := time.Now()
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	weekTitle := make([]string, 0)
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		indexYear, indexMonthTime, indexDay := theDay.Date()
+		indexMonth := int(indexMonthTime)
+		indexWeek := strconv.Itoa(indexYear) + "." + strconv.Itoa(indexMonth) + "." + strconv.Itoa(indexDay)
+		weekTitle = append(weekTitle, indexWeek)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+	fmt.Println(days)
+
+	var targetDayStr string
+	var startTime string
+	switch week_type {
+	case 0:
+		startTime = days[0]
+		targetDayStr = days[6]
+		break
+	case 1:
+		targetDayStr = days[0]
+		break
+	case 2:
+		targetDayStr = days[1]
+
+		break
+	case 3:
+		targetDayStr = days[2]
+
+		break
+	case 4:
+		targetDayStr = days[3]
+
+		break
+	case 5:
+		targetDayStr = days[4]
+
+		break
+	case 6:
+		targetDayStr = days[5]
+
+		break
+	case 7:
+		targetDayStr = days[6]
+
+		break
+	}
+	targetDay, parseErr := utils.ParseTimeStringToTime("2006-01-02", targetDayStr)
+
+	if parseErr != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	if week_type > 0 {
+		list, err := service.GetWeekDayScheduleById(orgId, targetDay.Unix(), week_time)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+			"day":  targetDayStr,
+		})
+	}
+
+	if week_type == 0 {
+		startDate, _ := utils.ParseTimeStringToTime("2006-01-02", startTime)
+		list, err := service.GetWeekDayScheduleByIdTwo(orgId, targetDay.Unix(), week_time, startDate.Unix(), zone)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+			"day":  targetDayStr,
+		})
+	}
+
+}
+
+func (this *ScheduleApiController) GetPrintList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	list, err := service.GetRemindPrintList(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *ScheduleApiController) GetAllZoneList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	zoneList, err := service.GetAllZoneOne(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zoneList": zoneList,
+	})
+}
+
+func (this *ScheduleApiController) GetPatientScheduleCount() {
+	patitionIdStr := this.GetString("partition_id")
+	week, _ := this.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
+	ids := strings.Split(patitionIdStr, ",")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	thisTime := time.Now()
+	weekDay := int(thisTime.Weekday())
+	if week < 1 || week > 4 {
+		week = 2
+	}
+	if week == 1 {
+		thisTime = thisTime.AddDate(0, 0, -7)
+	} else if week == 3 {
+		thisTime = thisTime.AddDate(0, 0, 7)
+	} else if week == 4 {
+		thisTime = thisTime.AddDate(0, 0, 14)
+	}
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	weekTitle := make([]string, 0)
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		indexYear, indexMonthTime, indexDay := theDay.Date()
+		indexMonth := int(indexMonthTime)
+		indexWeek := strconv.Itoa(indexYear) + "." + strconv.Itoa(indexMonth) + "." + strconv.Itoa(indexDay)
+		weekTitle = append(weekTitle, indexWeek)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
+	weekStartDay := thisTime.AddDate(0, 0, weekStart)
+	weekEndDay := thisTime.AddDate(0, 0, weekEnd)
+	weekStartTime := weekStartDay.Format("2006-01-02") + " 00:00:00"
+	weekEndTime := weekEndDay.Format("2006-01-02") + " 23:59:59"
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+	weekStartPoint := theStarTime.Unix()
+	weekEndPoint := theEndTime.Unix()
+	fmt.Println("startTime222222222222222", weekStartPoint)
+	fmt.Println("endtime33333333333333", weekEndPoint)
+	list, err := service.GetPatientScheduleCount(orgId, weekStartPoint, weekEndPoint, ids)
+	_, total, _ := service.GetTotalBedNumber(orgId, ids)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}
+
+func (c *ScheduleApiController) GetWeekPanelsOne() {
+
+	data, _ := c.GetInt64("data", 1)
+	patitionIdStr := c.GetString("patitionid")
+
+	ids := strings.Split(patitionIdStr, ",")
+
+	adminInfo := c.GetAdminUserInfo()
+	thisTime := time.Now()
+	year, monthTime, day := thisTime.Date()
+	month := int(monthTime)
+	_, theWeek := thisTime.ISOWeek()
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	weekDays := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		indexYear, indexMonthTime, indexDay := theDay.Date()
+		indexMonth := int(indexMonthTime)
+		indexWeek := strconv.Itoa(indexYear) + "." + strconv.Itoa(indexMonth) + "." + strconv.Itoa(indexDay)
+		weekDays = append(weekDays, indexWeek)
+	}
+
+	returnData := map[string]interface{}{
+		"year":     year,
+		"month":    month,
+		"day":      day,
+		"theWeek":  theWeek,
+		"weekDay":  weekDay,
+		"weekDays": weekDays,
+	}
+
+	if data == 1 {
+		partitions, _ := service.GetSchedulePartitionPanelTwo(adminInfo.CurrentOrgId, ids)
+		returnData["partitions"] = partitions
+	}
+
+	c.ServeSuccessJSON(returnData)
+	return
+}
+
+func (c *ScheduleApiController) GetScheduleOne() {
+
+	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
+	patitionIdStr := c.GetString("patitionid")
+
+	ids := strings.Split(patitionIdStr, ",")
+	fmt.Println("patitonStr", ids)
+	schedule_type, _ := c.GetInt64("schedule_type")
+
+	adminInfo := c.GetAdminUserInfo()
+
+	thisTime := time.Now()
+	today := thisTime.Format("2006-01-02")
+	if week < 1 || week > 4 {
+		week = 2
+	}
+	if week == 1 {
+		thisTime = thisTime.AddDate(0, 0, -7)
+	} else if week == 3 {
+		thisTime = thisTime.AddDate(0, 0, 7)
+	} else if week == 4 {
+		thisTime = thisTime.AddDate(0, 0, 14)
+	}
+
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	weekEnd := 7 - weekDay
+	weekStart := weekEnd - 6
+	weekTitle := make([]string, 0)
+	days := make([]string, 0)
+	for index := weekStart; index <= weekEnd; index++ {
+		theDay := thisTime.AddDate(0, 0, index)
+		indexYear, indexMonthTime, indexDay := theDay.Date()
+		indexMonth := int(indexMonthTime)
+		indexWeek := strconv.Itoa(indexYear) + "." + strconv.Itoa(indexMonth) + "." + strconv.Itoa(indexDay)
+		weekTitle = append(weekTitle, indexWeek)
+		days = append(days, theDay.Format("2006-01-02"))
+	}
+
+	weekStartDay := thisTime.AddDate(0, 0, weekStart)
+	weekEndDay := thisTime.AddDate(0, 0, weekEnd)
+	weekStartTime := weekStartDay.Format("2006-01-02") + " 00:00:00"
+	weekEndTime := weekEndDay.Format("2006-01-02") + " 23:59:59"
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+	weekStartPoint := theStarTime.Unix()
+	weekEndPoint := theEndTime.Unix()
+
+	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"days":      days,
+		"weekTitle": weekTitle,
+		"schdules":  schdules,
+		"today":     today,
+	})
+	return
+}
+
+func (c *ScheduleApiController) SaveScheduleTemplate() {
+
+	template_id, _ := c.GetInt64("template_id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	template := models.ScheduleTemplate{
+		TemplateId: template_id,
+		UserOrgId:  orgId,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+	}
+
+	_, errcodes := service.GetScheudleTemplateById(orgId)
+	if errcodes == gorm.ErrRecordNotFound {
+		service.CreateXtscheduleTemplate(&template)
+	} else if errcodes == nil {
+		service.UpdateXtScheduleTemplate(&template, orgId)
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+	return
+
+}
+
+func (c *ScheduleApiController) GetScheduleTemplate() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	template, _ := service.GetScheduleTemplate(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+	})
+	return
+}

controllers/stock_in_api_controller.go

@@ -74,6 +74,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/postdruginformation", &StockManagerApiController{}, "Post:AddDrugInformation")
 
 	beego.Router("/api/good/initializtion", &StockManagerApiController{}, "Get:GetInitializtion")
+
+	beego.Router("/api/good/getwarehouseorderinfolist", &StockManagerApiController{}, "Get:GetWarehouseOrderInfolist")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -3475,3 +3477,14 @@ func (this *StockManagerApiController) GetInitializtion() {
 		"costClassifyList":          costClassifyList,
 	})
 }
+
+func (this *StockManagerApiController) GetWarehouseOrderInfolist() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, _ := service.GetWarehouseOrderInfoList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/device_models.go

@@ -1022,3 +1022,35 @@ func (XtDevicePh) TableName() string {
 
 	return "xt_device_ph"
 }
+
+type XtRemindPrintSetting struct {
+	ID                     int64 `gorm:"column:id" json:"id" form:"id"`
+	PrescriptionStatus     int64 `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	Week                   int64 `gorm:"column:week" json:"week" form:"week"`
+	Name                   int64 `gorm:"column:name" json:"name" form:"name"`
+	Zone                   int64 `gorm:"column:zone" json:"zone" form:"zone"`
+	Classes                int64 `gorm:"column:classes" json:"classes" form:"classes"`
+	Number                 int64 `gorm:"column:number" json:"number" form:"number"`
+	Mode                   int64 `gorm:"column:mode" json:"mode" form:"mode"`
+	Dialyzers              int64 `gorm:"column:dialyzers" json:"dialyzers" form:"dialyzers"`
+	PerfusionApparatus     int64 `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
+	Anticoagulant          int64 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	DoctorAdvice           int64 `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId              int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                 int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	AnticoagulantZongliang int64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+}
+
+func (XtRemindPrintSetting) TableName() string {
+
+	return "xt_remind_print_setting"
+}
+
+type VmXtSchedule struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	Count        int64
+}

models/dialysis.go

@@ -84,81 +84,82 @@ func (SchedualPatient) TableName() string {
 }
 
 type SchedualPatient2 struct {
-	ID                      int64                `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId               int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	UserId                  int64                `gorm:"column:user_id" json:"user_id" form:"user_id"`
-	PatientType             int64                `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
-	Avatar                  string               `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	DialysisNo              string               `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	AdmissionNumber         string               `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
-	Source                  int64                `gorm:"column:source" json:"source" form:"source"`
-	Lapseto                 int64                `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	PartitionId             int64                `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId                   int64                `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	Name                    string               `gorm:"column:name" json:"name" form:"name"`
-	Alias                   string               `gorm:"column:alias" json:"alias" form:"alias"`
-	Gender                  int64                `gorm:"column:gender" json:"gender" form:"gender"`
-	Nation                  string               `gorm:"column:nation" json:"nation" form:"nation"`
-	NativePlace             string               `gorm:"column:native_place" json:"native_place" form:"native_place"`
-	MaritalStatus           int64                `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
-	IdCardNo                string               `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	Birthday                int64                `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	ReimbursementWayId      int64                `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
-	HealthCareType          int64                `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
-	HealthCareNo            string               `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
-	HealthCareDueDate       int64                `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
-	Height                  int64                `gorm:"column:height" json:"height" form:"height"`
-	BloodType               int64                `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
-	Rh                      int64                `gorm:"column:rh" json:"rh" form:"rh"`
-	HealthCareDueAlertDate  int64                `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
-	EducationLevel          int64                `gorm:"column:education_level" json:"education_level" form:"education_level"`
-	Profession              int64                `gorm:"column:profession" json:"profession" form:"profession"`
-	Phone                   string               `gorm:"column:phone" json:"phone" form:"phone"`
-	HomeTelephone           string               `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
-	RelativePhone           string               `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
-	RelativeRelations       string               `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
-	HomeAddress             string               `gorm:"column:home_address" json:"home_address" form:"home_address"`
-	WorkUnit                string               `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
-	UnitAddress             string               `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
-	Children                int64                `gorm:"column:children" json:"children" form:"children"`
-	ReceivingDate           int64                `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
-	IsHospitalFirstDialysis int64                `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
-	FirstDialysisDate       int64                `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
-	FirstDialysisHospital   string               `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
-	InductionPeriod         int64                `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
-	InitialDialysis         int64                `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
-	TotalDialysis           int64                `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
-	AttendingDoctorId       int64                `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
-	HeadNurseId             int64                `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
-	Evaluate                string               `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
-	Diagnose                string               `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
-	Remark                  string               `gorm:"column:remark" json:"remark" form:"remark"`
-	RegistrarsId            int64                `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
-	Registrars              string               `gorm:"column:registrars" json:"registrars" form:"registrars"`
-	QrCode                  string               `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
-	BindingState            int64                `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
-	PatientComplains        string               `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
-	PresentHistory          string               `gorm:"column:present_history" json:"present_history"`     // 现病史
-	PastHistory             string               `gorm:"column:past_history" json:"past_history"`           // 既往史
-	Temperature             float64              `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
-	Pulse                   int64                `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
-	Respiratory             int64                `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
-	SBP                     int64                `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
-	DBP                     int64                `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
-	Status                  int64                `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime             int64                `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime             int64                `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	DialysisSchedule        DialysisSchedule     `gorm:"ForeignKey:PatientId"`
-	InfectiousDiseases      []InfectiousDiseases `gorm:"ForeignKey:PatientId"`
-	Age                     int64                `gorm:"column:age" json:"age"`
-	IsOpenRemind            int64                `gorm:"column:is_open_remind" json:"is_open_remind"`
-	DialysisAge             int64                `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
-	ExpenseKind             int64                `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
-	TellPhone               string               `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
-	FirstTreatmentDate      int64                `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
-	ContactName             string               `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
-	UserSysBeforeCount      int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
-	SchRemark               string               `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	ID                        int64                `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                 int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId                    int64                `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	PatientType               int64                `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	Avatar                    string               `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	DialysisNo                string               `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber           string               `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                    int64                `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                   int64                `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId               int64                `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64                `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                      string               `gorm:"column:name" json:"name" form:"name"`
+	Alias                     string               `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                    int64                `gorm:"column:gender" json:"gender" form:"gender"`
+	Nation                    string               `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace               string               `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	MaritalStatus             int64                `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo                  string               `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                  int64                `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ReimbursementWayId        int64                `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	HealthCareType            int64                `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo              string               `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	HealthCareDueDate         int64                `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
+	Height                    int64                `gorm:"column:height" json:"height" form:"height"`
+	BloodType                 int64                `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                        int64                `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate    int64                `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	EducationLevel            int64                `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                int64                `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                     string               `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone             string               `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone             string               `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations         string               `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress               string               `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                  string               `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress               string               `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                  int64                `gorm:"column:children" json:"children" form:"children"`
+	ReceivingDate             int64                `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis   int64                `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate         int64                `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital     string               `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	InductionPeriod           int64                `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
+	InitialDialysis           int64                `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
+	TotalDialysis             int64                `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	AttendingDoctorId         int64                `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId               int64                `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Evaluate                  string               `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                  string               `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                    string               `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId              int64                `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                string               `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode                    string               `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState              int64                `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	PatientComplains          string               `gorm:"column:patient_complains" json:"patient_complains"` // 主诉
+	PresentHistory            string               `gorm:"column:present_history" json:"present_history"`     // 现病史
+	PastHistory               string               `gorm:"column:past_history" json:"past_history"`           // 既往史
+	Temperature               float64              `gorm:"column:temperature" json:"temperature"`             // 体格检查-体温
+	Pulse                     int64                `gorm:"column:pulse" json:"pulse"`                         // 体格检查-脉搏
+	Respiratory               int64                `gorm:"column:respiratory" json:"respiratory"`             // 体格检查-呼吸频率
+	SBP                       int64                `gorm:"column:sbp" json:"sbp"`                             // 体格检查-收缩压
+	DBP                       int64                `gorm:"column:dbp" json:"dbp"`                             // 体格检查-舒张压
+	Status                    int64                `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime               int64                `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime               int64                `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	DialysisSchedule          DialysisSchedule     `gorm:"ForeignKey:PatientId"`
+	InfectiousDiseases        []InfectiousDiseases `gorm:"ForeignKey:PatientId"`
+	Age                       int64                `gorm:"column:age" json:"age"`
+	IsOpenRemind              int64                `gorm:"column:is_open_remind" json:"is_open_remind"`
+	DialysisAge               int64                `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	ExpenseKind               int64                `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone                 string               `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate        int64                `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	ContactName               string               `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	UserSysBeforeCount        int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	SchRemark                 string               `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	HospitalFirstDialysisDate int64                `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
 }
 
 func (SchedualPatient2) TableName() string {
@@ -281,6 +282,10 @@ type PredialysisEvaluation struct {
 	ThromubusA                     string  `gorm:"column:thromubus_a" json:"thromubus_a" form:"thromubus_a"`
 	ThromubusV                     string  `gorm:"column:thromubus_v" json:"thromubus_v" form:"thromubus_v"`
 	Dehydration                    string  `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
+	PreDialysisDrugs               string  `gorm:"column:pre_dialysis_drugs" json:"pre_dialysis_drugs" form:"pre_dialysis_drugs"`
+	Period                         int64   `gorm:"column:period" json:"period" form:"period"`
+	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
+	BloodPressureDuringDialysis    string  `gorm:"column:blood_pressure_during_dialysis" json:"blood_pressure_during_dialysis" form:"blood_pressure_during_dialysis"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -587,6 +592,13 @@ type AssessmentAfterDislysis struct {
 	DiastolicPressure               string  `gorm:"column:diastolic_pressure" json:"diastolic_pressure" form:"diastolic_pressure"`
 	OtherComplication               string  `gorm:"column:other_complication" json:"other_complication" form:"other_complication"`
 	Ktv                             string  `gorm:"column:ktv" json:"ktv" form:"ktv"`
+	Urr                             string  `gorm:"column:urr" json:"urr" form:"urr"`
+	Hypertenison                    int64   `gorm:"column:hypertenison" json:"hypertenison" form:"hypertenison"`
+	Hypopiesia                      int64   `gorm:"column:hypopiesia" json:"hypopiesia" form:"hypopiesia"`
+	LeaveOfficeMethod               int64   `gorm:"column:leave_office_method" json:"leave_office_method" form:"leave_office_method"`
+	Lapse                           int64   `gorm:"column:lapse" json:"lapse" form:"lapse"`
+	Consciousness                   int64   `gorm:"column:consciousness" json:"consciousness" form:"consciousness"`
+	Fallrisk                        int64   `gorm:"column:fallrisk" json:"fallrisk" form:"fallrisk"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
@@ -643,52 +655,54 @@ func (DryWeightAdjust) TableName() string {
 }
 
 type MonitoringRecord 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"`
-	DialysisOrderId           int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
-	MonitoringDate            int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
-	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time"`
-	MonitoringTime            string  `gorm:"column:monitoring_time" json:"monitoring_time"`
-	PulseFrequency            float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate             float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
-	SystolicBloodPressure     float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure    float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	BloodPressureType         int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
-	Pic                       string  `gorm:"column:pic" json:"pic"`
-	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
-	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	VenousPressureType        int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
-	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
-	ArterialPressureType      int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
-	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
-	TransmembranePressureType int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
-	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
-	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
-	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
-	DialysateTemperature      float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
-	Temperature               float64 `gorm:"column:temperature" json:"temperature"`
-	ReplacementRate           float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
-	DisplacementQuantity      float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
-	Ktv                       float64 `gorm:"column:ktv" json:"ktv"`
-	Symptom                   string  `gorm:"column:symptom" json:"symptom"`
-	Dispose                   string  `gorm:"column:dispose" json:"dispose"`
-	Result                    string  `gorm:"column:result" json:"result"`
-	MonitoringNurse           int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
-	Status                    int64   `gorm:"column:status" json:"status"`
-	CreatedTime               int64   `gorm:"column:created_time" json:"created_time"`
-	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time"`
-	Conductivity              float64 `gorm:"column:conductivity" json:"conductivity"`
-	DisplacementFlowQuantity  float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
-	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
-	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	Urr                       string  `gorm:"column:urr" json:"urr"`
-	BloodSugar                float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
-	MonitorAnticoagulant      int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
-	MonitorAnticoagulantValue string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	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"`
+	DialysisOrderId             int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	MonitoringDate              int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_time"`
+	MonitoringTime              string  `gorm:"column:monitoring_time" json:"monitoring_time"`
+	PulseFrequency              float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
+	BreathingRate               float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	BloodPressureType           int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
+	Pic                         string  `gorm:"column:pic" json:"pic"`
+	BloodFlowVolume             float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
+	VenousPressure              float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
+	VenousPressureType          int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
+	ArterialPressure            float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
+	ArterialPressureType        int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
+	TransmembranePressure       float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
+	TransmembranePressureType   int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
+	UltrafiltrationRate         float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
+	UltrafiltrationVolume       float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
+	SodiumConcentration         float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
+	DialysateTemperature        float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
+	Temperature                 float64 `gorm:"column:temperature" json:"temperature"`
+	ReplacementRate             float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
+	DisplacementQuantity        float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
+	Ktv                         float64 `gorm:"column:ktv" json:"ktv"`
+	Symptom                     string  `gorm:"column:symptom" json:"symptom"`
+	Dispose                     string  `gorm:"column:dispose" json:"dispose"`
+	Result                      string  `gorm:"column:result" json:"result"`
+	MonitoringNurse             int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
+	Status                      int64   `gorm:"column:status" json:"status"`
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time"`
+	Conductivity                float64 `gorm:"column:conductivity" json:"conductivity"`
+	DisplacementFlowQuantity    float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
+	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                     int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                      int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Urr                         string  `gorm:"column:urr" json:"urr"`
+	BloodSugar                  float64 `gorm:"column:blood_sugar" json:"blood_sugar" form:"blood_sugar"`
+	MonitorAnticoagulant        int64   `gorm:"column:monitor_anticoagulant" json:"monitor_anticoagulant" form:"monitor_anticoagulant"`
+	MonitorAnticoagulantValue   string  `gorm:"column:monitor_anticoagulant_value" json:"monitor_anticoagulant_value" form:"monitor_anticoagulant_value"`
+	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
+	Complication                int64   `gorm:"column:complication" json:"complication" form:"complication"`
 }
 
 func (MonitoringRecord) TableName() string {
@@ -868,6 +882,7 @@ type ReceiveTreatmentAsses struct {
 	PsychologicalOther           string `gorm:"column:psychological_other" json:"psychological_other"`
 	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution"`
 	AdmissionNumber              string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Tumble                       int64  `gorm:"column:tumble" json:"tumble" form:"tumble"`
 }
 
 func (ReceiveTreatmentAsses) TableName() string {

models/doctor_advice_models.go

@@ -91,6 +91,7 @@ type DoctorAdviceParentTemplate struct {
 	UpdatedTime          int64                   `gorm:"column:updated_time" json:"updated_time"`
 	DoctorAdviceTemplate []*DoctorAdviceTemplate `gorm:"ForeignKey:TemplateId;AssociationForeignKey:ID"`
 	AdviceType           int64                   `gorm:"column:advice_type" json:"advice_type"`
+	Sort                 int64                   `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (DoctorAdviceParentTemplate) TableName() string {

models/patient_models.go

@@ -230,6 +230,13 @@ type DialysisPrescription struct {
 	DialysisIrrigation         string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	AntioxidantCommodityName   string        `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
 	DisplaceSpeed              string        `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
+	Illness                    int64         `gorm:"column:illness" json:"illness" form:"illness"`
+	Amylaceum                  string        `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
+	SingleTime                 string        `gorm:"column:single_time" json:"single_time" form:"single_time"`
+	SingleWater                string        `gorm:"column:single_water" json:"single_water" form:"single_water"`
+	ReplacementFlow            string        `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
+	PlasmaSeparator            string        `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
+	BilirubinAdsorptionColumn  string        `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -329,6 +336,12 @@ type DialysisSolution struct {
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	AntioxidantCommodityName   string  `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
+	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
+	Illness                    int64   `gorm:"column:illness" json:"illness" form:"illness"`
+	Amylaceum                  string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
+	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
+	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
 }
 
 func (DialysisSolution) TableName() string {

models/schedule_models.go

@@ -1,6 +1,6 @@
 package models
 
-type Schedule struct {
+type VmSchedules struct {
 	ID           int64 `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
@@ -15,20 +15,20 @@ type Schedule struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient       string        `gorm:"-" json:"patient" form:"patient"`
-	DeviceZone    DeviceZone    `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber  DeviceNumber  `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	TreatmentMode TreatmentMode `json:"mode" gorm:"foreignkey:ModeId"`
-	DialysisOrder DialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-
-	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DeviceZone           DeviceZone             `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber         DeviceNumber           `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	DialysisOrder        DialysisOrder          `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	XtPatients           XtPatients             `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisPrescription DialysisPrescription   `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 }
 
-func (Schedule) TableName() string {
+func (VmSchedules) TableName() string {
 	return "xt_schedule"
 }
 
-type SchedulePatients struct {
+type Schedule struct {
 	ID           int64 `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
@@ -42,13 +42,40 @@ type SchedulePatients struct {
 	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
-	Patient      PatientListForFace        `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+
+	Patient       string        `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone    DeviceZone    `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber  DeviceNumber  `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	TreatmentMode TreatmentMode `json:"mode" gorm:"foreignkey:ModeId"`
+	DialysisOrder DialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+
+	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
-func (SchedulePatients) TableName() string {
+func (Schedule) TableName() string {
 	return "xt_schedule"
 }
 
+type SchedulePatients struct {
+	ID           int64              `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64              `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64              `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64              `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64              `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64              `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport     int64              `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	Patient      PatientListForFace `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+}
+
+func (SchedulePatients) TableName() string {
+	return "xt_schedule"
+}
 
 type PatientSchedule struct {
 	Schedule
@@ -104,13 +131,27 @@ type WeekSchedule struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient              string           `gorm:"-" json:"patient" form:"patient"`
-	DeviceZone           DeviceZone       `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber         DeviceNumber     `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisPrescription DialysisSolution `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
-	DoctorAdvice         []*DoctorAdvice  `json:"doctor_advice" gorm:"-"`
+	Patient              string                 `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone           DeviceZone             `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber         DeviceNumber           `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	DialysisPrescription DialysisSolution       `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	DoctorAdvice         []*DoctorAdvice        `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	HisDoctorAdviceInfo  []*HisDoctorAdviceInfo `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 }
 
 func (WeekSchedule) TableName() string {
 	return "xt_schedule"
 }
+
+type ScheduleTemplate struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	TemplateId int64 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (ScheduleTemplate) TableName() string {
+	return "xt_schedule_template"
+}

routers/router.go

@@ -73,4 +73,5 @@ func init() {
 	new_m_api.NewDrugApiControllersRegisterRouters()
 	controllers.HisProjectRouters()
 	controllers.GdybRegistRouters()
+
 }

service/common_service.go

@@ -204,19 +204,64 @@ func DeleteCheck(id int64) error {
 	return err
 }
 
-func GetDialysiTotal(startime int64, endtime int64, orgid int64) (order []*models.DialysisOrder, total int64, err error) {
-	err = XTReadDB().Model(&order).Where("dialysis_date >= ? and dialysis_date<=? and user_org_id = ?", startime, endtime, orgid).Count(&total).Find(&order).Error
-	return order, total, err
+//
+//func GetDialysiTotal(startime int64, endtime int64, orgid int64,lapsetotype int64,sourcetype int64) (order []*models.DialysisOrder, total int64, err error) {
+//	err = XTReadDB().Model(&order).Where("dialysis_date >= ? and dialysis_date<=? and user_org_id = ?", startime, endtime, orgid).Count(&total).Find(&order).Error
+//	return order, total, err
+//}
+
+func GetDialysiTotal(startime int64, endtime int64, orgid int64, lapsetotype int64, sourcetype int64) (models.PatientPrescriptionCountStruct, error) {
+	counts := models.PatientPrescriptionCountStruct{}
+
+	db := XTReadDB().Table("xt_dialysis_order as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_paitents as s").Where("s.status = 1")
+	fmt.Println(table)
+
+	if lapsetotype > 0 {
+		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? and s.lapseto = ?", startime, endtime, orgid, lapsetotype).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+	}
+	if lapsetotype == 0 {
+		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? ", startime, endtime, orgid).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+	}
+
+	if sourcetype > 0 {
+		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? and s.source = ?", startime, endtime, orgid, sourcetype).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+	}
 
+	if sourcetype == 0 {
+		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ?", startime, endtime, orgid).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+	}
+
+	return counts, err
 }
 
-func GetDialysisCountMode(starttime int64, endtime int64, orgid int64) (counts []*models.PatientPrescriptionCountStruct, err error) {
-	//err = readDb.Table("xt_dialysis_prescription as p").Where("p.record_date>= ? and p.record_date<=? and p.user_org_id=?", starttime, endtime, orgid).Select("p.mode_id,count(p.mode_id) as count").Group("p.mode_id").Scan(&counts).Error
+func GetDialysisCountMode(starttime int64, endtime int64, orgid int64, lapsetotype int64, sourcetype int64) (counts []*models.PatientPrescriptionCountStruct, err error) {
+
+	//err = readDb.Table("xt_dialysis_order as o left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ? and o.status = 1 and s.status = 1", starttime, endtime, orgid).Select("s.mode_id,count(s.mode_id) as count").Group("s.mode_id").Scan(&counts).Error
 	//return counts, err
 
-	err = readDb.Table("xt_dialysis_order as o left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ? and o.status = 1 and s.status = 1", starttime, endtime, orgid).Select("s.mode_id,count(s.mode_id) as count").Group("s.mode_id").Scan(&counts).Error
+	db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
+	table := readDb.Table("xt_schedule as s").Where("s.status = 1")
+	fmt.Println(table)
+	p := readDb.Table("xt_patients as p").Where("p.status = 1")
+	fmt.Println(p)
+	if starttime > 0 {
+		db = db.Where("o.dialysis_date >=?", starttime)
+	}
+	if endtime > 0 {
+		db = db.Where("o.dialysis_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("o.user_org_id = ?", orgid)
+	}
+	if lapsetotype > 0 {
+		db = db.Where("p.lapseto = ?", lapsetotype)
+	}
+	if sourcetype > 0 {
+		db = db.Where("p.source = ?", sourcetype)
+	}
+	err = db.Select("s.mode_id,count(s.mode_id) as count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id and s.schedule_date = o.dialysis_date and s.status= 1").Joins("left join xt_patients as  p on o.patient_id = p.id").Group("s.mode_id").Scan(&counts).Error
 	return counts, err
-
 }
 
 func GetTotalRollOut(starttime int64, endtime int64, orgid int64) (counts []*models.PatientLapseto, total int64, err error) {
@@ -228,22 +273,41 @@ func GetTotalRollOut(starttime int64, endtime int64, orgid int64) (counts []*mod
 	return counts, total, err
 }
 
-func GetTotalRollOutPatients(orgid int64, startime int64, endtime int64) (patients []*models.XtPatients, err error) {
+func GetTotalRollOutPatients(orgid int64, startime int64, endtime int64, lapsetotype int64, sourcetype int64) (patients []*models.XtPatients, err error) {
+
+	db := XTReadDB().Table("xt_patients as x")
 
-	db := XTReadDB().Table("x.patients as x")
-	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 1 and x.status = 1", startime, endtime, orgid).Scan(&patients).Error
+	if sourcetype == 0 {
+		err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 1 and x.status = 1", startime, endtime, orgid).Scan(&patients).Error
+	}
+	if sourcetype > 0 {
+		err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 1 and x.status = 1 and x.source = ?", startime, endtime, orgid, sourcetype).Scan(&patients).Error
+	}
 	return patients, err
 }
 
-func GetTotalRollOutPatientsTwo(orgid int64, startime int64, endtime int64) (patients []*models.XtPatients, err error) {
+func GetTotalRollOutPatientsTwo(orgid int64, startime int64, endtime int64, lapsetotype int64, sourcetype int64) (patients []*models.XtPatients, err error) {
+
+	db := XTReadDB().Table("xt_patients as x")
+	if sourcetype == 0 {
+		err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1", startime, endtime, orgid).Scan(&patients).Error
 
-	db := XTReadDB().Table("x.patients as x")
-	err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1", startime, endtime, orgid).Scan(&patients).Error
+	}
+	if sourcetype > 0 {
+		err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1 and x.source = ?", startime, endtime, orgid, sourcetype).Scan(&patients).Error
+	}
 	return patients, err
 }
 
-func GetPatientTotalCount(orgID int64) (total int64) {
-	readDb.Model(&models.XtPatients{}).Where("user_org_id=? and status=1", orgID).Count(&total)
+func GetPatientTotalCount(orgID int64, lapsetotype int64, sourcetype int64) (total int64) {
+	db := readDb.Table("xt_patients as x")
+	//if lapsetotype > 0 {
+	// db = db.Where("x.lapseto = ?", lapsetotype)
+	//}
+	//if sourcetype > 0 {
+	// db = db.Where("x.source = ?", sourcetype)
+	//}
+	db.Where("x.user_org_id=? and x.status=1", orgID).Count(&total)
 	return
 }
 
@@ -263,9 +327,28 @@ func GetManPatientTotalCount(orgid int64, starttime int64, endtime int64) (dialy
 
 }
 
-func GetManPatientTotal(orgid int64) (patients []*models.XtPatients, total int64, err error) {
+func GetManPatientTotal(orgid int64, lapsetotype int64, sourcetype int64) (patients []*models.XtPatients, total int64, err error) {
 
-	err = XTReadDB().Model(&patients).Where("user_org_id = ? and status = 1 and gender = 1", orgid).Count(&total).Find(&patients).Error
+	db := XTReadDB().Table("xt_patients as x").Where("x.status  = 1")
+	if lapsetotype > 0 {
+		db = db.Where("x.lapseto = ?", lapsetotype)
+	}
+	if sourcetype > 0 {
+		db = db.Where("x.source = ?", sourcetype)
+	}
+	err = db.Where("x.user_org_id = ? and x.status = 1 and x.gender = 1", orgid).Count(&total).Find(&patients).Error
+	return patients, total, err
+}
+
+func GetWoManPatientTotal(orgid int64, lapsetotype int64, sourcetype int64) (patients []*models.XtPatients, total int64, err error) {
+	db := XTReadDB().Table("xt_patients as x").Where("x.status  = 1")
+	if lapsetotype > 0 {
+		db = db.Where("x.lapseto = ?", lapsetotype)
+	}
+	if sourcetype > 0 {
+		db = db.Where("x.source = ?", sourcetype)
+	}
+	err = db.Where("x.user_org_id = ? and x.status = 1 and x.gender = 2", orgid).Count(&total).Find(&patients).Error
 	return patients, total, err
 }
 
@@ -274,10 +357,25 @@ func GetManPatientTotal(orgid int64) (patients []*models.XtPatients, total int64
 //	return counts, err
 //}
 
-func GetPatientInfectiousCount(orgid int64, startime int64, endtime int64) (counts []*models.PatientContagionsCountStruct, err error) {
+func GetPatientInfectiousCount(orgid int64, startime int64, endtime int64, lapsetotype int64, sourcetype int64) (counts []*models.PatientContagionsCountStruct, err error) {
+
+	if lapsetotype == 0 {
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+	}
+	if sourcetype == 0 {
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+	}
+
+	if lapsetotype > 0 {
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=? and s.lapseto = ?", orgid, startime, endtime, lapsetotype).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+	}
+
+	if sourcetype > 0 {
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=? and s.source = ?", orgid, startime, endtime, sourcetype).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+	}
 
-	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	return counts, err
+
 }
 
 func GetPatientOtherInfectious(orgid int64) (patients []*models.XtPatients, total int64, err error) {
@@ -286,9 +384,10 @@ func GetPatientOtherInfectious(orgid int64) (patients []*models.XtPatients, tota
 	return patients, total, err
 }
 
-func GetTotalAgeCount(orgid int64) (counts []*models.PatientAgeCountStruct, err error) {
+func GetTotalAgeCount(orgid int64, lapsetotype int64, sourcetype int64) (counts []*models.PatientAgeCountStruct, err error) {
 
-	readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+	if lapsetotype == 0 || sourcetype == 0 {
+		readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
 	 SELECT
 	 CASE
 	  WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=20 THEN '20'
@@ -299,8 +398,39 @@ func GetTotalAgeCount(orgid int64) (counts []*models.PatientAgeCountStruct, err
 	 END
 	 AS nnd FROM xt_patients as s  where s.user_org_id=? and s.status=1
 	 )a GROUP BY nnd`, orgid).Scan(&counts)
-	return
 
+	}
+
+	if lapsetotype > 0 {
+		readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+	 SELECT
+	 CASE
+	  WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=20 THEN '20'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=40 THEN '40'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=60 THEN '60'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=80 THEN '80'
+    ELSE '150'
+	 END
+	 AS nnd FROM xt_patients as s  where s.user_org_id=? and s.status=1 and s.lapseto = ?
+	 )a GROUP BY nnd`, orgid, lapsetotype).Scan(&counts)
+
+	}
+
+	if sourcetype > 0 {
+		readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+	 SELECT
+	 CASE
+	  WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=20 THEN '20'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=40 THEN '40'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=60 THEN '60'
+    WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=80 THEN '80'
+    ELSE '150'
+	 END
+	 AS nnd FROM xt_patients as s  where s.user_org_id=? and s.status=1 and s.source = ?
+	 )a GROUP BY nnd`, orgid, sourcetype).Scan(&counts)
+
+	}
+	return
 }
 
 func GetTotalAgeCountTwo(orgid int64, starttime int64, endtime int64) (counts []*models.PatientAgeCountStruct, err error) {
@@ -320,18 +450,42 @@ func GetTotalDialysisAgeCount(orgid int64) (patients []*models.XtPatients, err e
 	return patients, err
 }
 
-func GetDialysisAgeData(orgID int64) (counts []*models.DialysisAgePieDataStruct, err error) {
+func GetDialysisAgeData(orgID int64, lapsetotype int64, sourcetype int64) (counts []*models.DialysisAgePieDataStruct, err error) {
 
-	readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
-	SELECT
-	CASE
-	WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) >= 0 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 12 THEN '1'
-  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '2'
-  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '3'
-  WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
-  END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1 and p.first_dialysis_date <> 0)a GROUP BY nnd`, orgID).Scan(&counts)
-	return
+	if lapsetotype == 0 || sourcetype == 0 {
+		readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+    SELECT
+    CASE
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) >= 0 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 12 THEN '1'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '2'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '3'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
+    END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1 and p.first_dialysis_date <> 0)a GROUP BY nnd`, orgID).Scan(&counts)
+	}
+
+	if lapsetotype > 0 {
+		readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+    SELECT
+    CASE
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) >= 0 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 12 THEN '1'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '2'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '3'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
+    END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1 and p.first_dialysis_date <> 0 and p.lapseto = ?)a GROUP BY nnd`, orgID, lapsetotype).Scan(&counts)
+	}
+
+	if sourcetype > 0 {
+		readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
+    SELECT
+    CASE
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) >= 0 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 12 THEN '1'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 12 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 36 THEN '2'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 36 AND TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) <= 60 THEN '3'
+    WHEN TIMESTAMPDIFF( YEAR, DATE( DATE_ADD( FROM_UNIXTIME( 0 ), INTERVAL p.first_dialysis_date SECOND ) ), curdate( ) ) > 60 THEN '4'
+    END AS nnd FROM xt_patients as p  where p.user_org_id=? and p.status=1 and p.first_dialysis_date <> 0 and p.source = ?)a GROUP BY nnd`, orgID, sourcetype).Scan(&counts)
+	}
 
+	return
 }
 
 func GetCurentOrgPatients(orgid int64) (patients []*models.BloodXtPatients, err error) {
@@ -3375,7 +3529,7 @@ func GetCountModeId(startime int64, endtime int64, modeid int64, orgid int64) (o
 
 }
 
-func GetCountRollout(orgid int64, startime int64, endtime int64) (lapseto []*models.BloodLapsetoCount, err error) {
+func GetCountRollout(orgid int64, startime int64, endtime int64, lapsetotype int64, sourcetype int64) (lapseto []*models.BloodLapsetoCount, err error) {
 
 	table := XTReadDB().Table("xt_patients as s")
 	fmt.Println(table)
@@ -3386,6 +3540,15 @@ func GetCountRollout(orgid int64, startime int64, endtime int64) (lapseto []*mod
 	if endtime > 0 {
 		db = db.Where("x.lapseto_time<=?", endtime)
 	}
-	err = db.Group("x.lapseto_time,x.lapseto_type").Select("count(x.id) as count,x.lapseto_type,x.lapseto_time").Joins("left join xt_patients as s  on s.id = x.patient_id").Where("s.user_org_id = ?", orgid).Scan(&lapseto).Error
+	if lapsetotype == 0 || sourcetype == 0 {
+		err = db.Group("x.lapseto_time,x.lapseto_type").Select("count(x.id) as count,x.lapseto_type,x.lapseto_time").Joins("left join xt_patients as s  on s.id = x.patient_id").Where("s.user_org_id = ?", orgid).Scan(&lapseto).Error
+	}
+
+	if lapsetotype > 0 {
+		err = db.Group("x.lapseto_time,x.lapseto_type").Select("count(x.id) as count,x.lapseto_type,x.lapseto_time").Joins("left join xt_patients as s  on s.id = x.patient_id").Where("s.user_org_id = ? and s.lapseto = ?", orgid, lapsetotype).Scan(&lapseto).Error
+	}
+	if sourcetype > 0 {
+		err = db.Group("x.lapseto_time,x.lapseto_type").Select("count(x.id) as count,x.lapseto_type,x.lapseto_time").Joins("left join xt_patients as s  on s.id = x.patient_id").Where("s.user_org_id = ? and s.source = ?", orgid, sourcetype).Scan(&lapseto).Error
+	}
 	return lapseto, err
 }

service/dialysis_service.go

@@ -1101,7 +1101,7 @@ func UpdateDialysisBeforePrepareTwo(info *models.DialysisBeforePrepare) (err err
 
 func UpdateAutoReduceDetailSix(detail *models.AutomaticReduceDetail) (err error) {
 
-	err = writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and good_type_id = ? And patient_id = ? and org_id =?", detail.GoodId, detail.GoodTypeId, detail.PatientId, detail.OrgId).Updates(map[string]interface{}{"count": detail.Count, "mtime": detail.Mtime, "status": 1}).Error
+	err = writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and good_type_id = ? And patient_id = ? and org_id =? and record_time = ?", detail.GoodId, detail.GoodTypeId, detail.PatientId, detail.OrgId, detail.RecordTime).Updates(map[string]interface{}{"count": detail.Count, "mtime": detail.Mtime, "status": 1}).Error
 	return err
 }
 

service/doctor_advice_service.go

@@ -360,6 +360,11 @@ func ModifyTemplateName(id int64, template_name string) (err error) {
 	return err
 }
 
+func ModifyTemplateNameOne(id int64, template_name string, sort int64) (err error) {
+	err = writeDb.Model(&models.DoctorAdviceParentTemplate{}).Where("status=1 AND id = ?", id).Updates(map[string]interface{}{"name": template_name, "updated_time": time.Now().Unix(), "sort": sort}).Error
+	return err
+}
+
 func ModifyHisTemplateName(id int64, template_name string) (err error) {
 	err = writeDb.Model(&models.HisDoctorAdviceParentTemplate{}).Where("status=1 AND id = ?", id).Updates(map[string]interface{}{"name": template_name, "updated_time": time.Now().Unix()}).Error
 	return err

service/gobal_config_service.go

@@ -473,3 +473,9 @@ func GetAllBaseDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
 	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
 	return drug, err
 }
+
+func GetDrugWarehuseOrderInfo(orgid int64) (drug []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Group("drug_id").Find(&drug).Error
+	return drug, err
+}

service/mobile_dialysis_service.go

@@ -852,13 +852,14 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 		}
 
 	} else if adviceType == 2 && len(deliverWay) <= 0 {
+
 		if patientType == 0 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND (advice_doctor = ? or execution_staff = ?)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, adminUserId)
 		} else if patientType == 2 {
 			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
 			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
@@ -886,41 +887,82 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 	return vms, err
 }
 
-func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string) ([]*HisMScheduleDoctorAdviceVM, error) {
+func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleDoctorAdviceVM, error) {
 
 	var vms []*HisMScheduleDoctorAdviceVM
 	if len(deliverWay) > 0 {
-		db := readDb.
-			Table("xt_schedule").
-			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
-			Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if patientType == 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+		if patientType > 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		}
+
 	} else {
-		db := readDb.
-			Table("xt_schedule").
-			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
-			Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if patientType == 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+		fmt.Println("patin34te2222222222222222222", patientType)
+		if patientType > 0 {
+			db := readDb.
+				Table("xt_schedule").
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		}
+
 	}
 
 	return vms, err

service/patient_service.go

@@ -1491,7 +1491,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn}).Error
 	return err
 }
 

service/patientmanage_service.go

@@ -949,14 +949,14 @@ func GetNewPatient(id int64) (models.XtPatientsNew, error) {
 
 func UpdatedPatient(patients models.Patients, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone}).Error
 
 	return err
 }
 
 func UpdateXtPatientNew(patients models.XtPatientsNew, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone}).Error
 
 	return err
 }
@@ -1587,3 +1587,37 @@ func GetBloodAccess(orgid int64) (*models.Dataconfig, error) {
 	err := XTReadDB().Model(&dataconfig).Where("org_id = 0 and name = '血管通路部位' and status = 1 ").Find(&dataconfig).Error
 	return &dataconfig, err
 }
+
+func GetPatientScheduleCount(orgid int64, startTime int64, endTime int64, ids []string) (schedule []*models.VmXtSchedule, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status =1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if startTime > 0 {
+		db = db.Where("x.schedule_date >=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("x.schedule_date<=?", endTime)
+	}
+	if len(ids) > 0 {
+		db = db.Where("x.partition_id in (?)", ids)
+	}
+	err = db.Select("count(x.id) as count,x.schedule_type,x.schedule_week").Group("x.schedule_week,x.schedule_type").Scan(&schedule).Error
+	return schedule, err
+}
+
+func GetTotalBedNumber(orgid int64, ids []string) (list []*models.XtDeviceNumber, total int64, err error) {
+
+	//err = XTReadDB().Model(&list).Where("org_id = ? and status = 1 ",orgid).Count(&total).Find(&list).Error
+	//return list,total,err
+	db := XTReadDB().Table("xt_device_number as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if len(ids) > 0 {
+		db = db.Where("x.zone_id in (?)", ids)
+	}
+	err = db.Count(&total).Find(&list).Error
+	return list, total, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -196,6 +196,13 @@ type PrescriptionVM struct {
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	Illness                    int64   `gorm:"column:illness" json:"illness" form:"illness"`
+	Amylaceum                  string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
+	SingleTime                 string  `gorm:"column:single_time" json:"single_time" form:"single_time"`
+	SingleWater                string  `gorm:"column:single_water" json:"single_water" form:"single_water"`
+	ReplacementFlow            string  `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
+	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
+	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
 }
 
 func (PrescriptionVM) TableName() string {

service/schedule_service.go

@@ -19,7 +19,7 @@ func GetSchedulePartitionPanel(orgID int64) (partitions []*models.Partition, err
 }
 
 func GetSchedulePartitionPanelOne(orgID int64, partionId int64) (partitions []*models.Partition, err error) {
-	fmt.Println("partionId3333333333333333", partionId)
+
 	if partionId > 0 {
 		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1 and zone_id = ?", orgID, partionId).Where("org_id=? and status=1 and id = ?", orgID, partionId).Find(&partitions).Error
 	}
@@ -30,6 +30,18 @@ func GetSchedulePartitionPanelOne(orgID int64, partionId int64) (partitions []*m
 	return
 }
 
+func GetSchedulePartitionPanelTwo(orgID int64, schIDs []string) (partitions []*models.Partition, err error) {
+
+	if len(schIDs) == 0 {
+		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1", orgID).Where("org_id=? and status=1", orgID).Find(&partitions).Error
+	}
+	if len(schIDs) > 0 {
+		err = readDb.Model(&models.DeviceZone{}).Preload("Jihaos", "org_id=? and status=1 and zone_id in(?)", orgID, schIDs).Where("org_id=? and status=1 and id in(?)", orgID, schIDs).Find(&partitions).Error
+	}
+
+	return
+}
+
 func GetPatientWithScheduleAndSolution(orgID int64, keywords string, weekStart, weekEnd, schedule, contagion int64) (patients []*models.Patients, err error) {
 	db := readDb.Table("xt_patients as p").
 		Preload("DialysisSolutions", "user_org_id=? and initiate_mode=1 and affirm_state=1 and parent_id=0 and status=1", orgID).
@@ -83,6 +95,25 @@ func GetWeekScheduleOne(orgID int64, start, end int64, partionid int64, schedule
 	return
 }
 
+func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.Schedule, err error) {
+
+	db := readDb.Table("xt_schedule as s")
+	fmt.Println("schIds2222222")
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	err = db.Preload("PatientInfectiousDiseases", "status = 1 ").
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Where("s.user_org_id=? and s.schedule_date>=? and s.schedule_date<=? and s.status=1", orgID, start, end).
+		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("updated_time asc").
+		Find(&schedules).Error
+	return
+}
+
 func GetDaySchedule(orgID, start, end, patientID int64) (schedule models.Schedule, err error) {
 	err = readDb.Model(&models.Schedule{}).Where("user_org_id=? and patient_id=? and schedule_date>=? and schedule_date<=? and status=1", orgID, patientID, start, end).First(&schedule).Error
 	return
@@ -133,10 +164,10 @@ func CreateSchedule(m *models.Schedule) error {
 	return writeDb.Model(&models.Schedule{}).Create(&m).Error
 }
 
-func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64) (*models.XtSchedule, error) {
+func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64, mode_id int64, schedule_type int64) (*models.XtSchedule, error) {
 	var scheudle models.XtSchedule
 	var err error
-	err = XTReadDB().Model(&scheudle).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, schedudate, orgid).Find(&scheudle).Error
+	err = XTReadDB().Model(&scheudle).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1 and mode_id = ? and schedule_type = ?", patientid, schedudate, orgid, mode_id, schedule_type).Find(&scheudle).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -146,8 +177,8 @@ func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64) (*m
 	return &scheudle, nil
 }
 
-func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, sch *models.XtSchedule) error {
-	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1", patientid, scheduledate, orgid).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
+func UpdateScheduleByOrgId(patientid int64, scheduledate int64, orgid int64, mode_id int64, schedule_type int64, sch *models.XtSchedule) error {
+	err := XTWriteDB().Model(&sch).Where("patient_id = ? and schedule_date= ? and user_org_id = ? and status = 1 and mode_id = ? and schedule_type = ?", patientid, scheduledate, orgid, mode_id, schedule_type).Updates(map[string]interface{}{"partition_id": sch.PartitionId, "bed_id": sch.BedId, "schedule_type": sch.ScheduleType, "schedule_week": sch.ScheduleWeek, "mode_id": sch.ModeId, "updated_time": time.Now().Unix()}).Error
 	return err
 }
 
@@ -385,8 +416,7 @@ func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.
 				advice.IsCheck = 1
 				if advice.FrequencyType == 3 {
 					week := int(scheduleDates.Weekday())
-					fmt.Println("week-------", week)
-					fmt.Println(advice.WeekDay)
+
 					switch week {
 					case 1:
 						if strings.Index(advice.WeekDay, "周一") > -1 {
@@ -534,6 +564,49 @@ func GetWeekDaySchedule(orgID int64, scheduleDate int64, scheduleDates *time.Tim
 	return
 }
 
+func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64) (list []*models.VmSchedules, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if scheduleDate > 0 {
+		db = db.Where("x.schedule_date = ?", scheduleDate)
+	}
+	if scheduleType > 0 {
+		db = db.Where("x.schedule_type = ?", scheduleType)
+	}
+
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Find(&list).Error
+
+	return list, err
+}
+
+func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone int64) (list []*models.VmSchedules, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if scheduleDate > 0 {
+		db = db.Where("x.schedule_date >=? and x.schedule_date<=?", startDate, scheduleDate)
+	}
+	if scheduleType > 0 {
+		db = db.Where("x.schedule_type = ?", scheduleType)
+	}
+	if zone > 0 {
+		db = db.Where("s.partition_id = ?", zone)
+	}
+
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Find(&list).Error
+
+	return list, err
+}
+
 func RemoveRepeatedElement(arr []*models.DoctorAdvice) (newArr []*models.DoctorAdvice) {
 	newArr = make([]*models.DoctorAdvice, 0)
 	for i := 0; i < len(arr); i++ {
@@ -678,7 +751,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 	return
 }
 
-func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64) (schedules []*models.WeekSchedule, err error) {
+func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone int64) (schedules []*models.WeekSchedule, err error) {
 
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
@@ -696,14 +769,18 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 	if weektype > 0 {
 		db = db.Where("s.schedule_week = ?", weektype)
 	}
+	if zone > 0 {
+		db = db.Where("s.partition_id = ?", zone)
+	}
 	err = db.
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Order("id asc")
-		}).
-		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
-		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").
+		}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		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("s.partition_id asc").
 		Find(&schedules).Error
 	return schedules, err
@@ -768,3 +845,66 @@ func UpdatePatientSchedule(orgid int64, startime int64, endtime int64) error {
 	err := XTWriteDB().Model(&schedule).Where("user_org_id = ? and schedule_date>=? and schedule_date<=? and status =1", orgid, startime, endtime).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetSettingById(id int64) (*models.XtRemindPrintSetting, error) {
+	setting := models.XtRemindPrintSetting{}
+	err := XTReadDB().Model(&setting).Where("id = ? and status = 1", id).Find(&setting).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &setting, nil
+}
+
+func CreateSetting(setting *models.XtRemindPrintSetting) error {
+
+	err := XTReadDB().Create(&setting).Error
+	return err
+}
+
+func UpdatedRemindPrint(set *models.XtRemindPrintSetting, id int64) error {
+
+	err := XTWriteDB().Model(&set).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"prescription_status": set.PrescriptionStatus, "week": set.Week, "name": set.Name, "zone": set.Zone, "classes": set.Classes, "number": set.Number, "mode": set.Mode, "dialyzers": set.Dialyzers, "perfusion_apparatus": set.PerfusionApparatus, "anticoagulant": set.Anticoagulant, "doctor_advice": set.DoctorAdvice, "anticoagulant_zongliang": set.AnticoagulantZongliang}).Error
+	return err
+}
+
+func GetRemindPrintList(id int64) (models.XtRemindPrintSetting, error) {
+
+	setting := models.XtRemindPrintSetting{}
+	err := XTReadDB().Model(&setting).Where("user_org_id = ? and status =1", id).Find(&setting).Error
+	return setting, err
+}
+
+func GetScheudleTemplateById(orgid int64) (*models.ScheduleTemplate, error) {
+
+	schedule := models.ScheduleTemplate{}
+	err := XTReadDB().Model(&schedule).Where("user_org_id = ? and status = 1", orgid).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
+func CreateXtscheduleTemplate(template *models.ScheduleTemplate) error {
+
+	err := XTWriteDB().Create(&template).Error
+	return err
+}
+
+func UpdateXtScheduleTemplate(template *models.ScheduleTemplate, orgid int64) error {
+
+	err := XTWriteDB().Model(&template).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"template_id": template.TemplateId}).Error
+	return err
+}
+
+func GetScheduleTemplate(orgid int64) (models.ScheduleTemplate, error) {
+
+	template := models.ScheduleTemplate{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&template).Error
+	return template, err
+}

service/stock_service.go

@@ -2520,3 +2520,9 @@ func FindAllDataConfigList(orgid int64, parentId int64) (dataconfig []*models.Da
 	err = XTReadDB().Model(&dataconfig).Where("(org_id = ? or org_id = 0) and parent_id = ? and status = 1", orgid, parentId).Find(&dataconfig).Error
 	return dataconfig, err
 }
+
+func GetWarehouseOrderInfoList(orgid int64) (list []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Model(&list).Where("org_id = ? and status = 1", orgid).Order("id asc").Group("good_id").Find(&list).Error
+	return list, err
+}