医保对接

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 {
@@ -1294,6 +1333,11 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	thrombus_a := c.GetString("thromubus_a")
 	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,
@@ -1355,6 +1399,11 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		ThrombusAv:                     thrombus_av,
 		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)
@@ -3072,6 +3121,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 {
 
@@ -3080,6 +3134,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 == 10121 {
+
+				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)
@@ -3095,7 +3156,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)
@@ -3106,8 +3169,10 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			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 == 10121 {
+					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/drug_stock_api_contorller.go

@@ -136,27 +136,25 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				warehousing_count, _ := strconv.ParseInt(items["warehousing_count"].(string), 10, 64)
 
-				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
-					utils.ErrorLog("price")
+				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+					utils.ErrorLog("last_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-				total := float64(warehousing_count) * price
+				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+				total := float64(warehousing_count) * last_price
 
-				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
-					utils.ErrorLog("retail_price")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
-				retail_price_total := float64(warehousing_count) * retail_price
+				//if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+				//	utils.ErrorLog("retail_price")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(warehousing_count) * last_price
 
 				var productDates int64
 				var expiryDates int64
 
-				fmt.Println()
-
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
 					expiryDates = 0
 				} else {
@@ -185,15 +183,29 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				}
 
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-					utils.ErrorLog("number")
+				if items["lot_number"] == nil || reflect.TypeOf(items["lot_number"]).String() != "string" {
+					utils.ErrorLog("lot_number")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				number, _ := items["number"].(string)
+				lot_number, _ := items["lot_number"].(string)
+
+				if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
+					utils.ErrorLog("batch_number")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				batch_number, _ := items["batch_number"].(string)
+
+				if items["packing_unit"] == nil || reflect.TypeOf(items["packing_unit"]).String() != "string" {
+					utils.ErrorLog("packing_unit")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				packing_unit, _ := items["packing_unit"].(string)
 
 				var remark string
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 					remark = ""
 				} else {
 					remark = items["remark"].(string)
@@ -203,11 +215,11 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					WarehousingOrder: warehousing.WarehousingOrder,
 					WarehousingId:    warehousing.ID,
 					DrugId:           drug_id,
-					Number:           number,
+					Number:           lot_number,
 					ProductDate:      productDates,
 					ExpiryDate:       expiryDates,
 					WarehousingCount: warehousing_count,
-					Price:            price,
+					Price:            last_price,
 					TotalPrice:       total,
 					Status:           1,
 					Ctime:            ctime,
@@ -216,8 +228,11 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					Type:             types,
 					Manufacturer:     manufacturer_id,
 					Dealer:           dealer_id,
-					RetailPrice:      retail_price,
+					//RetailPrice:      retail_price,
+					StockMaxNumber:   warehousing_count,
 					RetailTotalPrice: retail_price_total,
+					BatchNumber:      batch_number,
+					MaxUnit:          packing_unit,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -431,6 +446,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 
 	warehousing, err := service.FindDrugWarehousingById(id, admin.CurrentOrgId)
 
+	manufacturerList, _ := service.GetAllDrugLibList(admin.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -443,8 +459,9 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 	warehousingInfo, err := service.FindDrugWarehousingInfoById(id, admin.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"info":        warehousingInfo,
-			"warehousing": warehousing,
+			"info":             warehousingInfo,
+			"warehousing":      warehousing,
+			"manufacturerList": manufacturerList,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -452,11 +469,12 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 }
 
 func (c *StockDrugApiController) EditDrugWarehouse() {
+
 	warehousing_time := c.GetString("warehousing_time")
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
+	//manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
+	//dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -484,8 +502,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
 		Type:             warehouse.Type,
-		Dealer:           dealer_id,
-		Manufacturer:     manufacturer_id,
+		//Dealer:           dealer_id,
+		//Manufacturer:     manufacturer_id,
 	}
 
 	service.EditDrugWarehousingOne(warehousing, id)
@@ -503,6 +521,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
+
 		if len(thisStockIn) > 0 {
 			for _, item := range thisStockIn {
 				items := item.(map[string]interface{})
@@ -530,13 +549,22 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 				total := float64(warehousing_count) * price
 
-				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
-					utils.ErrorLog("retail_price")
+				//if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+				//	utils.ErrorLog("retail_price")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				//retail_price_total := float64(warehousing_count) * last_price
+
+				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+					utils.ErrorLog("last_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
-				retail_price_total := float64(warehousing_count) * retail_price
+				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+
+				retail_price_total := float64(warehousing_count) * last_price
 
 				var productDates int64
 				var expiryDates int64
@@ -553,8 +581,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						expiryDates = expiry_date.Unix()
 
 					}
-
 				}
+
 				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
 					productDates = 0
 				} else {
@@ -576,8 +604,15 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				number, _ := items["number"].(string)
 
+				if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
+					utils.ErrorLog("batch_number")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				batch_number, _ := items["batch_number"].(string)
+
 				var remark string
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 					remark = ""
 				} else {
 					remark = items["remark"].(string)
@@ -590,13 +625,13 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				id := int64(items["id"].(float64))
 
-				if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "float64" {
-					utils.ErrorLog("dealer")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				dealer := int64(items["dealer"].(float64))
-
+				//if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "float64" {
+				//	utils.ErrorLog("dealer")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//dealer := int64(items["dealer"].(float64))
+				//
 				if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "float64" {
 					utils.ErrorLog("manufacturer")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -620,9 +655,10 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
 						Manufacturer:     manufacturer,
-						Dealer:           dealer,
-						RetailPrice:      retail_price,
+						//Dealer:           dealer,
+						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
+						BatchNumber:      batch_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -644,8 +680,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
 						Manufacturer:     manufacturer,
-						Dealer:           dealer,
-						RetailPrice:      retail_price,
+						//Dealer:           dealer,
+						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
@@ -1428,7 +1464,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
-						ID: id,
+						ID:                      id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						DrugId:                  drug_id,

controllers/gobal_config_api_controller.go

@@ -87,6 +87,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
@@ -1785,3 +1786,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/his_api_controller.go

@@ -320,6 +320,42 @@ func (c *HisApiController) CreateHisPrescription() {
 		}
 	}
 
+	//校验库存总量
+	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+		if len(prescriptions) > 0 {
+			for _, item := range prescriptions {
+				items := item.(map[string]interface{})
+				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var drug_id int64
+							var prescribing_number float64
+							if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+								drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+							}
+							if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "float64" {
+								prescribing_number = advice.(map[string]interface{})["prescribing_number"].(float64)
+							}
+
+							drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
+							if drug.ID == 0 {
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+								return
+							}
+
+							if prescribing_number > drug.Total {
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+								return
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	info, _ := service.FindHisPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 	var hpInfo models.HisPrescriptionInfo
 	if info.ID == 0 {
@@ -838,6 +874,8 @@ func (c *HisApiController) EditHisPrescription() {
 func (c *HisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
+	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
+
 	err := service.DelelteHisPrescription(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
 		if len(projects) > 0 {
@@ -851,6 +889,15 @@ func (c *HisApiController) DeletePrescription() {
 				}
 			}
 		}
+
+		if len(advices) > 0 {
+			for _, item := range advices {
+				drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, item.DrugId)
+				drug.Total = drug.Total + item.PrescribingNumber
+				service.UpdateBaseDrugLib(&drug)
+			}
+		}
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -863,9 +910,12 @@ func (c *HisApiController) DeletePrescription() {
 
 func (c *HisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
-	//TODO 需要判断是否已经结算
+	advice, _ := service.GetHisDoctorAdvicesById(id)
 	err := service.DelelteDoctorAdvice(id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
+		drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, advice.DrugId)
+		drug.Total = drug.Total + advice.PrescribingNumber
+		service.UpdateBaseDrugLib(&drug)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -1494,6 +1544,12 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 			advice.DrugId = drug_id
 		}
 	}
+
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
+		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
+		advice.PrescribingNumber = prescribingNumber
+	}
+
 	if json["advice_id"] != nil && reflect.TypeOf(json["advice_id"]).String() == "float64" {
 		advice_id := int64(json["advice_id"].(float64))
 		advice.ID = advice_id
@@ -1514,6 +1570,24 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		}
 	}
 
+	drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+	if advice.ID == 0 { //医嘱不存在
+		drug.Total = drug.Total - advice.PrescribingNumber
+		service.UpdateBaseDrugLib(&drug)
+	} else if advice.ID > 0 { //医嘱存在
+		hisAdvice, _ := service.GetHisDoctorAdvicesById(advice.ID)
+		var num float64
+		if hisAdvice.PrescribingNumber > advice.PrescribingNumber {
+			num = hisAdvice.PrescribingNumber - advice.PrescribingNumber
+			drug.Total = drug.Total + num
+			service.UpdateBaseDrugLib(&drug)
+		} else if hisAdvice.PrescribingNumber < advice.PrescribingNumber {
+			num = advice.PrescribingNumber - hisAdvice.PrescribingNumber
+			drug.Total = drug.Total - num
+			service.UpdateBaseDrugLib(&drug)
+		}
+	}
+
 	//
 	//if json["execution_time"] != nil && reflect.TypeOf(json["execution_time"]).String() == "string" {
 	//	execution_time, _ := strconv.ParseInt(json["execution_time"].(string), 10,64)
@@ -1569,10 +1643,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		singleDoseUnit, _ := json["single_dose_unit"].(string)
 		advice.SingleDoseUnit = singleDoseUnit
 	}
-	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
-		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
-		advice.PrescribingNumber = prescribingNumber
-	}
+
 	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
 		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
 		advice.PrescribingNumberUnit = prescribingNumberUnit

controllers/his_project_api_controller.go

@@ -731,12 +731,11 @@ func (this *HisProjectApiController) GetTreatmentList() {
 }
 
 func (this *HisProjectApiController) GetAllProjectList() {
-
+	keyword := this.GetString("keyword")
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	projectList, err := service.GetAllProjectList(orgId)
-
-	goodInfos, err := service.GetGoodInfomationList(orgId)
+	projectList, err := service.GetAllProjectList(orgId, keyword)
+	goodInfos, err := service.GetGoodInfomationList(orgId, keyword)
 
 	//获取列表数据
 	hisprojectlist, err := service.GetHisProjectListByOrgId(orgId)
@@ -1189,7 +1188,7 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 	//prescription_id, _ := this.GetInt64("prescription_id")
 	adminUserInfo := this.GetAdminUserInfo()
 	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs, adminUserInfo.CurrentOrgId)
-	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId)
+	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId, "")
 	//prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	hisPatient, _ := service.GetHisPatientById(patient_id)
 	if err != nil {

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/manager_center_api_controller.go

@@ -78,6 +78,8 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/diagnose/list", &ManagerCenterApiController{}, "get:GetDiagnoseList")
 	beego.Router("/api/diagnose/delete", &ManagerCenterApiController{}, "post:DeleteDiagnose")
 	beego.Router("/api/diagnose/get", &ManagerCenterApiController{}, "get:GetDiagnose")
+	beego.Router("/api/drug/getalldruglist", &ManagerCenterApiController{}, "get:GetAllDrugList")
+	beego.Router("/api/drug/postsearchdruglist", &ManagerCenterApiController{}, "get:GetSearchDrugList")
 
 }
 
@@ -134,6 +136,11 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
+	dosage := c.GetString("dosage")
+	unval := c.GetString("unval")
+	packing_unit := c.GetString("packing_unit")
+	packing_price, _ := c.GetFloat("packing_price")
+	drug_day := c.GetString("drug_day")
 	//hosp_appr_flag
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
@@ -192,6 +199,11 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
+		Dosage:                      dosage,
+		Unval:                       unval,
+		PackingUnit:                 packing_unit,
+		PackingPrice:                packing_price,
+		DrugDay:                     drug_day,
 		HospApprFlag:                hosp_appr_flag,
 		LmtUsedFlag:                 lmt_used_flag,
 	}
@@ -201,7 +213,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	drug_code = "54000000" + drug_code
 	drugLib.DrugCode = drug_code
 
-	count := service.FindBaseDrugLibRecordCount(drugLib)
+	count := service.FindBaseDrugLibRecordCountOne(drugLib)
 
 	if count == 0 {
 		err := service.CreateBaseDrugLib(drugLib)
@@ -278,6 +290,11 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	drug_remark := c.GetString("drug_remark")
+	dosage := c.GetString("dosage")
+	unval := c.GetString("unval")
+	packing_unit := c.GetString("packing_unit")
+	packing_price, _ := c.GetFloat("packing_price")
+	drug_day := c.GetString("drug_day")
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	adminInfo := c.GetAdminUserInfo()
@@ -338,6 +355,11 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
 		DrugRemark:                  drug_remark,
+		Dosage:                      dosage,
+		Unval:                       unval,
+		PackingPrice:                packing_price,
+		PackingUnit:                 packing_unit,
+		DrugDay:                     drug_day,
 		HospApprFlag:                hosp_appr_flag,
 		LmtUsedFlag:                 lmt_used_flag,
 	}
@@ -362,7 +384,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	//查询是否存在
 	_, errTwo := service.GetStandNameIsExist(id, adminInfo.CurrentOrgId)
 	if errTwo == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗1")
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})
@@ -2136,3 +2158,34 @@ func (c *ManagerCenterApiController) GetDiagnose() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *ManagerCenterApiController) GetAllDrugList() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetAllDrugList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) GetSearchDrugList() {
+	keyword := c.GetString("keyword")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetSearchDrugList(keyword, orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -694,6 +694,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)
@@ -747,6 +748,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		PrecautionOther:              precaution_other,
 		PsychologicalOther:           psychological_other,
 		AdmissionNumber:              admission_number,
+		Tumble:                       tumble,
 	}
 
 	if receiveTreatment.ID == 0 { //新增
@@ -853,6 +855,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
@@ -946,6 +955,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)
@@ -1084,6 +1100,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)
 	//
@@ -1171,6 +1194,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,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1794,14 +1824,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)
 			}
@@ -1964,6 +2003,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)
 	}
@@ -2052,6 +2098,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)
@@ -2265,6 +2318,7 @@ func (this *DialysisAPIController) GetLastMonitorRecord() {
 }
 
 func (this *DialysisAPIController) GetLastMonitorRecordTody() {
+
 	thisTime := time.Now()
 	scheduleDateStart := thisTime.Format("2006-01-02") + " 00:00:00"
 	timeLayout := "2006-01-02 15:04:05"
@@ -2282,16 +2336,23 @@ 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 != 9538 {
 				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 {
 
@@ -2313,7 +2374,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)
@@ -2325,6 +2388,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
+
 		}
 	}
 
@@ -3561,7 +3625,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{})
@@ -3645,7 +3709,7 @@ func (c *DialysisAPIController) EditConsumables() {
 				}
 			}
 		}
-		fmt.Println("hhhhhhhhhhhhhhhhhhhh", beforePrepares)
+
 		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
@@ -3705,7 +3769,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")
@@ -3854,7 +3918,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

@@ -2402,6 +2402,27 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		thromubus_v := dataBody["thromubus_v"].(string)
 		evaluation.ThromubusV = thromubus_v
 	}
+
+	if dataBody["dehydration"] != nil && reflect.TypeOf(dataBody["dehydration"]).String() == "string" {
+		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/mobile_his_api_controller.go

@@ -138,6 +138,7 @@ func (this *MobileHisApiController) GetCallHisPrescription() {
 func (c *MobileHisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
+	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
 
 	err := service.DelelteHisPrescription(prescription_id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
@@ -152,6 +153,13 @@ func (c *MobileHisApiController) DeletePrescription() {
 				}
 			}
 		}
+		if len(advices) > 0 {
+			for _, item := range advices {
+				drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, item.DrugId)
+				drug.Total = drug.Total + item.PrescribingNumber
+				service.UpdateBaseDrugLib(&drug)
+			}
+		}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -163,9 +171,14 @@ func (c *MobileHisApiController) DeletePrescription() {
 }
 func (c *MobileHisApiController) DeleteDoctorAdvice() {
 	id, _ := c.GetInt64("id")
+	advice, _ := service.GetHisDoctorAdvicesById(id)
+
 	//TODO 需要判断是否已经结算
 	err := service.DelelteDoctorAdvice(id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
+		drug, _ := service.FindBaseDrugLibRecord(c.GetMobileAdminUserInfo().CurrentOrgId, advice.DrugId)
+		drug.Total = drug.Total + advice.PrescribingNumber
+		service.UpdateBaseDrugLib(&drug)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -228,6 +241,41 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 	role, _ := service.GetAdminUserInfoByID(adminInfo.Org.Id, doctor_id)
 
+	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+		if len(prescriptions) > 0 {
+			for _, item := range prescriptions {
+				items := item.(map[string]interface{})
+				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var drug_id int64
+							var prescribing_number float64
+							if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+								drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+							}
+							if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "float64" {
+								prescribing_number = advice.(map[string]interface{})["prescribing_number"].(float64)
+							}
+
+							drug, _ := service.FindBaseDrugLibRecord(adminInfo.Org.Id, drug_id)
+							if drug.ID == 0 {
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+								return
+							}
+
+							if prescribing_number > drug.Total {
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+								return
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
 	info, _ := service.FindPatientPrescriptionInfo(adminInfo.Org.Id, patient_id, recordDateTime, 2)
 	var hpInfo models.HisPrescriptionInfo
 	if info.ID == 0 {
@@ -543,6 +591,29 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 		}
 	}
 
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
+		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
+		advice.PrescribingNumber = prescribingNumber
+	}
+
+	drug, _ := service.FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+	if advice.ID == 0 { //医嘱不存在
+		drug.Total = drug.Total - advice.PrescribingNumber
+		service.UpdateBaseDrugLib(&drug)
+	} else if advice.ID > 0 { //医嘱存在
+		hisAdvice, _ := service.GetHisDoctorAdvicesById(advice.ID)
+		var num float64
+		if hisAdvice.PrescribingNumber > advice.PrescribingNumber {
+			num = hisAdvice.PrescribingNumber - advice.PrescribingNumber
+			drug.Total = drug.Total + num
+			service.UpdateBaseDrugLib(&drug)
+		} else if hisAdvice.PrescribingNumber < advice.PrescribingNumber {
+			num = advice.PrescribingNumber - hisAdvice.PrescribingNumber
+			drug.Total = drug.Total - num
+			service.UpdateBaseDrugLib(&drug)
+		}
+	}
+
 	//
 	//if json["execution_time"] != nil && reflect.TypeOf(json["execution_time"]).String() == "string" {
 	//	execution_time, _ := strconv.ParseInt(json["execution_time"].(string), 10,64)
@@ -598,10 +669,7 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 		singleDoseUnit, _ := json["single_dose_unit"].(string)
 		advice.SingleDoseUnit = singleDoseUnit
 	}
-	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
-		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
-		advice.PrescribingNumber = prescribingNumber
-	}
+
 	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
 		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
 		advice.PrescribingNumberUnit = prescribingNumberUnit

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 {
@@ -1649,207 +1651,208 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		fmt.Println("", drugStockConfig.IsOpen)
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
-			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
-			for _, item := range advices {
-				fmt.Println("非自备要22222")
-				if item.Way == 1 {
-					out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
-					if err == gorm.ErrRecordNotFound {
-						//没有记录，则创建出库单
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
-						total = total + 1
-						warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-						number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-						number = number + total
-						warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-						creater := adminUserInfo.AdminUser.Id
-						warehouseOut := models.DrugWarehouseOut{
-							WarehouseOutOrderNumber: warehousing_out_order,
-							OperationTime:           time.Now().Unix(),
-							OrgId:                   adminUserInfo.CurrentOrgId,
-							Creater:                 creater,
-							Ctime:                   time.Now().Unix(),
-							Status:                  1,
-							WarehouseOutTime:        item.RecordDate,
-							Dealer:                  0,
-							Manufacturer:            0,
-							Type:                    1,
-							IsSys:                   1,
-						}
-
-						err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-						if err != nil {
-							utils.TraceLog("创建出库单失败 err = %v", err)
-						} else {
-							if item.Way == 1 {
-								if item.PrescribingNumber > 0 {
-									warehouseOutInfo := &models.DrugWarehouseOutInfo{
-										WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-										WarehouseOutId:          warehouseOut.ID,
-										Status:                  1,
-										Ctime:                   time.Now().Unix(),
-										Remark:                  "",
-										OrgId:                   adminUserInfo.CurrentOrgId,
-										Type:                    1,
-										Manufacturer:            0,
-										Dealer:                  0,
-										IsSys:                   1,
-										SysRecordTime:           item.RecordDate,
-										DrugId:                  item.DrugId,
-									}
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									warehouseOutInfo.Count = count
-									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-									warehouseOutInfo.Price = stockInInfo.Price
-									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-									if err == nil {
-										details := &models.DrugAutomaticReduceDetail{
-											WarehouseOutId:          warehouseOutInfo.ID,
-											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-											PatientId:               item.PatientId,
-											Ctime:                   time.Now().Unix(),
-											Mtime:                   time.Now().Unix(),
-											Status:                  1,
-											RecordTime:              item.RecordDate,
-											OrgId:                   adminUserInfo.CurrentOrgId,
-											DrugId:                  item.DrugId,
-											Count:                   count,
-										}
-										service.AddSigleDrugAutoReduceRecordInfo(details)
-										if err != nil {
-											utils.TraceLog("创建出库单失败 err = %v", err)
-										} else {
-											if item.Way == 1 {
-												if item.PrescribingNumber > 0 {
-													warehouseOutInfo := &models.DrugWarehouseOutInfo{
-														WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-														WarehouseOutId:          warehouseOut.ID,
-														Status:                  1,
-														Ctime:                   time.Now().Unix(),
-														Remark:                  "",
-														OrgId:                   adminUserInfo.CurrentOrgId,
-														Type:                    1,
-														Manufacturer:            0,
-														Dealer:                  0,
-														IsSys:                   1,
-														SysRecordTime:           item.RecordDate,
-														DrugId:                  item.DrugId,
-													}
-													prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-													count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-													warehouseOutInfo.Count = count
-													stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-													warehouseOutInfo.Price = stockInInfo.Price
-													err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-													if err == nil {
-														details := &models.DrugAutomaticReduceDetail{
-															WarehouseOutId:          warehouseOutInfo.ID,
-															WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-															PatientId:               item.PatientId,
-															Ctime:                   time.Now().Unix(),
-															Mtime:                   time.Now().Unix(),
-															Status:                  1,
-															RecordTime:              item.RecordDate,
-															OrgId:                   adminUserInfo.CurrentOrgId,
-															DrugId:                  item.DrugId,
-															Count:                   count,
-														}
-														service.AddSigleDrugAutoReduceRecordInfo(details)
-													}
-												}
-											}
-										}
-
-									}
-								}
-							}
-						}
-					} else if err == nil {
-						if item.Way == 1 {
-							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-							if err == gorm.ErrRecordNotFound {
-								warehouseOutInfo := &models.DrugWarehouseOutInfo{
-									WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-									WarehouseOutId:          out.ID,
-									Status:                  1,
-									Ctime:                   time.Now().Unix(),
-									Remark:                  "",
-									OrgId:                   adminUserInfo.CurrentOrgId,
-									Type:                    1,
-									Manufacturer:            0,
-									Dealer:                  0,
-									IsSys:                   1,
-									SysRecordTime:           item.RecordDate,
-								}
-
-								stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-								warehouseOutInfo.Price = stockInInfo.Price
-								warehouseOutInfo.DrugId = item.DrugId
-								prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								warehouseOutInfo.Count = count
-								err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-								if err == nil {
-									details := &models.DrugAutomaticReduceDetail{
-										WarehouseOutId:          warehouseOutInfo.ID,
-										WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-										PatientId:               item.PatientId,
-										Ctime:                   time.Now().Unix(),
-										Mtime:                   time.Now().Unix(),
-										Status:                  1,
-										RecordTime:              item.RecordDate,
-										OrgId:                   adminUserInfo.CurrentOrgId,
-										DrugId:                  item.DrugId,
-										Count:                   count,
-									}
-									service.AddSigleDrugAutoReduceRecordInfo(details)
-								}
-
-							} else if err == nil { //记录存在，则将增加数量
-								if outInfo.ID > 0 {
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
-								}
-
-								count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
-								if count == 0 {
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									details := &models.DrugAutomaticReduceDetail{
-										WarehouseOutId:          outInfo.ID,
-										WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-										PatientId:               item.PatientId,
-										Ctime:                   time.Now().Unix(),
-										Mtime:                   time.Now().Unix(),
-										Status:                  1,
-										RecordTime:              item.RecordDate,
-										OrgId:                   adminUserInfo.CurrentOrgId,
-										DrugId:                  item.DrugId,
-										Count:                   count,
-									}
-									service.AddSigleDrugAutoReduceRecordInfo(details)
-								} else if count == 1 {
-									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
-								}
-
-							}
-						}
-					}
-				}
-			}
+			//advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
+			//for _, item := range advices {
+			//
+			//	//调用药品出库接口
+			//	//service.DrugsDelivery(item.UserOrgId, item)
+			//
+			//	//if item.Way == 1 {
+			//	//	out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
+			//	//	if err == gorm.ErrRecordNotFound {
+			//	//		//没有记录，则创建出库单
+			//	//		timeStr := time.Now().Format("2006-01-02")
+			//	//		timeArr := strings.Split(timeStr, "-")
+			//	//		total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
+			//	//		total = total + 1
+			//	//		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			//	//		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			//	//		number = number + total
+			//	//		warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+			//	//		creater := adminUserInfo.AdminUser.Id
+			//	//		warehouseOut := models.DrugWarehouseOut{
+			//	//			WarehouseOutOrderNumber: warehousing_out_order,
+			//	//			OperationTime:           time.Now().Unix(),
+			//	//			OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//			Creater:                 creater,
+			//	//			Ctime:                   time.Now().Unix(),
+			//	//			Status:                  1,
+			//	//			WarehouseOutTime:        item.RecordDate,
+			//	//			Dealer:                  0,
+			//	//			Manufacturer:            0,
+			//	//			Type:                    1,
+			//	//			IsSys:                   1,
+			//	//		}
+			//	//
+			//	//		err := service.AddSigleDrugWarehouseOut(&warehouseOut)
+			//	//		if err != nil {
+			//	//			utils.TraceLog("创建出库单失败 err = %v", err)
+			//	//		} else {
+			//	//			if item.Way == 1 {
+			//	//				if item.PrescribingNumber > 0 {
+			//	//					warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			//	//						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			//	//						WarehouseOutId:          warehouseOut.ID,
+			//	//						Status:                  1,
+			//	//						Ctime:                   time.Now().Unix(),
+			//	//						Remark:                  "",
+			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//						Type:                    1,
+			//	//						Manufacturer:            0,
+			//	//						Dealer:                  0,
+			//	//						IsSys:                   1,
+			//	//						SysRecordTime:           item.RecordDate,
+			//	//						DrugId:                  item.DrugId,
+			//	//					}
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					warehouseOutInfo.Count = count
+			//	//					stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+			//	//					warehouseOutInfo.Price = stockInInfo.Price
+			//	//					err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			//	//					if err == nil {
+			//	//						details := &models.DrugAutomaticReduceDetail{
+			//	//							WarehouseOutId:          warehouseOutInfo.ID,
+			//	//							WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			//	//							PatientId:               item.PatientId,
+			//	//							Ctime:                   time.Now().Unix(),
+			//	//							Mtime:                   time.Now().Unix(),
+			//	//							Status:                  1,
+			//	//							RecordTime:              item.RecordDate,
+			//	//							OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//							DrugId:                  item.DrugId,
+			//	//							Count:                   count,
+			//	//						}
+			//	//						service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//						if err != nil {
+			//	//							utils.TraceLog("创建出库单失败 err = %v", err)
+			//	//						} else {
+			//	//							if item.Way == 1 {
+			//	//								if item.PrescribingNumber > 0 {
+			//	//									warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			//	//										WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			//	//										WarehouseOutId:          warehouseOut.ID,
+			//	//										Status:                  1,
+			//	//										Ctime:                   time.Now().Unix(),
+			//	//										Remark:                  "",
+			//	//										OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//										Type:                    1,
+			//	//										Manufacturer:            0,
+			//	//										Dealer:                  0,
+			//	//										IsSys:                   1,
+			//	//										SysRecordTime:           item.RecordDate,
+			//	//										DrugId:                  item.DrugId,
+			//	//									}
+			//	//									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//									warehouseOutInfo.Count = count
+			//	//									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+			//	//									warehouseOutInfo.Price = stockInInfo.Price
+			//	//									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			//	//									if err == nil {
+			//	//										details := &models.DrugAutomaticReduceDetail{
+			//	//											WarehouseOutId:          warehouseOutInfo.ID,
+			//	//											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			//	//											PatientId:               item.PatientId,
+			//	//											Ctime:                   time.Now().Unix(),
+			//	//											Mtime:                   time.Now().Unix(),
+			//	//											Status:                  1,
+			//	//											RecordTime:              item.RecordDate,
+			//	//											OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//											DrugId:                  item.DrugId,
+			//	//											Count:                   count,
+			//	//										}
+			//	//										service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//									}
+			//	//								}
+			//	//							}
+			//	//						}
+			//	//
+			//	//					}
+			//	//				}
+			//	//			}
+			//	//		}
+			//	//	} else if err == nil {
+			//	//		if item.Way == 1 {
+			//	//			outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
+			//	//			if err == gorm.ErrRecordNotFound {
+			//	//				warehouseOutInfo := &models.DrugWarehouseOutInfo{
+			//	//					WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
+			//	//					WarehouseOutId:          out.ID,
+			//	//					Status:                  1,
+			//	//					Ctime:                   time.Now().Unix(),
+			//	//					Remark:                  "",
+			//	//					OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//					Type:                    1,
+			//	//					Manufacturer:            0,
+			//	//					Dealer:                  0,
+			//	//					IsSys:                   1,
+			//	//					SysRecordTime:           item.RecordDate,
+			//	//				}
+			//	//
+			//	//				stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
+			//	//				warehouseOutInfo.Price = stockInInfo.Price
+			//	//				warehouseOutInfo.DrugId = item.DrugId
+			//	//				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//				count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//				warehouseOutInfo.Count = count
+			//	//				err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+			//	//				if err == nil {
+			//	//					details := &models.DrugAutomaticReduceDetail{
+			//	//						WarehouseOutId:          warehouseOutInfo.ID,
+			//	//						WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			//	//						PatientId:               item.PatientId,
+			//	//						Ctime:                   time.Now().Unix(),
+			//	//						Mtime:                   time.Now().Unix(),
+			//	//						Status:                  1,
+			//	//						RecordTime:              item.RecordDate,
+			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//						DrugId:                  item.DrugId,
+			//	//						Count:                   count,
+			//	//					}
+			//	//					service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//				}
+			//	//
+			//	//			} else if err == nil { //记录存在，则将增加数量
+			//	//				if outInfo.ID > 0 {
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
+			//	//				}
+			//	//
+			//	//				count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
+			//	//				if count == 0 {
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					details := &models.DrugAutomaticReduceDetail{
+			//	//						WarehouseOutId:          outInfo.ID,
+			//	//						WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
+			//	//						PatientId:               item.PatientId,
+			//	//						Ctime:                   time.Now().Unix(),
+			//	//						Mtime:                   time.Now().Unix(),
+			//	//						Status:                  1,
+			//	//						RecordTime:              item.RecordDate,
+			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
+			//	//						DrugId:                  item.DrugId,
+			//	//						Count:                   count,
+			//	//					}
+			//	//					service.AddSigleDrugAutoReduceRecordInfo(details)
+			//	//				} else if count == 1 {
+			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+			//	//					service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
+			//	//				}
+			//	//
+			//	//			}
+			//	//		}
+			//	//	}
+			//	//}
+			//}
 		}
 
 		advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 		for _, item := range advices {
-			fmt.Println("33333", item.ExecutionState)
-			fmt.Println("医嘱名称", item.AdviceName)
-			fmt.Println("item", item.Way)
+
 			if item.Way == 2 {
 				if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
 
@@ -3410,6 +3413,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,25 @@ 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")
+	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
+	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -790,6 +810,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 +831,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 +868,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 +1355,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 +1370,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 +1980,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 +2221,449 @@ 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
+}
+
+func (c *ScheduleApiController) ChangeFuncPrint() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	is_open, _ := c.GetInt64("is_open")
+	dataPrint := models.XtDataPrint{
+		UserOrgId: orgId,
+		IsOpen:    is_open,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+	}
+
+	_, errcode := service.GetDataPrintByOrgId(orgId)
+	fmt.Println("errcode222234444555556t66", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		service.CreateDataPrint(&dataPrint)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"dataPrint": dataPrint,
+		})
+		return
+	} else if errcode == nil {
+		service.UpdteDataPrint(orgId, &dataPrint)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"dataPrint": dataPrint,
+		})
+		return
+	}
+
+}
+
+func (c *ScheduleApiController) GetDataPrint() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	dataPrint, _ := service.GetDataPrint(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"dataPrint": dataPrint,
+	})
+	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() {
@@ -1817,7 +1819,7 @@ func (c *StockManagerApiController) GetQueryInfo() {
 	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword, startTime, endTime, type_name)
 	info, err := service.GetCoutWareseOutInfo(startTime, endTime, adminUserInfo.CurrentOrgId)
 
-	infomationList, err := service.GetGoodInfomationList(adminUserInfo.CurrentOrgId)
+	infomationList, err := service.GetGoodInfomationList(adminUserInfo.CurrentOrgId, "")
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":           list,
@@ -2605,21 +2607,119 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.DrugName = drug_name
 
-		if goodNameM["drug_alias"] == nil || reflect.TypeOf(goodNameM["drug_alias"]).String() != "string" {
-			utils.ErrorLog("drug_alias")
+		if goodNameM["unval"] == nil || reflect.TypeOf(goodNameM["unval"]).String() != "string" {
+			utils.ErrorLog("unval")
 			return
 		}
 
-		drug_alias, _ := goodNameM["drug_alias"].(string)
+		unval, _ := goodNameM["unval"].(string)
+		if len(drug_name) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的拆零不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
 
-		drug.DrugAlias = drug_alias
+		drug.Unval = unval
+
+		min_unit := goodNameM["min_unit"].(string)
+		if len(min_unit) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的拆零单位不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		drug.MinUnit = min_unit
+
+		dosage, _ := goodNameM["dosage"].(string)
+		if len(dosage) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		drug.Dosage = dosage
+
+		max_unit_id := goodNameM["max_unit"].(string)
+		if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量单位不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		drug.MaxUnit = max_unit_id
+
+		packing_unit := goodNameM["packing_unit"].(string)
+		if len(packing_unit) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的包装单位不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		drug.PackingUnit = packing_unit
+
+		delivery_way := goodNameM["delivery_way"].(string)
+		if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
 
-		drug_spec, _ := goodNameM["drug_spec"].(string)
-		if len(drug_spec) == 0 { //名字为空则生成一条导入错误日志
+		drug.DeliveryWay = delivery_way
+
+		execution_frequency := goodNameM["execution_frequency"].(string)
+		if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的药品规格不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2629,7 +2729,24 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.DrugSpec = drug_spec
+		drug.ExecutionFrequency = execution_frequency
+
+		drug_day := goodNameM["drug_day"].(string)
+		if len(drug_day) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		drug.DrugDay = drug_day
 
 		drug_type := goodNameM["drug_type"].(string)
 		if len(drug_type) == 0 { //名字为空则生成一条导入错误日志
@@ -2826,12 +2943,12 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		}
 		drug.MedicalInsuranceLevel = medical_insurance_level_id
 
-		max_unit_id := goodNameM["max_unit"].(string)
+		unit_matrixing := goodNameM["unit_matrixing"].(string)
 		if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的最大不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的单位换算不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2841,14 +2958,15 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.MaxUnit = max_unit_id
+		drug.UnitMatrixing = unit_matrixing
+		retail_prices := goodNameM["retail_price"].(string)
+		retail_price, _ := strconv.ParseFloat(retail_prices, 64)
 
-		min_unit := goodNameM["min_unit"].(string)
-		if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
+		if retail_price <= 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的最小单位不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的拆零售价不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2858,32 +2976,16 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			continue
 		}
 
-		drug.MinUnit = min_unit
-
-		unit_matrixing := goodNameM["unit_matrixing"].(string)
-		if len(max_unit_id) == 0 { //名字为空则生成一条导入错误日志
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的单位换算不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
+		drug.RetailPrice = retail_price
 
-		drug.UnitMatrixing = unit_matrixing
-		retail_prices := goodNameM["retail_price"].(string)
-		retail_price, _ := strconv.ParseFloat(retail_prices, 64)
+		packing_prices := goodNameM["packing_price"].(string)
+		packing_price, _ := strconv.ParseFloat(packing_prices, 64)
 
-		if retail_price <= 0 { //名字为空则生成一条导入错误日志
+		if packing_price <= 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的零售价不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的包装零售价不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2901,7 +3003,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			err_log := models.ExportErrLog{
 				LogType:    4,
 				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的上次进价不能为空",
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的进货价不能为空",
 				Status:     1,
 				CreateTime: time.Now().Unix(),
 				UpdateTime: time.Now().Unix(),
@@ -2966,6 +3068,77 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			}
 		}
 
+		drug_dose := goodNameM["drug_dose"].(string)
+
+		if len(drug_dose) == 0 {
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认单次用量不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+		drugDoses, _ := strconv.ParseFloat(drug_dose, 64)
+		drug.DrugDose = drugDoses
+
+		var units = "单位"
+		var unit_id int64
+		drugDoseUnit := goodNameM["drug_dose_unit"].(string)
+
+		if len(drugDoseUnit) == 0 {
+			err_log := models.ExportErrLog{
+				LogType:    4,
+				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认单次用量单位不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		dataConfig, _ := service.GetDataConfigIsExist(0, units)
+		if len(drugDoseUnit) != 0 {
+			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
+			if errcodedataconfig == gorm.ErrRecordNotFound {
+				childConfig, _ := service.GetLastChildeConfig(dataConfig.ID, orgId)
+				dataconfig := models.Dataconfig{
+					ParentId:       dataConfig.ID,
+					Module:         "hemodialysis",
+					OrgId:          orgId,
+					Name:           drugDoseUnit,
+					FieldName:      "",
+					Value:          childConfig.Value + 1,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+					FieldType:      0,
+				}
+				service.CreateDataConfig(&dataconfig)
+			}
+		}
+		list, _ := service.FindAllDataConfigList(orgId, dataConfig.ID)
+		for _, it := range list {
+			if drugDoseUnit == it.Name {
+				unit_id = int64(it.Value)
+			}
+		}
+		drug.DrugDoseUnit = unit_id
+
 		drug.DrugClassify = strconv.FormatInt(drug_classify_id, 10)
 
 		manufacturer := goodNameM["manufacturer"].(string)
@@ -3031,14 +3204,61 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		}
 		drug.Dealer = dealer_id
 
-		pinyin := goodNameM["pinyin"].(string)
+		lmt_used_flags := int64(goodNameM["lmt_used_flag"].(float64))
 
-		drug.Pinyin = pinyin
-		wubi := goodNameM["wubi"].(string)
-		drug.Wubi = wubi
+		drug.LmtUsedFlag = lmt_used_flags
+
+		if goodNameM["drug_alias"] == nil || reflect.TypeOf(goodNameM["drug_alias"]).String() != "string" {
+			utils.ErrorLog("drug_alias")
+			return
+		}
+
+		drug_alias, _ := goodNameM["drug_alias"].(string)
+
+		drug.DrugAlias = drug_alias
+
+		drug_category := goodNameM["drug_category"].(string)
+
+		var drugCategory = "药品类别"
+		var drug_category_id int64
+
+		drugCategoryConfig, _ := service.GetDrugDataConfig(0, drugCategory)
+
+		if len(drug_category) != 0 {
+			_, drugcategoryerrcodes := service.IsExistDicConfig(drugCategoryConfig.ID, drug_category, orgId)
+			if drugcategoryerrcodes == gorm.ErrRecordNotFound {
+				drugCategoryConfigSix, _ := service.GetLastDicConfig(drugCategoryConfig.ID, orgId)
+				dataconfig := models.DictDataconfig{
+					ParentId:       drugCategoryConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           drug_category,
+					FieldName:      "",
+					Value:          drugCategoryConfigSix.Value + 1,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+		}
+
+		drugCategoryList, _ := service.GetParentDataConfig(drugCategoryConfig.ID, orgId)
+		fmt.Println("drugCategoryList", drugCategoryList)
+		for _, it := range drugCategoryList {
+			if drug_category == it.Name {
+				drug_category_id = int64(it.Value)
+			}
+		}
 
-		drug_alias_pinyin := goodNameM["drug_alias_pinyin"].(string)
-		drug.DrugAliasPinyin = drug_alias_pinyin
+		drug.DrugCategory = drug_category_id
 
 		statistics_category := goodNameM["statistics_category"].(string)
 
@@ -3151,9 +3371,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		limit_remark := goodNameM["limit_remark"].(string)
 		drug.LimitRemark = limit_remark
 
-		drug_alias_wubi := goodNameM["drug_alias_wubi"].(string)
-		drug.DrugAliasWubi = drug_alias_wubi
-
 		drug_control := goodNameM["drug_control"].(string)
 
 		var drugControl = "开药控制"
@@ -3194,123 +3411,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		}
 		drug.DrugControl = drug_control_id
 
-		drug_category := goodNameM["drug_category"].(string)
-
-		var drugCategory = "药品类别"
-		var drug_category_id int64
-
-		drugCategoryConfig, _ := service.GetDrugDataConfig(0, drugCategory)
-
-		if len(drug_category) != 0 {
-			_, drugcategoryerrcodes := service.IsExistDicConfig(drugCategoryConfig.ID, drug_category, orgId)
-			if drugcategoryerrcodes == gorm.ErrRecordNotFound {
-				drugCategoryConfigSix, _ := service.GetLastDicConfig(drugCategoryConfig.ID, orgId)
-				dataconfig := models.DictDataconfig{
-					ParentId:       drugCategoryConfig.ID,
-					Module:         "system",
-					OrgId:          orgId,
-					Name:           drug_category,
-					FieldName:      "",
-					Value:          drugCategoryConfigSix.Value + 1,
-					CreatedTime:    "",
-					UpdatedTime:    "",
-					CreateUserId:   adminUser.AdminUser.Id,
-					Status:         1,
-					Remark:         "",
-					DeleteIdSystem: 0,
-					Title:          "",
-					Content:        "",
-					Order:          0,
-					Code:           "",
-				}
-				service.CreatedDicConfig(&dataconfig)
-			}
-		}
-
-		drugCategoryList, _ := service.GetParentDataConfig(drugCategoryConfig.ID, orgId)
-		fmt.Println("drugCategoryList", drugCategoryList)
-		for _, it := range drugCategoryList {
-			if drug_category == it.Name {
-				drug_category_id = int64(it.Value)
-			}
-		}
-
-		drug.DrugCategory = drug_category_id
-
-		drug_dose := goodNameM["drug_dose"].(string)
-
-		if len(drug_dose) == 0 {
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
-		drugDoses, _ := strconv.ParseFloat(drug_dose, 64)
-		drug.DrugDose = drugDoses
-
-		var units = "单位"
-		var unit_id int64
-		drugDoseUnit := goodNameM["drug_dose_unit"].(string)
-
-		if len(drugDoseUnit) == 0 {
-			err_log := models.ExportErrLog{
-				LogType:    4,
-				UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-				ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量不能为空",
-				Status:     1,
-				CreateTime: time.Now().Unix(),
-				UpdateTime: time.Now().Unix(),
-				ExportTime: time.Now().Unix(),
-			}
-			service.CreateExportErrLog(&err_log)
-			continue
-		}
-
-		dataConfig, _ := service.GetDataConfigIsExist(0, units)
-		if len(drugDoseUnit) != 0 {
-			_, errcodedataconfig := service.GetChildeConfigIsExist(dataConfig.ID, drugDoseUnit, orgId)
-			if errcodedataconfig == gorm.ErrRecordNotFound {
-				childConfig, _ := service.GetLastChildeConfig(dataConfig.ID, orgId)
-				dataconfig := models.Dataconfig{
-					ParentId:       dataConfig.ID,
-					Module:         "hemodialysis",
-					OrgId:          orgId,
-					Name:           drugDoseUnit,
-					FieldName:      "",
-					Value:          childConfig.Value + 1,
-					CreatedTime:    "",
-					UpdatedTime:    "",
-					CreateUserId:   adminUser.AdminUser.Id,
-					Status:         1,
-					Remark:         "",
-					DeleteIdSystem: 0,
-					Title:          "",
-					Content:        "",
-					Order:          0,
-					Code:           "",
-					FieldType:      0,
-				}
-				service.CreateDataConfig(&dataconfig)
-			}
-		}
-		list, _ := service.FindAllDataConfigList(orgId, dataConfig.ID)
-		for _, it := range list {
-			if drugDoseUnit == it.Name {
-				unit_id = int64(it.Value)
-			}
-		}
-		drug.DrugDoseUnit = unit_id
-
-		lmt_used_flags := int64(goodNameM["lmt_used_flag"].(float64))
-
-		drug.LmtUsedFlag = lmt_used_flags
 		drugList = append(drugList, &drug)
 	}
 
@@ -3363,10 +3463,17 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				DrugDose:                    item.DrugDose,
 				DrugDoseUnit:                item.DrugDoseUnit,
 				LmtUsedFlag:                 item.LmtUsedFlag,
+				Dosage:                      item.Dosage,
+				Unval:                       item.Unval,
+				PackingUnit:                 item.PackingUnit,
+				PackingPrice:                item.PackingPrice,
+				DrugDay:                     item.DrugDay,
+				DeliveryWay:                 item.DeliveryWay,
+				ExecutionFrequency:          item.ExecutionFrequency,
 			}
 
 			//查询同种药品同种规格是否存在
-			_, drugerror := service.IsExistDrugByName(item.DrugName, item.DrugSpec, orgId)
+			_, drugerror := service.IsExistDrugByNameOne(item.DrugName, item.Dosage, item.MaxUnit, item.Unval, item.MinUnit, item.PackingUnit, orgId)
 
 			if drugerror == gorm.ErrRecordNotFound {
 				service.CreateDrugsInfomation(&goodInfo)
@@ -3475,3 +3582,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,
+	})
+}

enums/error_code.go

@@ -230,6 +230,8 @@ const ( // ErrorCode
 	ErrorCodeOrderParamWrong = 300003
 
 	ErrorCodeHisPatientParamWrong = 300004
+
+	ErrorCodeOutOfStockParamWrong = 300300
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -450,6 +452,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeOrderParamWrong: "结算记录不存在",
 
 	ErrorCodeHisPatientParamWrong: "订单正在结算、请先结算完成",
+
+	ErrorCodeOutOfStockParamWrong: "库存不足",
 }
 
 type SGJError struct {

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 {
@@ -280,6 +281,11 @@ type PredialysisEvaluation struct {
 	ThrombusAv                     string  `gorm:"column:thrombus_av" json:"thrombus_av" form:"thrombus_av"`
 	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 {
@@ -586,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 {
@@ -642,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 {
@@ -867,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 {
@@ -977,6 +993,14 @@ func (DialysisBeforePrepare) TableName() string {
 	return "dialysis_before_prepare"
 }
 
+type DialysisBeforePrepareGoods struct {
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count             int64  `gorm:"column:count" json:"count" form:"count"`
+	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+}
+
 type QueueCallConfig struct {
 	ID         int64 `gorm:"column:id" json:"id" form:"id"`
 	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`

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/drug.go

@@ -1,28 +1,29 @@
 package models
 
 type BaseDrugLib struct {
-	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName              string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                  string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias             string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin       string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi         string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory          int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec              string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType              int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit        string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace       string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm        int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit               string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber             int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit               string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                  float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit              string  `gorm:"column:Dose_unit" json:"Dose_unit" form:"Dose_unit"`
+	MinPrice              string  `gorm:"column:min_price" json:"min_price" form:"min_price"`
+
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
 	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
 	Number                      string  `gorm:"column:number" json:"number" form:"number"`
@@ -64,15 +65,17 @@ type BaseDrugLib struct {
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
-	Dosage                      string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
-	Unval                       string  `gorm:"column:unval" json:"unval" form:"unval"`
-	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
+	Dosage       string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval        string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit  string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay      string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total        float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (BaseDrugLib) TableName() string {
-	return "xt_base_drug"
+	return ""
 }
 
 type DrugUnitSafeguard struct {

models/drug_stock.go

@@ -42,6 +42,11 @@ type DrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
 }
 
 func (DrugWarehouseInfo) TableName() string {
@@ -78,6 +83,7 @@ type DrugWarehouseOutInfo struct {
 	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
 	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
 	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
 	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
@@ -210,6 +216,7 @@ type DrugAutomaticReduceDetail struct {
 	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugId                  int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Count                   int64  `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 }
 
 func (DrugAutomaticReduceDetail) TableName() string {

models/his_models.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	//"gdyb/models"
-
 	"time"
 )
 
@@ -234,6 +233,7 @@ type HisDoctorAdviceInfo struct {
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Way                   int64                  `gorm:"column:way" json:"way" form:"way"`
 	HospApprFlag          int64                  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
@@ -311,6 +311,7 @@ type Drug struct {
 	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (Drug) TableName() string {
@@ -602,6 +603,7 @@ type VMDrug struct {
 	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (VMDrug) TableName() string {

models/inspection_models.go

@@ -10,6 +10,7 @@ type Inspection struct {
 	ProjectName  string `gorm:"column:project_name" json:"project_name" form:"project_name"`
 	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
 	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectTips  string `gorm:"column:inspect_tips" json:"inspect_tips" form:"inspect_tips"`
 	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
 	Status       int64  `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`

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,21 @@ 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;"`
+	DialysisSolution     []*DialysisSolution    `json:"dialysissolution" gorm:"foreignkey:RecordDate,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 +43,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 +132,41 @@ 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;"`
+	DialysisSolution     []*DialysisSolution    `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 }
 
 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"
+}
+
+type XtDataPrint struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDataPrint) TableName() string {
+	return "xt_data_print"
+}

models/self_drug_models.go

@@ -65,6 +65,7 @@ type XtBaseDrug struct {
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (XtBaseDrug) TableName() string {
@@ -389,6 +390,8 @@ type XtDrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
+	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {

models/service/stock_service.go

@@ -507,21 +507,22 @@ func (VMDrugWarehouseInfo) TableName() string {
 }
 
 type Drug struct {
-	ID              int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName        string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec        string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType        int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit  string `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace string `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm  int64  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	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"`
-	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	HospApprFlag    int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag     int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ID              int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName        string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec        string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType        int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit  string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm  int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	Manufacturer    int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	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"`
+	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag    int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag     int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total           float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (Drug) TableName() string {
@@ -1257,6 +1258,11 @@ func UpDateWarehouseInfo(warehouseInfo *models.WarehousingInfo) (err error) {
 	return
 }
 
+func UpDateWarehouseInfoByStock(warehouseInfo *models.WarehousingInfo) (err error) {
+	err = writeDb.Save(&warehouseInfo).Error
+	return
+}
+
 func UpDateWarehouseStatus(id int64) (err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return

models/stock_models.go

@@ -79,6 +79,8 @@ type WarehousingInfo struct {
 	ProductDate      int64       `gorm:"column:product_date" json:"product_date"`
 	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date"`
 	WarehousingCount int64       `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit  string      `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	StockNumber      int64       `gorm:"column:stock_number" json:"stock_number"`
 	Price            float64     `gorm:"column:price" json:"price"`
 	TotalPrice       float64     `gorm:"column:total_price" json:"total_price"`
 	Dealer           int64       `gorm:"column:dealer" json:"dealer"`
@@ -126,6 +128,7 @@ func (WarehouseOut) TableName() string {
 type WarehouseOutInfo struct {
 	ID                      int64        `gorm:"column:id" json:"id"`
 	WarehouseOutId          int64        `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseInfotId        int64        `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
 	GoodId                  int64        `gorm:"column:good_id" json:"good_id"`
 	GoodTypeId              int64        `gorm:"column:good_type_id" json:"good_type_id"`
 	WarehousingOutTarget    int64        `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
@@ -148,6 +151,7 @@ type WarehouseOutInfo struct {
 	Manufacturer            int64        `gorm:"column:manufacturer" json:"manufacturer"`
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
 	SysRecordTime           int64        `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64        `gorm:"column:patient_id" json:"patient_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -303,6 +307,7 @@ type AutomaticReduceDetail struct {
 	GoodsType               GoodsType `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
 	Patients                Patients  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
 	Count                   int64     `gorm:"column:count" json:"count"`
+	Type                    int64     `gorm:"column:type" json:"type"`
 }
 
 func (AutomaticReduceDetail) TableName() string {

routers/router.go

@@ -76,4 +76,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/drug_stock_service.go

@@ -21,6 +21,7 @@ type DrugConfig struct {
 	MinUnit      string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	HospApprFlag int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag  int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total        float64      `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (DrugConfig) TableName() string {
@@ -89,6 +90,8 @@ type DrugStockInfo struct {
 	QuerySalesReturnInfo  []models.DrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_sales_return_info"`
 	QueryWarehouseOutInfo []models.DrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehouseout_info"`
 	QueryCancelStockInfo  []models.DrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_cancel_stock_info"`
+
+	Total float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (DrugStockInfo) TableName() string {

service/gobal_config_service.go

@@ -489,3 +489,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/his_service.go

@@ -679,6 +679,7 @@ type BaseDrugLib struct {
 	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
@@ -706,8 +707,14 @@ func GetAllDrugLibs(org_id int64) (drugs []*Drugs, err error) {
 	return
 }
 
-func GetAllProjectList(org_id int64) (list []*models.HisProject, err error) {
-	err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1", org_id).Find(&list).Error
+func GetAllProjectList(org_id int64, keyword string) (list []*models.HisProject, err error) {
+	if len(keyword) != 0 {
+		key := "%" + keyword + "%"
+		err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1 AND project_name Like ?", org_id, key).Find(&list).Error
+	} else {
+		err = readDb.Model(&models.HisProject{}).Where("user_org_id = ?  AND status = 1", org_id).Find(&list).Error
+	}
+
 	return
 }
 
@@ -1858,3 +1865,8 @@ func GetHisPrescriptionProjectByID(id int64) (projects models.HisPrescriptionPro
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", "status = 1").Where("id = ? AND status = 1", id).First(&projects).Error
 	return
 }
+
+func GetHisPrescriptionAdviceByID(id int64) (advices []*models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("prescription_id = ? AND status = 1", id).Find(&advices).Error
+	return
+}

service/manage_center_service.go

@@ -158,6 +158,11 @@ func FindBaseDrugLibRecordCount(lib *models.BaseDrugLib) (count int64) {
 	return
 }
 
+func FindBaseDrugLibRecordCountOne(lib *models.BaseDrugLib) (count int64) {
+	readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? and drug_name = ? and dosage = ? and max_unit = ? and unval = ? and min_unit = ? and packing_unit = ? and manufacturer = ? and status = 1", lib.OrgId, lib.DrugName, lib.Dosage, lib.MaxUnit, lib.Unval, lib.MinUnit, lib.PackingUnit, lib.Manufacturer).Count(&count)
+	return
+}
+
 func FindAllDrugLibRecordTotal(org_id int64) (count int64) {
 	readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? AND status = 1", org_id).Count(&count)
 	return
@@ -357,3 +362,9 @@ func GetDoseCode(dose_id int64, user_org_id int64) (error, string) {
 	err := readDb.Model(&models.DictDataconfig{}).Where(" (user_org_id = ? Or user_org_id = 0) AND parent_id = 4 AND module = 'system' AND status = 1 AND value = ?", user_org_id, dose_id).First(&data).Error
 	return err, data.Code
 }
+
+func GetAllDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
+
+	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).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
@@ -1427,6 +1469,11 @@ func FindConsumablesByDate(orgID int64, patient_id int64, recordDate int64) (con
 	return
 }
 
+func FindConsumablesByDateTwo(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 AND count > 0", orgID, patient_id, recordDate).Find(&consumables).Error
+	return
+}
+
 //func FindLastConsumables(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error){
 //	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1", orgID, patient_id,recordDate).Find(&consumables).Error
 //	return

service/patient_service.go

@@ -1491,10 +1491,15 @@ 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
 }
 
+//func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string, template_id string, fre_type int64, patient_id int64, record_date int64) (advice models.DoctorAdvice, err error) {
+//	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and advice_name = ? and advice_desc = ? and template_id = ? and frequency_type = ? ", patient_id, user_org_id, record_date, advice_name, advice_desc, template_id, fre_type).First(&advice).Error
+//	return
+//}
+
 func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string, template_id string, fre_type int64, patient_id int64, record_date int64) (advice models.DoctorAdvice, err error) {
 	err = XTWriteDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and advice_name = ? and advice_desc = ? and template_id = ? and frequency_type = ? AND advice_type = 2 ", patient_id, user_org_id, record_date, advice_name, advice_desc, template_id, fre_type).First(&advice).Error
 	return

service/patientmanage_service.go

@@ -865,7 +865,7 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 			return readUserDb.Where("org_id=? and status = 1", orgID)
 		}).
 		Joins("JOIN xt_schedule as s ON s.patient_id=? and FROM_UNIXTIME(s.schedule_date, '%Y-%m-%d')=FROM_UNIXTIME(do.dialysis_date, '%Y-%m-%d')", patientID).
-		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
+		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id and s.status = 1", orgID).
 		Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Group("s.schedule_date")
 
 	if start > 0 {
@@ -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").Preload("DialysisSolution", "status = 1 and user_org_id = ?", orgid).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").Preload("DialysisSolution", "user_org_id =? and status = 1", orgid).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,20 @@ 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("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Order("id asc")
+	}).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 +847,99 @@ 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
+}
+
+func GetDataPrintByOrgId(orgid int64) (*models.XtDataPrint, error) {
+
+	dataPrint := models.XtDataPrint{}
+
+	err := XTReadDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Find(&dataPrint).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &dataPrint, nil
+}
+
+func CreateDataPrint(dataPrint *models.XtDataPrint) error {
+
+	err := XTWriteDB().Create(&dataPrint).Error
+	return err
+}
+
+func UpdteDataPrint(orgid int64, dataPrint *models.XtDataPrint) error {
+
+	err := XTWriteDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_open": dataPrint.IsOpen}).Error
+	return err
+}
+
+func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
+	dataPrint := models.XtDataPrint{}
+	err := XTReadDB().Model(&dataPrint).Where("user_org_id = ? and status = 1", orgid).Find(&dataPrint).Error
+	return dataPrint, err
+}

service/stock_service.go

@@ -453,11 +453,27 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 
 func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_order = ? AND status = 1", order).Last(&info).Error
-
 	return info, err
+}
+
+//func FindFirstWarehousingInfoByStock(good_id int64,good_type_id int64) (info models.WarehousingInfo, err error) {
+//	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", order).Order("ctime").First(&info).Error
+//	return info, err
+//}
+
+//药品先进先出,找出最先入库的批次
 
+func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouseInfo, err error) {
+	err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
+	return info, err
 }
 
+// 出库时先进先出，找出最先入库的批次
+//func  (drug_id int64) (info models.WarehousingInfo, err error) {
+//	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
+//	return info, err
+//}
+
 func FindLastDrugWarehousingInfo(order string) (info models.DrugWarehouseInfo, err error) {
 	err = readDb.Model(&models.DrugWarehouseInfo{}).Where("warehousing_order = ? AND status = 1", order).Last(&info).Error
 
@@ -532,6 +548,7 @@ type VMDrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
@@ -540,21 +557,30 @@ func (VMDrugWarehouseInfo) TableName() string {
 }
 
 type Drug struct {
-	ID              int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName        string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugSpec        string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType        int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit  string `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace string `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm  int64  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	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"`
-	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-	HospApprFlag    int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
-	LmtUsedFlag     int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ID              int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName        string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec        string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType        int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit  string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm  int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	Manufacturer    int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	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"`
+	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dosage          string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval           string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit     string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice    float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay         string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MaxUnit         string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit         string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	LastPrice       float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	HospApprFlag    int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag     int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Total           float64 `gorm:"column:total" json:"total" form:"total"`
 }
 
 func (Drug) TableName() string {
@@ -1589,6 +1615,21 @@ func UpDateWarehouseOutStatus(id int64) (err error) {
 	return
 }
 
+func UpDateDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo) (err error) {
+	err = writeDb.Save(&info).Error
+	return err
+}
+
+func UpDateWarehouseInfoByStock(info *models.WarehousingInfo) (err error) {
+	err = writeDb.Save(&info).Error
+	return err
+}
+
+//func UpDateWarehouseInfoByStockDelete(id int64,count int64) (err error) {
+//	err = DB.Model(&models.WarehousingInfo{}).Where("id = ?",info.ID).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+//	return err
+//}
+
 func UpDateDrugWarehouseOutStatus(id int64) (err error) {
 	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? AND status = 1", id).Update(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
@@ -2050,6 +2091,11 @@ func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, o
 	return
 }
 
+func FindStockOutInfoByStock(org_id int64, good_type_id int64, good_id int64, record_date int64, patient_id int64) (out []*models.WarehouseOutInfo, err error) {
+	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND sys_record_time = ? AND patient_id = ?", org_id, good_type_id, good_id, record_date, patient_id).Order("ctime desc").Find(&out).Error
+	return
+}
+
 func FindDrugStockOutInfoByTypeId(org_id int64, drug_id int64, out_id int64, number string) (out models.DrugWarehouseOutInfo, err error) {
 	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND  drug_id = ? AND is_sys = 1 AND  (warehouse_out_id = ? or warehouse_out_order_number = ?)", org_id, drug_id, out_id, number).First(&out).Error
 	return
@@ -2286,9 +2332,14 @@ func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutI
 	return houseOutInfo, err
 }
 
-func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error) {
+func GetGoodInfomationList(orgid int64, keyword string) (goodInfo []*models.GoodInfo, err error) {
+	if len(keyword) == 0 {
+		err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+	} else {
+		key := "%" + keyword + "%"
+		err = XTReadDB().Where("org_id = ? and status = 1 and good_name Like ?", orgid, key).Find(&goodInfo).Error
+	}
 
-	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
 	return goodInfo, err
 }
 
@@ -2305,6 +2356,19 @@ func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.B
 	return &drug, nil
 }
 
+func IsExistDrugByNameOne(drugname string, dosage string, maxunit string, unival string, minunit string, packtunit string, orgid int64) (*models.BaseDrugLib, error) {
+	var drug models.BaseDrugLib
+	var err error
+	err = XTReadDB().Model(&drug).Where("drug_name = ? and dosage = ?  and max_unit = ? and unval = ? and min_unit=? and packing_unit = ? and status =1 and org_id = ?", drugname, dosage, maxunit, unival, minunit, packtunit, orgid).Find(&drug).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drug, nil
+}
+
 func CreateDrugsInfomation(info *models.BaseDrugLib) error {
 	err := XTWriteDB().Create(&info).Error
 	return err
@@ -2312,7 +2376,7 @@ func CreateDrugsInfomation(info *models.BaseDrugLib) error {
 
 func UpdateDrugsInformation(drug *models.BaseDrugLib, drugName string, drugSpec string, orgid int64) error {
 
-	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag}).Error
+	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag, "delivery_way": drug.DeliveryWay, "execution_frequency": drug.ExecutionFrequency, "dosage": drug.Dosage, "unval": drug.Unval, "packing_unit": drug.PackingUnit, "packing_price": drug.PackingPrice, "drug_day": drug.DrugDay}).Error
 	return err
 }
 
@@ -2511,3 +2575,21 @@ 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
+}
+
+func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib, err error) {
+
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1 ", orgid)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(drug_name LIKE ?)", likekey).Find(&drug).Error
+	} else {
+		err = db.Find(&drug).Error
+	}
+	return
+}

service/warhouse_service.go

@@ -0,0 +1,549 @@
+package service
+
+//
+//import (
+//	"XT_New/models"
+//	"XT_New/utils"
+//	"errors"
+//	"fmt"
+//	_ "fmt"
+//	"github.com/jinzhu/gorm"
+//	"math"
+//	"strconv"
+//	"strings"
+//	"time"
+//)
+//
+//// 药品出库
+//
+//func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
+//	// 1.判断药品是否来自专用字典的药品库
+//	// 2.判断当天当前机构有没有创建出库单，没有则创建
+//	// 3.创建出库流程
+//	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+//	isHasWay := false
+//	record_time := int64(0)
+//	if advice.Way == 1 {
+//		isHasWay = true
+//		record_time = advice.RecordDate
+//	}
+//	if isHasWay {
+//		//判断当天当前机构有没有创建出库单，没有则创建
+//		out, err := FindDrugStockOutByIsSys(orgID, 1, record_time)
+//		if err == gorm.ErrRecordNotFound {
+//			timeStr := time.Now().Format("2006-01-02")
+//			timeArr := strings.Split(timeStr, "-")
+//			total, _ := FindAllDrugWarehouseOut(orgID)
+//			total = total + 1
+//			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+//			number = number + total
+//			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+//			// creater := adminUserInfo.AdminUser.Id
+//			warehouseOut := models.DrugWarehouseOut{
+//				WarehouseOutOrderNumber: warehousing_out_order,
+//				OperationTime:           time.Now().Unix(),
+//				OrgId:                   orgID,
+//				Creater:                 0,
+//				Ctime:                   time.Now().Unix(),
+//				Status:                  1,
+//				WarehouseOutTime:        record_time,
+//				Dealer:                  0,
+//				Manufacturer:            0,
+//				Type:                    1,
+//				IsSys:                   1,
+//			}
+//			err := AddSigleDrugWarehouseOut(&warehouseOut)
+//			if err != nil {
+//				utils.TraceLog("创建出库单失败 err = %v", err)
+//				return err
+//			} else {
+//				out = warehouseOut
+//			}
+//		}
+//
+//		// 出库流程
+//		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+//		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
+//		if drup.ID > 0 {
+//			prescribingNumber := advice.PrescribingNumber
+//			DrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
+//		} else {
+//			return errors.New("药品信息不存在")
+//		}
+//
+//	}
+//
+//	return
+//}
+//
+//// 药品出库 递归方式
+//func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DoctorAdvice) (err error) {
+//	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+//	var deliver_number int64 = 0
+//	var stock_number int64 = 0
+//
+//	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
+//	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+//	if advice.PrescribingNumberUnit == drup.MaxUnit {
+//		deliver_number = count * drup.MinNumber
+//	} else {
+//		deliver_number = count
+//	}
+//
+//	// 根据先进先出原则，查询最先入库的批次，进行出库
+//	// 如果没有对应的库存，则报错
+//	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+//	fmt.Println("查询222222222222222222222222222222222222222222222222", err)
+//	if err != nil {
+//		return err
+//	}
+//
+//	// 将该批次的剩余库存数量转换为拆零数量
+//	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+//	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+//	if stock_number >= deliver_number {
+//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseout.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           advice.RecordDate,
+//			DrugId:                  advice.DrugId,
+//		}
+//		warehouseOutInfo.Count = deliver_number
+//		warehouseOutInfo.CountUnit = drup.MinUnit
+//		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			// prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+//			// count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+//			details := &models.DrugAutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               advice.PatientId,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              advice.RecordDate,
+//				OrgId:                   orgID,
+//				DrugId:                  advice.DrugId,
+//				Count:                   deliver_number,
+//				CountUnit:               drup.MinUnit,
+//			}
+//			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//		// 出库完成后，要减去对应批次的库存数量
+//		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
+//		var maxNumber int64 = 0
+//		var minNumber int64 = 0
+//		if advice.PrescribingNumberUnit == drup.MinUnit {
+//			maxNumber = count / drup.MinNumber
+//			minNumber = count % drup.MinNumber
+//		} else {
+//			maxNumber = count
+//		}
+//
+//		if warehouse.StockMaxNumber < maxNumber {
+//			return errors.New("库存数量不足")
+//		}
+//
+//		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+//		warehouse.Mtime = time.Now().Unix()
+//		if warehouse.StockMinNumber < minNumber {
+//			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+//			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+//		} else {
+//			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+//		}
+//
+//		if warehouse.StockMaxNumber < 0 {
+//			return errors.New("库存数量不足")
+//		}
+//		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//
+//		return nil
+//	} else {
+//		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseout.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           advice.RecordDate,
+//			DrugId:                  advice.DrugId,
+//		}
+//		// prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+//		// count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+//		warehouseOutInfo.Count = stock_number
+//		warehouseOutInfo.CountUnit = drup.MinUnit
+//
+//		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.DrugAutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               advice.PatientId,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              advice.RecordDate,
+//				OrgId:                   orgID,
+//				DrugId:                  advice.DrugId,
+//				Count:                   stock_number,
+//				CountUnit:               drup.MinUnit,
+//			}
+//			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//		// 出库完成后，要将该批次库存清零
+//		warehouse.StockMaxNumber = 0
+//		warehouse.StockMinNumber = 0
+//		warehouse.Mtime = time.Now().Unix()
+//		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+//		prescribingNumber_two_temp := deliver_number - stock_number
+//		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
+//		advice.PrescribingNumberUnit = drup.MinUnit
+//		DrugDeliverInfo(orgID, prescribingNumber, warehouseout, drup, advice)
+//	}
+//	return
+//}
+//
+//// 耗材出库
+//func ConsumablesDeliveryTotal(orgID int64,patient_id int64,record_time int64,goods []models.DialysisBeforePrepareGoods) (err error) {
+//	//查询该患者当天已经出库的耗材信息
+//	goods_yc,_ := FindConsumablesByDateTwo(orgID, patient_id, record_time)
+//	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
+//	for i := len(goods_yc) - 1; i >= 0; i--{
+//		goods_yc_temp := goods_yc[i]
+//		for j := len(goods) - 1; j >= 0; j-- {
+//			goods_temp := goods[j]
+//			// 已经出库和新请求出库都存在该耗材，则判断出库数量，分成是继续出库，还是删除出库
+//			if goods_yc_temp.GoodTypeId == goods_temp.GoodTypeId && goods_yc_temp.GoodId == goods_temp.GoodId{
+//				// 已经出库和新请求出库的出库数量一致，则清除两个结构体里的数据（既不出库，也不删除出库）
+//				if goods_yc_temp.Count == goods_temp.Count {
+//					goods_yc = append(goods_yc[:i],goods_yc[i+1:]...)
+//					goods = append(goods[:j],goods[j+1:]...)
+//				}
+//
+//				// 如果已经出库的数量 大于 新请求出库的数量，则代表需要删除出库
+//				if goods_yc_temp.Count > goods_temp.Count {
+//					temp_count := goods_yc_temp.Count - goods_temp.Count
+//					goods_yc[i].Count = temp_count
+//					goods = append(goods[:j],goods[j+1:]...)
+//				}
+//
+//				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
+//				if goods_yc_temp.Count < goods_temp.Count {
+//					temp_count := goods_temp.Count - goods_yc_temp.Count
+//					goods[j].Count = temp_count
+//					goods_yc = append(goods_yc[:i],goods_yc[i+1:]...)
+//				}
+//			}
+//		}
+//	}
+//
+//	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
+//	// goods 这个数据就是需要出库的耗材的数据
+//	if len(goods) > 0 {
+//		out, err := FindStockOutByIsSys(orgID, 1, record_time)
+//		if err == gorm.ErrRecordNotFound {
+//			//没有记录，则创建出库单
+//			timeStr := time.Now().Format("2006-01-02")
+//			timeArr := strings.Split(timeStr, "-")
+//			total, _ :=  FindAllWarehouseOut(orgID)
+//			total = total + 1
+//			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+//			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+//			number = number + total
+//			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+//			warehouseOut := models.WarehouseOut{
+//				WarehouseOutOrderNumber: warehousing_out_order,
+//				OperationTime:           time.Now().Unix(),
+//				OrgId:                   orgID,
+//				Creater:                 0,
+//				Ctime:                   time.Now().Unix(),
+//				Status:                  1,
+//				WarehouseOutTime:        record_time,
+//				Dealer:                  0,
+//				Manufacturer:            0,
+//				Type:                    1,
+//				IsSys:                   1,
+//			}
+//			err := AddSigleWarehouseOut(&warehouseOut)
+//			if err != nil {
+//				utils.TraceLog("创建出库单失败 err = %v", err)
+//				return err
+//			} else {
+//				out = warehouseOut
+//			}
+//		}
+//		for _,good := range goods {
+//			ConsumablesDelivery(orgID ,patient_id ,record_time ,good,out )
+//		}
+//	}
+//
+//	if len(goods_yc) > 0 {
+//		for _,good_yc := range goods_yc{
+//			ConsumablesDeliveryDelete(orgID ,patient_id ,record_time ,good_yc ,out )
+//		}
+//	}
+//
+//	return nil
+//}
+//
+//// 耗材出库
+//func ConsumablesDelivery(orgID int64,patient_id int64,record_time int64,goods models.DialysisBeforePrepareGoods,warehouseOut models.WarehouseOut) (err error) {
+//	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
+//	var deliver_number int64 = 0
+//	var stock_number int64 = 0
+//
+//	deliver_number = good.Count
+//
+//
+//	// 根据先进先出原则，查询最先入库的批次，进行出库
+//	// 如果没有对应的库存，则报错
+//	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId,goods.GoodTypeId)
+//	if err != nil {
+//		return err
+//	}
+//
+//	// 将该批次的剩余库存数量转换为拆零数量
+//	stock_number = warehouse.StockCount
+//	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+//	if stock_number >= deliver_number {
+//		warehouseOutInfo := &models.WarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseOut.ID,
+//			WarehouseInfoId:		 warehouse.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           record_time,
+//			GoodTypeId:              goods.GoodTypeId,
+//			GoodId:                  goods.GoodId,
+//			PatientId:				 patient_id,
+//		}
+//		warehouseOutInfo.Count = goods.Count
+//		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+//		warehouseOutInfo.Price = stockInInfo.Price
+//		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.AutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               patient_id,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              record_time,
+//				OrgId:                   orgID,
+//				GoodId:                  goods.GoodId,
+//				GoodTypeId:              goods.GoodTypeId,
+//				Count:                   goods.Count,
+//			}
+//			errTwo := service.AddSigleAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//
+//		// 出库完成后，要减去对应批次的库存数量
+//
+//		maxNumber = goods.Count
+//
+//
+//		if warehouse.StockMaxNumber < maxNumber {
+//			return errors.New("库存数量不足")
+//		}
+//
+//		warehouse.StockNumber = warehouse.StockMaxNumber - maxNumber
+//		warehouse.Mtime = time.Now().Unix()
+//
+//
+//		if warehouse.StockNumber < 0 {
+//			return errors.New("库存数量不足")
+//		}
+//		errThree := UpDateWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//
+//		return nil
+//	}  else {
+//		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+//		warehouseOutInfo := &models.WarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseOut.ID,
+//			WarehouseInfoId:		 warehouse.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   1,
+//			SysRecordTime:           record_time,
+//			GoodTypeId:              goods.GoodTypeId,
+//			GoodId:                  goods.GoodId,
+//			PatientId:				 patient_id,
+//		}
+//		warehouseOutInfo.Count = stock_number
+//		stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
+//		warehouseOutInfo.Price = stockInInfo.Price
+//		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.AutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               patient_id,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              record_time,
+//				OrgId:                   orgID,
+//				GoodId:                  goods.GoodId,
+//				GoodTypeId:              goods.GoodTypeId,
+//				Count:                   goods.Count,
+//			}
+//			errTwo := service.AddSigleAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//		// 出库完成后，要将该批次库存清零
+//		warehouse.StockNumber = 0
+//		warehouse.Mtime = time.Now().Unix()
+//		errThree := UpDateWarehouseInfoByStock(&warehouse)
+//		if errThree != nil {
+//			return errThree
+//		}
+//		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+//		goods.Count := deliver_number - stock_number
+//
+//		ConsumablesDelivery(orgID ,patient_id ,record_time ,good,out )
+//	}
+//	return nil
+//}
+//
+//// 耗材出库删除
+//func ConsumablesDeliveryDelete(orgID int64,patient_id int64,record_time int64,good_yc models.DialysisBeforePrepare,warehouseOut models.WarehouseOut) (err error) {
+//	// 先根据相关信息查询当天该耗材的出库信息
+//	warehouseOutInfos,err :=FindStockOutInfoByStock(orgID,good_yc.GoodTypeId,good_yc.GoodId,record_time,patient_id)
+//	if err != nil {
+//		return err
+//	}
+//
+//	var delete_count int64 = 0
+//
+//	for _ , ware := range warehouseOutInfos{
+//		// 判断当前出库的数据和删除出库数量
+//		if good_yc.Count <= ware.Count {
+//			delete_count = good_yc.Count
+//		} else {
+//			delete_count = ware.Count
+//		}
+//		// 在出库记录表里记录退库详情
+//		warehouseOutInfo := &models.WarehouseOutInfo{
+//			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+//			WarehouseOutId:          warehouseOut.ID,
+//			WarehouseInfoId:		 warehouse.ID,
+//			Status:                  1,
+//			Ctime:                   time.Now().Unix(),
+//			Remark:                  "",
+//			OrgId:                   orgID,
+//			Type:                    1,
+//			Manufacturer:            0,
+//			Dealer:                  0,
+//			IsSys:                   2,
+//			SysRecordTime:           record_time,
+//			GoodTypeId:              goods.GoodTypeId,
+//			GoodId:                  goods.GoodId,
+//			PatientId:				 patient_id,
+//		}
+//		warehouseOutInfo.Count = delete_count
+//		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+//		warehouseOutInfo.Price = stockInInfo.Price
+//		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+//		if errOne != nil {
+//			return errOne
+//		} else {
+//			details := &models.AutomaticReduceDetail{
+//				WarehouseOutId:          warehouseOutInfo.ID,
+//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+//				PatientId:               patient_id,
+//				Ctime:                   time.Now().Unix(),
+//				Mtime:                   time.Now().Unix(),
+//				Status:                  1,
+//				RecordTime:              record_time,
+//				OrgId:                   orgID,
+//				GoodId:                  goods.GoodId,
+//				GoodTypeId:              goods.GoodTypeId,
+//				Count:                   delete_count,
+//				Type:					 2,
+//			}
+//			errTwo := AddSigleAutoReduceRecordInfo(details)
+//			if errTwo != nil {
+//				return errTwo
+//			}
+//		}
+//
+//		// 删除出库完成后，要增加对应批次的库存数量
+//
+//
+//
+//		errThree := UpDateWarehouseInfoByStockDelete(ware.WarehouseInfoId,delete_count)
+//		if errThree != nil {
+//			return errThree
+//		}
+//
+//		// 增加了对应的库存后，看看还有多少需要退库的
+//		good_yc.Count = goods_yc.Count - delete_count
+//		if good_yc.Count == 0 {
+//			return nil
+//		}
+//	}
+//
+//	if good_yd.Count == 0 {
+//		return nil
+//	}  else {
+//		return errors.New("退库和出库数据不匹配")
+//	}
+//}