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

controllers/data_api_controller.go

@@ -61,7 +61,7 @@ func DataApiRegistRouters() {
 
 }
 
-//GetPatientsList 取配置信息列表
+// GetPatientsList 取配置信息列表
 func (c *DataApiController) GetConfigList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	configList, _ := service.GetConfigList(adminUserInfo.CurrentOrgId)
@@ -72,7 +72,7 @@ func (c *DataApiController) GetConfigList() {
 
 }
 
-//CreateConfig  创建配置信息
+// CreateConfig  创建配置信息
 func (c *DataApiController) CreateConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -318,7 +318,7 @@ func (c *DataApiController) DeleteChildConfig() {
 	return
 }
 
-//CreateChildConfig  创建子配置信息
+// CreateChildConfig  创建子配置信息
 func (c *DataApiController) CreateChildConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/dialysis_api_controller.go

@@ -109,6 +109,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/schedule/excutiondoctoradvicebyid", &DialysisApiController{}, "Get:ExcutionDoctorAdviceById")
 
 	beego.Router("/api/patient/getdialysisadvicetoday", &DialysisApiController{}, "Get:GetDialysisAdviceToday")
+
+	beego.Router("/api/schedule/getmobileschedulelist", &DialysisApiController{}, "Get:GetMobileScheduleList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -324,6 +326,11 @@ func (c *DialysisApiController) PostPrescription() {
 	add_amount, _ := c.GetFloat("add_amount")
 	reduce_amount, _ := c.GetFloat("reduce_amount")
 	dialysis_remark := c.GetString("dialysis_remark")
+	prescribing_number, _ := c.GetFloat("prescribing_number")
+	treatment_remark := c.GetString("treatment_remark")
+	prescription_sodium := c.GetString("prescription_sodium")
+	start_sodium := c.GetString("start_sodium")
+	sodium_curve := c.GetString("sodium_curve")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -432,6 +439,119 @@ func (c *DialysisApiController) PostPrescription() {
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
 		DialysisRemark:             dialysis_remark,
+		PrescribingNumber:          prescribing_number,
+		TreatmentRemark:            treatment_remark,
+		PrescriptionSodium:         prescription_sodium,
+		StartSodium:                start_sodium,
+		SodiumCurve:                sodium_curve,
+	}
+
+	//长沙南雅医院，自动生成抗凝剂的临时处方
+	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
+		advice := models.DoctorAdvice{
+			UserOrgId:             adminUserInfo.CurrentOrgId,
+			PatientId:             patient,
+			GroupNo:               0,
+			AdviceType:            2,
+			RecordDate:            recordDate.Unix(),
+			AdviceDate:            recordDate.Unix(),
+			StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
+			AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+			AdviceDesc:            "",
+			ReminderDate:          0,
+			SingleDose:            5000,
+			SingleDoseUnit:        "iu",
+			DrugSpec:              0,
+			DrugSpecUnit:          "",
+			PrescribingNumber:     prescribing_number, // 前端传过来的开药数量
+			PrescribingNumberUnit: "支",
+			DeliveryWay:           "静脉注射",
+			ExecutionFrequency:    "上机前",
+			AdviceDoctor:          0,
+			Status:                1,
+			CreatedTime:           time.Now().Unix(),
+			UpdatedTime:           time.Now().Unix(),
+			IsPrescription:        1,
+		}
+		// 查询排班信息
+		schedulePatient, _ := service.GetScheduleByPatient(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+		if schedulePatient.ID > 0 {
+			if schedulePatient.ScheduleType == 1 {
+				advice.StartTime = recordDate.Unix() + 7*60*60
+			}
+
+			if schedulePatient.ScheduleType == 2 {
+				advice.StartTime = recordDate.Unix() + 11*60*60
+			}
+		}
+		// 抗凝剂名称
+		switch anticoagulant {
+		case 1:
+			advice.AdviceName = "无肝素"
+			break
+		case 2:
+			advice.AdviceName = "普通肝素"
+			break
+		case 3:
+			advice.AdviceName = "低分子肝素"
+			break
+		case 4:
+			advice.AdviceName = "阿加曲班"
+			break
+		case 5:
+			advice.AdviceName = "枸橼酸钠"
+			break
+		case 6:
+			advice.AdviceName = "低分子肝素钙"
+			break
+		case 7:
+			advice.AdviceName = "低分子肝素钠"
+			break
+		case 8:
+			advice.AdviceName = "依诺肝素"
+			break
+		case 9:
+			advice.AdviceName = "达肝素"
+			break
+		case 10:
+			advice.AdviceName = "体外抗凝"
+			break
+		case 11:
+			advice.AdviceName = "那曲肝素"
+			break
+		case 12:
+			advice.AdviceName = "无抗凝剂"
+			break
+		}
+		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			advice.AdviceDoctor = appRole.AdminUserId
+		}
+
+		// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+		advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+		if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7) {
+			advice.AdviceName = "低分子肝素钠注射液"
+			// 修改患者临时医嘱里的抗凝剂医嘱
+			advice.ID = advicePrescription.ID
+			service.UpdateDoctorAdvice(&advice)
+		} else {
+			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
+				advice.AdviceName = "低分子肝素钠注射液"
+				// 新增患者临时医嘱里的抗凝剂医嘱
+				service.CreateDoctorAdvice(&advice)
+			}
+
+		}
+
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -536,6 +656,23 @@ func (c *DialysisApiController) PostPrescription() {
 
 		updateErr := service.UpDateDialysisPrescription(&prescription)
 
+		//修改处方
+		if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
+			// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+			if advicePrescription.ID > 0 {
+
+				service.UpdateDoctorAdvieById(advicePrescription.ID, prescribing_number)
+
+				key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				defer redis.Close()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":advice_list_all"
+				redis.Set(keyOne, "", time.Second)
+			}
+		}
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
 		defer redis.Close()
@@ -680,6 +817,11 @@ func (c *DialysisApiController) PostSoulution() {
 	add_amount, _ := c.GetFloat("add_amount")
 	reduce_amount, _ := c.GetFloat("reduce_amount")
 	dialysis_remark := c.GetString("dialysis_remark")
+	prescribing_number, _ := c.GetFloat("prescribing_number")
+	treatment_remark := c.GetString("treatment_remark")
+	prescription_sodium := c.GetString("prescription_sodium")
+	start_sodium := c.GetString("start_sodium")
+	sodium_curve := c.GetString("sodium_curve")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -808,6 +950,11 @@ func (c *DialysisApiController) PostSoulution() {
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
 		DialysisRemark:             dialysis_remark,
+		PrescribingNumber:          prescribing_number,
+		StartSodium:                start_sodium,
+		PrescriptionSodium:         prescription_sodium,
+		SodiumCurve:                sodium_curve,
+		TreatmentRemark:            treatment_remark,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -979,6 +1126,11 @@ func (c *DialysisApiController) PostSoulution() {
 		PreImpulse:                 preImpules,
 		SolutionStatus:             1,
 		DialysisRemark:             dialysis_remark,
+		PrescribingNumber:          prescribing_number,
+		StartSodium:                start_sodium,
+		PrescriptionSodium:         prescription_sodium,
+		SodiumCurve:                sodium_curve,
+		TreatmentRemark:            treatment_remark,
 	}
 
 	//针对河间咸得
@@ -1008,6 +1160,114 @@ func (c *DialysisApiController) PostSoulution() {
 	//更新状态
 	service.UpdateDialysisSolutionStatusTwo(dialysisSolution.ID, dialysisSolution.ModeId, dialysisSolution.UserOrgId, dialysisSolution.PatientId)
 
+	//长沙南雅医院，自动生成抗凝剂的临时处方
+	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
+		advice := models.DoctorAdvice{
+			UserOrgId:             adminUserInfo.CurrentOrgId,
+			PatientId:             patient,
+			GroupNo:               0,
+			AdviceType:            2,
+			RecordDate:            recordDate.Unix(),
+			AdviceDate:            recordDate.Unix(),
+			StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
+			AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+			AdviceDesc:            "",
+			ReminderDate:          0,
+			SingleDose:            5000,
+			SingleDoseUnit:        "iu",
+			DrugSpec:              0,
+			DrugSpecUnit:          "",
+			PrescribingNumber:     prescribing_number, // 前端传过来的开药数量
+			PrescribingNumberUnit: "支",
+			DeliveryWay:           "静脉注射",
+			ExecutionFrequency:    "上机前",
+			AdviceDoctor:          0,
+			Status:                1,
+			CreatedTime:           time.Now().Unix(),
+			UpdatedTime:           time.Now().Unix(),
+			IsPrescription:        1,
+		}
+		// 查询排班信息
+		schedulePatient, _ := service.GetScheduleByPatient(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+		if schedulePatient.ID > 0 {
+			if schedulePatient.ScheduleType == 1 {
+				advice.StartTime = recordDate.Unix() + 7*60*60
+			}
+
+			if schedulePatient.ScheduleType == 2 {
+				advice.StartTime = recordDate.Unix() + 11*60*60
+			}
+		}
+		// 抗凝剂名称
+		switch anticoagulant {
+		case 1:
+			advice.AdviceName = "无肝素"
+			break
+		case 2:
+			advice.AdviceName = "普通肝素"
+			break
+		case 3:
+			advice.AdviceName = "低分子肝素"
+			break
+		case 4:
+			advice.AdviceName = "阿加曲班"
+			break
+		case 5:
+			advice.AdviceName = "枸橼酸钠"
+			break
+		case 6:
+			advice.AdviceName = "低分子肝素钙"
+			break
+		case 7:
+			advice.AdviceName = "低分子肝素钠"
+			break
+		case 8:
+			advice.AdviceName = "依诺肝素"
+			break
+		case 9:
+			advice.AdviceName = "达肝素"
+			break
+		case 10:
+			advice.AdviceName = "体外抗凝"
+			break
+		case 11:
+			advice.AdviceName = "那曲肝素"
+			break
+		case 12:
+			advice.AdviceName = "无抗凝剂"
+			break
+		}
+		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			advice.AdviceDoctor = appRole.AdminUserId
+		}
+
+		// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+		advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+
+		if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7) {
+			advice.AdviceName = "低分子肝素钠注射液"
+			// 修改患者临时医嘱里的抗凝剂医嘱
+			advice.ID = advicePrescription.ID
+			service.UpdateDoctorAdvice(&advice)
+		} else {
+			// 新增患者临时医嘱里的抗凝剂医嘱
+			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
+				advice.AdviceName = "低分子肝素钠注射液"
+				service.CreateDoctorAdvice(&advice)
+			}
+
+		}
+
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+	}
+
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
 	redis := service.RedisClient()
 
@@ -3120,7 +3380,6 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 }
 
-//
 func (c *DialysisApiController) GetLongAdvice() {
 	patient_id, _ := c.GetInt64("patient_id")
 	adminUserInfo := c.GetAdminUserInfo()
@@ -3862,7 +4121,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			}
 
 			//长沙南雅
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4349,7 +4608,7 @@ func (c *DialysisApiController) GetInitPrintDataOne() {
 	}
 }
 
-//新接口
+// 新接口
 func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 
 	keyword := this.GetString("keywords")
@@ -5505,11 +5764,14 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 
 	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
 	_, config := service.FindXTHisRecordByOrgId(orgId)
+	appId := this.GetAdminUserInfo().CurrentAppId
+	doctorList, _ := service.GetAllAdminUsers(orgId, appId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":   list,
-			"drug":   drug,
-			"config": config,
+			"list":       list,
+			"drug":       drug,
+			"config":     config,
+			"doctorList": doctorList,
 		})
 		return
 
@@ -5518,3 +5780,26 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 		return
 	}
 }
+
+func (this *DialysisApiController) GetMobileScheduleList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	schedule, _ := service.GetMobileScheduleList(orgId)
+
+	if len(schedule) > 0 {
+		for _, its := range schedule {
+			prescription, _ := service.GetPrescriptionList(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			its.DialysisPrescription = prescription
+			monitor, _ := service.GetLastMonitorRecordList(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			its.MonitoringRecord = monitor
+			after, _ := service.GetLastAfter(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			its.XtAssessmentAfterDislysis = after
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+	return
+
+}

controllers/dialysis_record_api_controller.go

@@ -805,6 +805,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	nuclein_date := this.GetString("nuclein_date")
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
+	catheter_operation := this.GetString("catheter_operation")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1020,6 +1021,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		NucleinDate:            theNucleinDate,
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
+		CatheterOperation:      catheter_operation,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -1181,6 +1183,12 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				record.BreathingRate = "20"
 			}
 
+			//针对蓬安济民
+			if adminUserInfo.CurrentOrgId == 9829 {
+				record.Temperature = 36.5
+				record.PulseFrequency = 80
+			}
+
 			//针对兰溪人民医院的需求
 			if adminUserInfo.CurrentOrgId == 10432 {
 				befor, _ := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
@@ -1375,6 +1383,12 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		if adminUserInfo.CurrentOrgId == 10447 || adminUserInfo.CurrentOrgId == 9675 {
 			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		}
+
+		//针对蓬安
+		if adminUserInfo.CurrentOrgId == 9829 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		}
 	}
 
 	if adminUserInfo.CurrentOrgId == 9583 {
@@ -1458,7 +1472,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
-	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 {
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 9829 {
 
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
@@ -1592,6 +1606,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	nuclein_date := this.GetString("nuclein_date")
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
+	catheter_operation := this.GetString("catheter_operation")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1757,6 +1772,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		NucleinDate:            theNucleinDate,
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
+		CatheterOperation:      catheter_operation,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/his_api_controller.go

@@ -2382,8 +2382,7 @@ func (c *HisApiController) CreateHisPrescription() {
 						for _, item := range flowGood {
 							out_count += item.Count
 						}
-						fmt.Println("wenqiang---------------------------", out_count)
-						fmt.Println("xiama---------------------------", parseIntCount)
+
 						//如果历史数和当前数据不想等才进行退库出库
 						if out_count != parseIntCount {
 							service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}
@@ -379,7 +379,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.Status = 1
-			newprescribe.Remark = dialysisSolution.Remark
+			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 {
+				newprescribe.Remark = dialysisSolution.Remark
+			}
+
 			if adminUserInfo.Org.Id == 10340 {
 				newprescribe.TargetUltrafiltration = 0
 				newprescribe.Sodium = 138
@@ -677,6 +680,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10445 {
 					evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
 				}
+
+				if adminUserInfo.Org.Id == 9829 {
+					evaluation.PulseFrequency = 80
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()
@@ -751,6 +758,12 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			afterevaluation.ActualDisplacement = prescribe.DisplaceLiquiValue
 		}
 
+		//蓬安济民
+
+		if adminUserInfo.Org.Id == 9829 {
+			afterevaluation.PulseFrequency = 80
+		}
+
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1,23 +1,22 @@
 package mobile_api_controllers
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/jinzhu/gorm"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"math"
 	"net/http"
 	"net/url"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
 )
 
 // type DialysisTestAPIController struct {
@@ -87,10 +86,9 @@ func (this *DialysisAPIController) Scheduals() {
 	defer redis.Close()
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-
+	redis.Set(key, "", time.Second)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
-	redis.Set(key, "", time.Second)
 	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
@@ -840,6 +838,30 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.Modifier = modifier
 
 		err := service.AddSigleDoubleCheck(&doubleCheck)
+
+		//针对长沙南雅
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			//查询未核对的医嘱
+			doctorList, _ := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			if len(doctorList) > 0 && modifier > 0 {
+				for _, advice := range doctorList {
+					service.UpdateDoctorAdviceList(advice.ID, modifier)
+					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+					redis := service.RedisClient()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+					theTime := time.Now()
+					recordDate := theTime.Format("2006-01-02")
+					keyFour := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+					redis.Set(keyFour, "", time.Second)
+					defer redis.Close()
+				}
+			}
+
+		}
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
 
@@ -1389,6 +1411,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	is_water := c.GetString("is_water")
+
 	var is_war int64
 	if is_water == "是" {
 		is_war = 1
@@ -1407,6 +1430,13 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	add_amount, _ := c.GetFloat("add_amount")
 	reduce_amount, _ := c.GetFloat("reduce_amount")
 	dialysis_remark := c.GetString("dialysis_remark")
+
+	prescribing_number, _ := c.GetFloat("prescribing_number")
+	prescription_sodium := c.GetString("prescription_sodium")
+	start_sodium := c.GetString("start_sodium")
+	sodium_curve := c.GetString("sodium_curve")
+	treatment_remark := c.GetString("treatment_remark")
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1532,6 +1562,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
 		DialysisRemark:             dialysis_remark,
+		PrescribingNumber:          prescribing_number,
+		StartSodium:                start_sodium,
+		SodiumCurve:                sodium_curve,
+		TreatmentRemark:            treatment_remark,
+		PrescriptionSodium:         prescription_sodium,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1620,6 +1655,116 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		err := service.AddSigleRecord(&prescription)
 
+		//长沙南雅医院，自动生成抗凝剂的临时处方
+		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
+
+			advice := models.DoctorAdvice{
+				UserOrgId:             adminUserInfo.Org.Id,
+				PatientId:             id,
+				GroupNo:               0,
+				AdviceType:            2,
+				RecordDate:            recordDate.Unix(),
+				AdviceDate:            recordDate.Unix(),
+				StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
+				AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+				AdviceDesc:            "",
+				ReminderDate:          0,
+				SingleDose:            5000,
+				SingleDoseUnit:        "iu",
+				DrugSpec:              0,
+				DrugSpecUnit:          "",
+				PrescribingNumber:     prescribing_number, // 前端传过来的开药数量
+				PrescribingNumberUnit: "支",
+				DeliveryWay:           "静脉注射",
+				ExecutionFrequency:    "上机前",
+				AdviceDoctor:          0,
+				Status:                1,
+				CreatedTime:           time.Now().Unix(),
+				UpdatedTime:           time.Now().Unix(),
+				IsPrescription:        1,
+			}
+			// 查询排班信息
+			schedulePatient, _ := service.GetScheduleByPatient(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			if schedulePatient.ID > 0 {
+				if schedulePatient.ScheduleType == 1 {
+					advice.StartTime = recordDate.Unix() + 7*60*60
+				}
+
+				if schedulePatient.ScheduleType == 2 {
+					advice.StartTime = recordDate.Unix() + 11*60*60
+				}
+			}
+			// 抗凝剂名称
+			switch anticoagulant {
+			case 1:
+				advice.AdviceName = "无肝素"
+				break
+			case 2:
+				advice.AdviceName = "普通肝素"
+				break
+			case 3:
+				advice.AdviceName = "低分子肝素"
+				break
+			case 4:
+				advice.AdviceName = "阿加曲班"
+				break
+			case 5:
+				advice.AdviceName = "枸橼酸钠"
+				break
+			case 6:
+				advice.AdviceName = "低分子肝素钙"
+				break
+			case 7:
+				advice.AdviceName = "低分子肝素钠"
+				break
+			case 8:
+				advice.AdviceName = "依诺肝素"
+				break
+			case 9:
+				advice.AdviceName = "达肝素"
+				break
+			case 10:
+				advice.AdviceName = "体外抗凝"
+				break
+			case 11:
+				advice.AdviceName = "那曲肝素"
+				break
+			case 12:
+				advice.AdviceName = "无抗凝剂"
+				break
+			}
+			//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+
+			if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 4 {
+				advice.AdviceDoctor = appRole.AdminUserId
+			}
+
+			// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
+			if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7) {
+				advice.AdviceName = "低分子肝素钠注射液"
+				// 修改患者临时医嘱里的抗凝剂医嘱
+				advice.ID = advicePrescription.ID
+				service.UpdateDoctorAdvice(&advice)
+			} else {
+				if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
+					advice.AdviceName = "低分子肝素钠注射液"
+					// 新增患者临时医嘱里的抗凝剂医嘱
+					service.CreateDoctorAdvice(&advice)
+				}
+
+			}
+
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			defer redis.Close()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":advice_list_all"
+			redis.Set(keyOne, "", time.Second)
+
+		}
+
 		//获取key,清空redis
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
@@ -1710,6 +1855,25 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		prescription.ID = dialysisPrescription.ID
 
 		err := service.UpDateDialysisPrescription(&prescription)
+
+		//修改处方
+		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
+			// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
+			if advicePrescription.ID > 0 {
+
+				service.UpdateDoctorAdvieById(advicePrescription.ID, prescribing_number)
+
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
+				redis := service.RedisClient()
+				defer redis.Close()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":advice_list_all"
+				redis.Set(keyOne, "", time.Second)
+			}
+		}
+
 		//获取key,清空redis
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
@@ -1898,7 +2062,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1995,6 +2159,16 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 	}
 
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 9829 {
+		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+	}
+
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10432 {
+		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+	}
+
 	if lastAssessmentAfterDislysis != nil {
 		tempassessmentAfterDislysis.BloodPressureType = lastAssessmentAfterDislysis.BloodPressureType
 
@@ -2081,6 +2255,7 @@ func (c *DialysisAPIController) Finish() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderNoEND)
 		return
 	}
+
 	if dialysisOrder.Stage == 1 {
 		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
 
@@ -2095,6 +2270,80 @@ func (c *DialysisAPIController) Finish() {
 		//结束时候透析次数加1
 		service.UpdateSolutionByPatientId(id)
 
+		//下机完自动消毒,针对长沙南雅
+		if dialysisOrder.Stage == 1 {
+			if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+				//根据床位号获取设备型号
+				unitType, _ := service.GetUnitType(dialysisOrder.BedID, dialysisOrder.UserOrgId)
+				//查询使用消毒最后一条消毒记录
+				_, err := service.GetLaseDeviceInfomation(dialysisOrder.UserOrgId, dialysisOrder.BedID, dialysisOrder.DialysisDate, dialysisOrder.SchedualType)
+				fmt.Println("err", err)
+				if err == gorm.ErrRecordNotFound {
+					//查找排班
+					scheduleByPatient, _ := service.GetScheduleByPatient(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
+					//查询改设备是否有消毒计划
+					plan, errcode := service.GetDisInfectionTime(dialysisOrder.UserOrgId, unitType.UnitType, dialysisOrder.SchedualType, scheduleByPatient.ScheduleWeek)
+
+					//根据床位号获取设备id
+					addmacher, _ := service.GetEquimentIDTwo(dialysisOrder.BedID, dialysisOrder.UserOrgId)
+
+					//查询病人信息
+					patients, _ := service.GetPatientInfoMation(dialysisOrder.PatientId)
+					var con = ""
+					if patients.IsInfectious == 0 {
+						con = ""
+					}
+					if patients.IsInfectious == 1 {
+						con = "无"
+					}
+					if patients.IsInfectious == 2 {
+						con = "有"
+					}
+
+					if errcode == nil {
+						var end_time int64
+						end_time = endDate.Unix() + plan.DisinfecTime*60
+						//新增消毒
+						information := models.DeviceInformation{
+							Date:                  dialysisOrder.DialysisDate,
+							Zone:                  dialysisOrder.ZoneId,
+							Class:                 dialysisOrder.SchedualType,
+							BedNumber:             dialysisOrder.BedID,
+							PatientId:             dialysisOrder.PatientId,
+							DialysisMode:          scheduleByPatient.ModeId,
+							LongTime:              strconv.FormatInt(plan.DisinfecTime, 10),
+							Disinfection:          1,
+							DialysisConcentration: 1,
+							DisinfectionStatus:    1,
+							Move:                  1,
+							UserOrgId:             dialysisOrder.UserOrgId,
+							DisinfectType:         plan.Way,
+							DisinfectantType:      plan.MachineDisinfectant,
+							FluidPath:             plan.DisinfectanWay, //液路消毒方式
+							Disinfectant:          plan.Disinfectant,
+							Ctime:                 time.Now().Unix(),
+							Status:                1,
+							SignName:              nurseID,
+							EquimentId:            addmacher.ID,
+							DisinfectionResidue:   2,
+							Bed:                   addmacher.BedNumber,
+							StartTime:             dialysisOrder.StartTime,
+							EndTime:               dialysisOrder.EndTime,
+							Contagion:             con,
+							WeightLoss:            0,
+							Hyperfiltratio:        0,
+							DialysisHour:          "",
+							MachineRun:            1,
+							DisinfecStartime:      endDate.Unix(),
+							DisinfecEndtime:       end_time,
+						}
+						err := service.CreateInformationTwo(&information)
+						fmt.Println("报错", err)
+					}
+				}
+			}
+		}
+
 		dialysisOrder.Stage = 2
 		dialysisOrder.FinishNurse = nurseID
 		dialysisOrder.FinishCreator = adminUserInfo.AdminUser.Id
@@ -2121,6 +2370,7 @@ func (c *DialysisAPIController) Finish() {
 		}
 
 	}
+
 }
 
 func (c *DialysisAPIController) GetAllZone() {
@@ -2183,6 +2433,8 @@ func (this *DialysisAPIController) StartDialysis() {
 	nuclein_date_str := this.GetString("nuclein_date_str")
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
+	catheter_operation := this.GetString("catheter_operation")
+
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2384,6 +2636,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		NucleinDate:            theNucleinDate,
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
+		CatheterOperation:      catheter_operation,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -2507,7 +2760,6 @@ func (this *DialysisAPIController) StartDialysis() {
 		if errcode == nil {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
-
 			record.BreathingRate = befor.BreathingRate
 			record.PulseFrequency = befor.PulseFrequency
 			record.Temperature = befor.Temperature
@@ -2516,7 +2768,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	// 如果当天有插入数据，则不再往透析纪录里插入数据
 	if newdialysisRecord.ID > 0 {
-		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9675 {
+		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 {
 			record.Temperature = 36.5
 			record.ArterialPressure = -100
 			record.DialysateTemperature = 36.5
@@ -2524,6 +2776,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.BreathingRate = "20"
 			record.VenousPressure = 80
 			record.TransmembranePressure = 60
+			record.Dispose = catheter_operation
 		}
 		//针对新化博翔
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10447 {
@@ -2548,6 +2801,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
 			record.BreathingRate = befor.BreathingRate
 		}
+
+		if adminUserInfo.Org.Id == 9829 {
+			record.PulseFrequency = 80
+			record.Temperature = 36.5
+		}
 		err := service.CreateMonitor(&record)
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
@@ -2699,6 +2957,12 @@ func (c *DialysisAPIController) PostSolution() {
 	is_water := c.GetString("is_water")
 	add_amount, _ := c.GetFloat("add_amount")
 	reduce_amount, _ := c.GetFloat("reduce_amount")
+
+	prescribing_number, _ := c.GetFloat("prescribing_number")
+	treatment_remark := c.GetString("treatment_remark")
+	prescription_sodium := c.GetString("prescription_sodium")
+	start_sodium := c.GetString("start_sodium")
+	sodium_curve := c.GetString("sodium_curve")
 	var is_war int64
 	if is_water == "是" {
 		is_war = 1
@@ -2836,6 +3100,11 @@ func (c *DialysisAPIController) PostSolution() {
 		AddAmount:                  add_amount,
 		ReduceAmount:               reduce_amount,
 		DialysisRemark:             dialysis_remark,
+		PrescribingNumber:          prescribing_number,
+		PrescriptionSodium:         prescription_sodium,
+		StartSodium:                start_sodium,
+		SodiumCurve:                sodium_curve,
+		TreatmentRemark:            treatment_remark,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2935,6 +3204,11 @@ func (c *DialysisAPIController) PostSolution() {
 		PreImpulse:                 impulse,
 		SolutionStatus:             1,
 		DialysisRemark:             dialysis_remark,
+		PrescribingNumber:          prescribing_number,
+		PrescriptionSodium:         prescription_sodium,
+		StartSodium:                start_sodium,
+		SodiumCurve:                sodium_curve,
+		TreatmentRemark:            treatment_remark,
 	}
 
 	//针对河间咸的
@@ -2957,6 +3231,115 @@ func (c *DialysisAPIController) PostSolution() {
 	//更新状态
 	service.UpdateDialysisSolutionStatusTwo(dialysisSolution.ID, dialysisSolution.ModeId, dialysisSolution.UserOrgId, dialysisSolution.PatientId)
 
+	//长沙南雅医院，自动生成抗凝剂的临时处方
+	if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
+		advice := models.DoctorAdvice{
+			UserOrgId:             adminUserInfo.Org.Id,
+			PatientId:             id,
+			GroupNo:               0,
+			AdviceType:            2,
+			RecordDate:            recordDate.Unix(),
+			AdviceDate:            recordDate.Unix(),
+			StartTime:             recordDate.Unix() + 7*60*60, // 根据排班班次，给默认时间
+			AdviceName:            "",                          // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
+			AdviceDesc:            "",
+			ReminderDate:          0,
+			SingleDose:            5000,
+			SingleDoseUnit:        "iu",
+			DrugSpec:              0,
+			DrugSpecUnit:          "",
+			PrescribingNumber:     prescribing_number, // 前端传过来的开药数量
+			PrescribingNumberUnit: "支",
+			DeliveryWay:           "静脉注射",
+			ExecutionFrequency:    "上机前",
+			AdviceDoctor:          0,
+			Status:                1,
+			CreatedTime:           time.Now().Unix(),
+			UpdatedTime:           time.Now().Unix(),
+			IsPrescription:        1,
+		}
+		// 查询排班信息
+		schedulePatient, _ := service.GetScheduleByPatient(id, recordDate.Unix(), adminUserInfo.Org.Id)
+		if schedulePatient.ID > 0 {
+			if schedulePatient.ScheduleType == 1 {
+				advice.StartTime = recordDate.Unix() + 7*60*60
+			}
+
+			if schedulePatient.ScheduleType == 2 {
+				advice.StartTime = recordDate.Unix() + 11*60*60
+			}
+		}
+		// 抗凝剂名称
+		switch anticoagulant {
+		case 1:
+			advice.AdviceName = "无肝素"
+			break
+		case 2:
+			advice.AdviceName = "普通肝素"
+			break
+		case 3:
+			advice.AdviceName = "低分子肝素"
+			break
+		case 4:
+			advice.AdviceName = "阿加曲班"
+			break
+		case 5:
+			advice.AdviceName = "枸橼酸钠"
+			break
+		case 6:
+			advice.AdviceName = "低分子肝素钙"
+			break
+		case 7:
+			advice.AdviceName = "低分子肝素钠"
+			break
+		case 8:
+			advice.AdviceName = "依诺肝素"
+			break
+		case 9:
+			advice.AdviceName = "达肝素"
+			break
+		case 10:
+			advice.AdviceName = "体外抗凝"
+			break
+		case 11:
+			advice.AdviceName = "那曲肝素"
+			break
+		case 12:
+			advice.AdviceName = "无抗凝剂"
+			break
+		}
+		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+		if appRole.UserType == 2 || appRole.UserType == 1 || appRole.UserType == 4 {
+			advice.AdviceDoctor = appRole.AdminUserId
+		}
+
+		// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+		advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
+
+		if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7) {
+
+			advice.AdviceName = "低分子肝素钠注射液"
+			// 修改患者临时医嘱里的抗凝剂医嘱
+			advice.ID = advicePrescription.ID
+			service.UpdateDoctorAdvice(&advice)
+		} else {
+			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
+				advice.AdviceName = "低分子肝素钠注射液"
+				service.CreateDoctorAdvice(&advice)
+			}
+
+		}
+
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
+		redis := service.RedisClient()
+		defer redis.Close()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+	}
+
 	//获取key,清空redis
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 	redis := service.RedisClient()
@@ -3164,7 +3547,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -3203,6 +3586,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 
 	}
+	//长沙南雅累计血容量自动计算
+	if adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 9671 {
+		record.AccumulatedBloodVolume = (record.BloodFlowVolume - 25) * (math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * 60) / 1000
+	}
 
 	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
@@ -3236,6 +3623,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	nuclein_date_str := this.GetString("nuclein_date_str")
 	order_remark := this.GetString("order_remark")
 	schedule_remark := this.GetString("schedule_remark")
+	catheter_operation := this.GetString("catheter_operation")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3400,13 +3788,12 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		NucleinDate:            theNucleinDate,
 		OrderRemark:            order_remark,
 		ScheduleRemark:         schedule_remark,
+		CatheterOperation:      catheter_operation,
 	}
 
+	//修改床位号需要重新消毒
 	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10445 {
-
-		if tempDialysisRecord.BedID != bedID {
-			service.UpdateDeviceInformation(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
-		}
+		service.UpdateDeviceInformation(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate)
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
@@ -4790,6 +5177,10 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				for _, item := range consumables {
 					//出库
 					err := service.ConsumablesGoodDelivery(item.UserOrgId, patient_id, record_time, item, &warehouseOut, item.Count)
+
+					//err := service.ConsumableMobileDelivery(item.UserOrgId, patient_id, record_time, item, &warehouseOut, adminInfo.AdminUser.Id, item.Count)
+					//fmt.Println("item----------------------------------count", item.Count)
+
 					if err == nil {
 						goodErrcode := models.XtGoodErrcode{
 							UserOrgId:      adminInfo.Org.Id,
@@ -4940,6 +5331,8 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 			for _, item := range consumables {
 				//出库
 				err := service.ConsumablesGoodDelivery(item.UserOrgId, patient_id, record_time, item, &out, item.Count)
+				//err := service.ConsumableMobileDelivery(item.UserOrgId, patient_id, record_time, item, &out, adminInfo.AdminUser.Id, item.Count)
+				//fmt.Println("item----------------------------------count", item.Count)
 				if err != nil {
 					goodErrcode := models.XtGoodErrcode{
 						UserOrgId:      adminInfo.Org.Id,
@@ -5213,6 +5606,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 				fmt.Println("退库长度", len(cancelbefor))
 				fmt.Println("出库长度", len(outbefor))
+
 				//退库
 				for _, item := range cancelbefor {
 					warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
@@ -5258,7 +5652,6 @@ func (c *DialysisAPIController) EditConsumables() {
 					warehouseOutInfo.LicenseNumber = stockInInfo.LicenseNumber
 					warehouseOutInfo.WarehouseInfotId = stockInInfo.ID
 					//查找当天是否存在出库记录
-
 					_, errcod := service.GetWarehouseOutInfoIsExistOne(item.GoodId, patient_id, record_time, 0)
 
 					if errcod == gorm.ErrRecordNotFound {
@@ -5358,6 +5751,7 @@ func (c *DialysisAPIController) EditConsumables() {
 							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						exsit, errflows := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
+
 						if errflows == gorm.ErrRecordNotFound {
 							//创建流水表
 							service.CreateStockFlowOne(stockFlow)
@@ -5478,8 +5872,6 @@ func (c *DialysisAPIController) EditConsumables() {
 
 					}
 
-					//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
-
 					//查询该耗材的总库存
 					wareinfo, _ := service.GetStockGoodCount(item.GoodId)
 					// 如果库存差大于剩余库存则提示库存不足
@@ -7774,3 +8166,33 @@ func (this *DialysisAPIController) CheckSchedule() {
 	}
 
 }
+
+func (this *DialysisAPIController) GetNewDoctorListToday() {
+
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type, _ := this.GetInt64("partion_type")
+
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
+	_, config := service.FindXTHisRecordByOrgId(orgId)
+	appId := this.GetMobileAdminUserInfo().App.Id
+	doctorList, _ := service.GetAllAdminUsers(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":       list,
+			"config":     config,
+			"doctorList": doctorList,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -188,4 +188,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/settlemobileadvice", &DialysisAPIController{}, "Get:GetSettleMobileAdvice")
 
 	beego.Router("/m/api/checkmobileadvice", &DialysisAPIController{}, "Get:GetCheckMobileAdvice")
+
+	beego.Router("/m/api/getnewdoctorlisttoday", &DialysisAPIController{}, "Get:GetNewDoctorListToday")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3193,13 +3193,13 @@ func (c *PatientApiController) GetPatientMonitor() {
 			//获取所有分区
 			zoneList, _ := service.GetAllZoneByList(orgID)
 			//获取透析处方
-			prescriptions, _ := service.GetAllPrescriptionByList(orgID, theStartTime)
+			prescriptions, _ := service.GetAllPrescriptionByListSix(orgID, theStartTime)
 			//获取透前评估
 			assessmentBefores, _ := service.GetAllAssessmentBeforesByListOne(orgID, theStartTime)
 			//获取上机
 			dialysisOrders, _ := service.GetAllDialysisOrdersByListSix(orgID, theStartTime)
 			//获取透后
-			AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListOne(orgID, theStartTime)
+			AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByListSix(orgID, theStartTime)
 
 			//获取透后监测
 			monitorlist, _ := service.GetAllMonitorList(orgID, theStartTime)
@@ -3349,7 +3349,7 @@ func (c *PatientApiController) GetPatientDialysisSolutionList() {
 	return
 }
 
-//GetDoctorAdvices 医嘱列表
+// GetDoctorAdvices 医嘱列表
 func (c *PatientApiController) GetDoctorAdvices() {
 	id, _ := c.GetInt64("id", 0)
 	adviceType, _ := c.GetInt64("advice_type", 0)
@@ -3708,6 +3708,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 				subdrugs := adviceNameM["subdrugs"].([]interface{})
 				if len(subdrugs) > 0 {
 					for _, subdrug := range subdrugs {
+
 						var s models.GroupAdvice
 						s.Remark = Remark
 						s.AdviceType = adviceType
@@ -3723,6 +3724,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 						s.PatientId = patientInfo.ID
 						s.AdviceDoctor = adminUserInfo.AdminUser.Id
 						s.IsSettle = 2
+
 						errcode := c.setAdviceWithJSON(&s, subdrug.(map[string]interface{}))
 						if errcode > 0 {
 							c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -3734,6 +3736,18 @@ func (c *PatientApiController) CreateGroupAdvice() {
 				}
 			}
 
+			//长沙南雅
+			if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 {
+
+				//查询该患者今日有没有双人核对
+				check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.Org.Id, patientInfo.ID, RecordDate)
+
+				if check.ID > 0 {
+					advice.Checker = check.Modifier
+					advice.CheckState = 1
+					advice.CheckTime = time.Now().Unix()
+				}
+			}
 			advices = append(advices, &advice)
 		}
 
@@ -3810,6 +3824,18 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.PatientId = patient
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 		advice.IsSettle = 2
+
+		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 {
+
+			//查询该患者今日有没有双人核对
+			check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.Org.Id, patientInfo.ID, advice.AdviceDate)
+
+			if check.ID > 0 {
+				advice.Checker = check.Modifier
+				advice.CheckState = 1
+				advice.CheckTime = time.Now().Unix()
+			}
+		}
 		err := service.CreateDoctorAdvice(&advice)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()

controllers/print_data_api_controller.go

@@ -141,7 +141,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
 			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
-				item.Count = list.Count
+				if this.GetAdminUserInfo().CurrentOrgId == 10445 {
+					listOrder, _ := service.GetDialysisOrderCountTen(item.PatientID, item.ScheduleDate)
+					item.Count = listOrder.DialysisTotal
+				}
+				if this.GetAdminUserInfo().CurrentOrgId != 10445 {
+					item.Count = list.Count
+				}
+
 			}
 			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
 				//listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)

controllers/schedule_api_controller.go

@@ -3379,6 +3379,7 @@ func (this *ScheduleApiController) GetNextWeekDayScheduleOne() {
 	}
 
 	schedule, err := service.GetNextWeekDayScheduleSix(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId, zone, theStartTIme)
+	fmt.Println("schedule------------------------------------------------", len(schedule))
 	for _, item := range schedule {
 		order, _ := service.GetLastDialysisOrder(adminUserInfo.CurrentOrgId, item.PatientId, theStartTIme)
 		item.XtDialysisOrderSix = order
@@ -4103,11 +4104,14 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	weekEndPoint := theEndTime.Unix()
 
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
+
+	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"days":      days,
-		"weekTitle": weekTitle,
-		"schdules":  schdules,
-		"today":     today,
+		"days":           days,
+		"weekTitle":      weekTitle,
+		"schdules":       schdules,
+		"today":          today,
+		"schedulesGroup": schedulesGroup,
 	})
 	return
 }

models/device_models.go

@@ -110,6 +110,7 @@ type DeviceZone struct {
 	CreateTime int64  `gorm:"column:ctime" json:"-"`
 	ModifyTime int64  `gorm:"column:mtime" json:"-"`
 	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (DeviceZone) TableName() string {
@@ -696,7 +697,7 @@ type DeviceCultures struct {
 	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
-//细菌培养检测
+// 细菌培养检测
 type DeviceCulture struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	SpelingDate       int64  `gorm:"column:speling_date" json:"speling_date" form:"speling_date"`
@@ -749,7 +750,7 @@ type DeviceDialysates struct {
 	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
-//内霉素检测
+// 内霉素检测
 type DeviceDialysate struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	SamplingDate      int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
@@ -808,7 +809,7 @@ type DeviceIons struct {
 	Modifications   int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
-//透析液离子浓度检测
+// 透析液离子浓度检测
 type DeviceIon struct {
 	ID              int64  `gorm:"column:id" json:"id" form:"id"`
 	SamplingDate    int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`

models/dialysis.go

@@ -347,7 +347,7 @@ func (PredialysisEvaluationList) TableName() string {
 	return "xt_assessment_before_dislysis"
 }
 
-//更改的地方
+// 更改的地方
 type DoctorAdvices struct {
 	ID                         int64           `gorm:"column:id" json:"id" form:"id"`
 	GroupNo                    int64           `gorm:"column:groupno" json:"groupno" form:"groupno"`
@@ -458,6 +458,7 @@ type DoctorAdvice struct {
 	IsMedicine            int64           `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	PushStartTime         int64           `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
 	IsSettle              int64           `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	IsPrescription        int64           `gorm:"column:is_prescription" json:"is_prescription" form:"is_prescription"`
 }
 
 func (DoctorAdvice) TableName() string {
@@ -792,12 +793,13 @@ type DialysisOrders struct {
 }
 
 type VmDialysisOrder struct {
-	Count        int64
-	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
-	Stage        int64 `gorm:"column:stage" json:"stage"`
-	Status       int64 `gorm:"column:status" json:"status"`
+	Count         int64
+	DialysisDate  int64 `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId     int64 `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId     int64 `gorm:"column:patient_id" json:"patient_id"`
+	Stage         int64 `gorm:"column:stage" json:"stage"`
+	Status        int64 `gorm:"column:status" json:"status"`
+	DialysisTotal int64 `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
 }
 
 func (VmDialysisOrder) TableName() string {
@@ -850,6 +852,7 @@ type DialysisOrder struct {
 	ScheduleRemark             string        `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	OrderRemark                string        `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
 	DialysisTotal              int64         `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
+	CatheterOperation          string        `gorm:"column:catheter_operation" json:"catheter_operation" form:"catheter_operation"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -1383,6 +1386,7 @@ type XtDialysisOrderSix struct {
 	BloodAccessId      int64  `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
 	DialysisIrrigation string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	DialysisDialyszers string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 }
 
 func (XtDialysisOrderSix) TableName() string {

models/new_monitor.go

@@ -57,19 +57,20 @@ func (VMMonitorDialysisOrder) TableName() string {
 }
 
 type VMDialysisPrescription 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"`
-	Status                int64   `gorm:"column:status" json:"status"`
-	RecordDate            int64   `gorm:"column:record_date" json:"record_date"`
-	TargetUltrafiltration float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
-
+	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"`
+	Status                     int64   `gorm:"column:status" json:"status"`
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
 	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
 	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
 	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	DialysisDurationHour       int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
+	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
 }
 
 func (VMDialysisPrescription) TableName() string {
@@ -91,12 +92,15 @@ func (VMPredialysisEvaluation) TableName() string {
 }
 
 type VMAssessmentAfterDislysis struct {
-	ID             int64   `gorm:"column:id" json:"id"`
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id"`
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id"`
-	AssessmentDate int64   `gorm:"column:assessment_date" json:"assessment_date"`
-	WeightAfter    float64 `gorm:"column:weight_after" json:"weight_after"`
-	Status         int64   `gorm:"column:status" json:"status"`
+	ID                    int64   `gorm:"column:id" json:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate        int64   `gorm:"column:assessment_date" json:"assessment_date"`
+	WeightAfter           float64 `gorm:"column:weight_after" json:"weight_after"`
+	Status                int64   `gorm:"column:status" json:"status"`
+	ActualUltrafiltration float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration" form:"actual_ultrafiltration"`
+	ActualTreatmentHour   int64   `gorm:"column:actual_treatment_hour" json:"actual_treatment_hour" form:"actual_treatment_hour"`
+	ActualTreatmentMinute int64   `gorm:"column:actual_treatment_minute" json:"actual_treatment_minute" form:"actual_treatment_minute"`
 }
 
 func (VMAssessmentAfterDislysis) TableName() string {

models/patient_models.go

@@ -357,6 +357,11 @@ type DialysisPrescription struct {
 	AddAmount                  float64       `gorm:"column:add_amount" json:"add_amount" form:"add_amount"`
 	ReduceAmount               float64       `gorm:"column:reduce_amount" json:"reduce_amount" form:"reduce_amount"`
 	DialysisRemark             string        `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	PrescribingNumber          float64       `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	TreatmentRemark            string        `gorm:"column:treatment_remark" json:"treatment_remark" form:"treatment_remark"`
+	PrescriptionSodium         string        `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
+	StartSodium                string        `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
+	SodiumCurve                string        `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -564,6 +569,11 @@ type DialysisSolution struct {
 	PreImpulse                 float64 `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
 	SolutionStatus             int64   `gorm:"column:solution_status" json:"solution_status" form:"solution_status"`
 	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	PrescribingNumber          float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	TreatmentRemark            string  `gorm:"column:treatment_remark" json:"treatment_remark" form:"treatment_remark"`
+	PrescriptionSodium         string  `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
+	StartSodium                string  `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
+	SodiumCurve                string  `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
 }
 
 func (DialysisSolution) TableName() string {

models/schedule_models.go

@@ -632,6 +632,46 @@ func (ScheduleNewPatients) TableName() string {
 	return "xt_schedule"
 }
 
+type MySchedule 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"`
+	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"`
+	Count        int64
+}
+
+func (MySchedule) TableName() string {
+	return "xt_schedule"
+}
+
+type MyVmBloodSchedule 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"`
+	SchedualPatient           *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
+	DialysisPrescription      DialysisPrescription       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"dialysis_prescription"`
+	XtAssessmentAfterDislysis XtAssessmentAfterDislysis  `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_assesment_after_dislysis"`
+	MonitoringRecord          MonitoringRecord           `gorm:"ForeignKey:PatientId,MonitoringDate;AssociationForeignKey:PatientId,ScheduleDate" json:"monitor_record"`
+}
+
+func (MyVmBloodSchedule) TableName() string {
+	return "xt_schedule"
+}
+
 type ScheduleConfig 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"`

service/device_service.go

@@ -843,21 +843,21 @@ func GetScheduleTemplateForDeviceNumber(orgID int64, deviceNumberID int64, templ
 	return item, err
 }
 
-//某模板下，某周几下，该床位是否有患者
+// 某模板下，某周几下，该床位是否有患者
 func GetScheduleTemplateOne(orgID int64, deviceNumberID int64, template_id int64, week_type int64, time_type int64) (models.PatientScheduleTemplateItem, error) {
 	var item models.PatientScheduleTemplateItem
 	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ? AND time_type = ?", deviceNumberID, orgID, template_id, week_type, time_type).First(&item).Error
 	return item, err
 }
 
-//某模板下，某周几下，是否有排班
+// 某模板下，某周几下，是否有排班
 func GetScheduleTemplateTwo(orgID int64, template_id int64, week_type int64, patient_id int64) (models.PatientScheduleTemplateItem, error) {
 	var item models.PatientScheduleTemplateItem
 	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("patient_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ?", patient_id, orgID, template_id, week_type).First(&item).Error
 	return item, err
 }
 
-//某模板下，某周几下，该床位是否有患者(不包括当前排班的人)
+// 某模板下，某周几下，该床位是否有患者(不包括当前排班的人)
 func GetScheduleTemplateThree(orgID int64, deviceNumberID int64, template_id int64, week_type int64, time_type int64, patient_id int64) (models.PatientScheduleTemplateItem, error) {
 	var item models.PatientScheduleTemplateItem
 	err := readDb.Model(&models.PatientScheduleTemplateItem{}).Where("device_number_id = ? AND org_id = ? AND status = 1 AND template_id = ? AND weekday = ? AND time_type = ? AND patient_id <> ?", deviceNumberID, orgID, template_id, week_type, time_type, patient_id).First(&item).Error

service/dialysis_service.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-//GetPatientList 返回患者的列表
+// GetPatientList 返回患者的列表
 func GetSchedualPatientList(orgID int64, schedulDate int64, schedulType int64, partitionType int64, keywords string, page int64, limit int64) (schedule []*models.DialysisSchedule, err error) {
 	var total int64
 	//if len(keywords) > 0 {
@@ -62,7 +62,7 @@ func GetSchedualPatientList(orgID int64, schedulDate int64, schedulType int64, p
 	return schedule, errors
 }
 
-//用户基本信息
+// 用户基本信息
 func FindPatientInfoById(orgID int64, id int64, time int64) (patient models.SchedualPatient2, err error) {
 	err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).Where("patient_id = ? AND user_org_id = ? AND schedule_date = ? ", id, orgID, time)
@@ -70,31 +70,31 @@ func FindPatientInfoById(orgID int64, id int64, time int64) (patient models.Sche
 	return
 }
 
-//透析处方
+// 透析处方
 func FindPatientPrescribeById(orgID int64, patientsId int64, recordDate int64) (patient models.DialysisPrescription, err error) {
 	err = readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id=? and status=1 and  record_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//透析方案中的透析处方
+// 透析方案中的透析处方
 func FindDialysisSolution(orgID int64, patientsId int64) (patient models.DialysisSolution, err error) {
 	err = readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id=? and status=1", patientsId, orgID).Last(&patient).Error
 	return
 }
 
-//透析方案中的透析模式
+// 透析方案中的透析模式
 func FindTreatmentModeById(modeId int64) (mode models.TreatmentMode, err error) {
 	err = readDb.Model(&models.TreatmentMode{}).Where("id = ? AND status=1", modeId).First(&mode).Error
 	return
 }
 
-//接诊评估
+// 接诊评估
 func FindReceiverTreatmentAccessRecordById(orgID int64, patientsId int64, recordDate int64) (receiveTreatmentAsses models.ReceiveTreatmentAsses, err error) {
 	err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id=? and status=1 and record_date = ?", patientsId, orgID, recordDate).First(&receiveTreatmentAsses).Error
 	return
 }
 
-//透前评估
+// 透前评估
 func FindPredialysisEvaluationById(orgID int64, patientsId int64, recordDate int64) (patient models.PredialysisEvaluation, err error) {
 	err = readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date = ?", patientsId, orgID, recordDate).First(&patient).Error
 	return
@@ -106,7 +106,7 @@ func FindPredialysisName(id int64, orgid int64) (models.Dataconfig, error) {
 	return dataconfig, err
 }
 
-//临时医嘱
+// 临时医嘱
 func FindDoctorAdviceById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? AND  advice_type = 2", patientsId, orgID, recordDate).Find(&patient).Error
 	return
@@ -128,7 +128,7 @@ func GetTotalDialysisCout(orgid int64, patientid int64) (order []*models.Dialysi
 	return order, total, err
 }
 
-//临时医嘱
+// 临时医嘱
 func FindDoctorAdviceOrderById(orgID int64, patientsId int64, recordDate int64) (patient []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id=? and status=1 and record_date = ? and (advice_type = 2 or advice_type = 3)", patientsId, orgID, recordDate).
@@ -137,13 +137,13 @@ func FindDoctorAdviceOrderById(orgID int64, patientsId int64, recordDate int64)
 	return
 }
 
-//双人核对
+// 双人核对
 func FindDoubleCheckById(orgID int64, patientsId int64, recordDate int64) (patient models.DoubleCheck, err error) {
 	err = readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id=? and status=1 and check_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//透析监测
+// 透析监测
 func FindAllMonitorRecord(orgID int64, patientsId int64, recordDate int64) (record []*models.MonitoringRecord, err error) {
 	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id=? and status=1 and monitoring_date = ?", patientsId, orgID, recordDate).Order("operate_time ASC").Find(&record).Error
 	return
@@ -154,37 +154,37 @@ func FindAllMonitor(orgID int64, patientsId int64, recordDate int64) (record []*
 	return
 }
 
-//透后评估
+// 透后评估
 func FindAssessmentAfterDislysisById(orgID int64, patientsId int64, recordDate int64) (patient models.AssessmentAfterDislysis, err error) {
 	err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date =?", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//治疗小结
+// 治疗小结
 func FindTreatmentSummaryById(orgID int64, patientsId int64, recordDate int64) (patient models.TreatmentSummary, err error) {
 	err = readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id=? and status=1 and assessment_date = ? ", patientsId, orgID, recordDate).First(&patient).Error
 	return
 }
 
-//机构叫号配置
+// 机构叫号配置
 func FindQueueCallInfo(orgID int64) (queueConfig models.QueueCallConfig, err error) {
 	err = readDb.Model(&models.QueueCallConfig{}).Where("org_id=? ", orgID).First(&queueConfig).Error
 	return
 }
 
-//修改机构叫号配置
+// 修改机构叫号配置
 func UpDateQueueCallInfo(queueConfig models.QueueCallConfig) error {
 	err := writeDb.Save(&queueConfig).Error
 	return err
 }
 
-//所有设备信息
+// 所有设备信息
 func FindAllDeviceInfo(orgID int64) (device []*models.Device, err error) {
 	err = readDb.Model(&models.Device{}).Where("org_id=? and status=1 and device_type = 1", orgID).Find(&device).Error
 	return device, err
 }
 
-//所有设备区域
+// 所有设备区域
 func GetAllDeviceZone(orgId int64) (error, []*models.DeviceZone) {
 	var zone []*models.DeviceZone
 	err := readDb.Model(&zone).Where("org_id = ? AND status = 1", orgId).Find(&zone).Error
@@ -192,7 +192,7 @@ func GetAllDeviceZone(orgId int64) (error, []*models.DeviceZone) {
 	return err, zone
 }
 
-//获取所有子药物
+// 获取所有子药物
 func FindAllSubDoctorAdvice(id int64, parentId int64) (error, []models.DoctorAdvice) {
 	var subAdvies []models.DoctorAdvice
 	err := readDb.Model(&subAdvies).Where("patient_id = ? AND parent_id = ?", id, parentId).Find(&subAdvies).Error
@@ -272,7 +272,7 @@ func AddSigleDoubleCheck(check *models.DoubleCheck) (err error) {
 	return errors
 }
 
-//修改透析处方
+// 修改透析处方
 func UpDateDialysisPrescription(dialysisPrescription *models.DialysisPrescription) error {
 	tx := writeDb.Begin()
 	err := writeDb.Save(&dialysisPrescription).Error
@@ -283,25 +283,25 @@ func UpDateDialysisPrescription(dialysisPrescription *models.DialysisPrescriptio
 	return err
 }
 
-//修改接诊评估
+// 修改接诊评估
 func UpadateReceiveTreatmentAsses(receiveTreatmentAsses *models.ReceiveTreatmentAsses) error {
 	err := writeDb.Save(receiveTreatmentAsses).Error
 	return err
 }
 
-//修改透前评估
+// 修改透前评估
 func UpadatePredialysisEvaluation(predialysisEvaluation *models.PredialysisEvaluation) error {
 	err := writeDb.Save(&predialysisEvaluation).Error
 	return err
 }
 
-//修改双人核对
+// 修改双人核对
 func UpdateDoubleCheck(check *models.DoubleCheck) error {
 	err := writeDb.Save(&check).Error
 	return err
 }
 
-//修改透后评估
+// 修改透后评估
 func UpdateAssessmentAfterDislysisRecord(assessmentAfterDislysis *models.AssessmentAfterDislysis) error {
 	err := writeDb.Save(&assessmentAfterDislysis).Error
 	return err
@@ -330,21 +330,21 @@ func UpdatePredialysisEvaluationFour(predialysisevaluation *models.PredialysisEv
 	return err
 }
 
-//修改
+// 修改
 func UpdateSummeRecord(treatmentSummary *models.TreatmentSummary) error {
 	err := writeDb.Save(&treatmentSummary).Error
 	return err
 }
 
-// func UpdateDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
-// 	tx := writeDb.Begin()
-// 	err := tx.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND id = ? AND status = 1 ", patientId, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "checker": m.Checker}).Error
-// 	if err != nil {
-// 		tx.Rollback()
-// 	}
-// 	tx.Commit()
-// 	return err
-// }
+//	func UpdateDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
+//		tx := writeDb.Begin()
+//		err := tx.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND id = ? AND status = 1 ", patientId, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "checker": m.Checker}).Error
+//		if err != nil {
+//			tx.Rollback()
+//		}
+//		tx.Commit()
+//		return err
+//	}
 func ExceDoctorAdviceById(m *models.DoctorAdvice, id int64, patientId int64) error {
 	err := writeDb.Model(&models.DoctorAdvice{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	return err
@@ -412,7 +412,7 @@ func UpdateSolution(solution *models.DialysisSolution) {
 
 }
 
-//创建长期处方
+// 创建长期处方
 func CreateSolution(solution *models.DialysisSolution) {
 	writeDb.Create(&solution)
 }
@@ -442,7 +442,7 @@ func SavePrescriptionAndCreateSolution(solution *models.DialysisSolution, prescr
 	return
 }
 
-//透析处方
+// 透析处方
 func FindDialysisPrescriptionByReordDate(id int64, recordDate int64, orgId int64) (error, *models.DialysisPrescription) {
 	dialysisPrescription := models.DialysisPrescription{}
 	err := readDb.Model(&dialysisPrescription).Where("patient_id = ? AND  record_date = ? AND status = 1 AND user_org_id = ? ", id, recordDate, orgId).Find(&dialysisPrescription).Error
@@ -455,14 +455,14 @@ func FindReceiveTreatmentAssesByReordDate(id int64, recordDate int64, orgId int6
 	return err, &receiveTreatmentAsses
 }
 
-//透前评估
+// 透前评估
 func FindPredialysisEvaluationByReordDate(id int64, recordDate int64, orgId int64) (error, *models.PredialysisEvaluation) {
 	dialysisEvaluation := models.PredialysisEvaluation{}
 	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? AND  assessment_date = ? AND status = 1 AND user_org_id = ?", id, recordDate, orgId).First(&dialysisEvaluation).Error
 	return err, &dialysisEvaluation
 }
 
-//双人核对
+// 双人核对
 func FindDoubleCheckByReordDate(id int64, recordDate int64, orgId int64) (error, *models.DoubleCheck) {
 	check := models.DoubleCheck{}
 	err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? AND  check_date = ? AND status = 1 AND user_org_id = ?", id, recordDate, orgId).First(&check).Error
@@ -571,7 +571,7 @@ func UpdateSolutionByPatientId(id int64) error {
 
 }
 
-//更新透析处方记录ID
+// 更新透析处方记录ID
 func UpDateRecordIdToDialysisPrescription(patientId int64, orgId int64, recordTime int64, recordId int64) error {
 	errors := writeDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? ", orgId, patientId, recordTime).Updates(map[string]interface{}{"record_id": recordId}).Error
 	return errors
@@ -612,7 +612,7 @@ func UpDateRecordIdToDoctorAdvice(patientId int64, orgId int64, recordTime int64
 	return errors
 }
 
-//透析处方
+// 透析处方
 func FindPatientPrescribeWidyDevideById(orgID int64, patientsId int64, recordDate int64) (patient models.DialysisPrescriptionAddtional, err error) {
 	err = readDb.Preload("Device", "status = 1 AND org_id = ?", orgID).
 		Model(&models.DialysisPrescriptionAddtional{}).
@@ -687,7 +687,7 @@ func FindDoctorName(adminid int64, appid int64, orgid int64) (models.App_Roles,
 	return role, err
 }
 
-/////////////// 新 18-10-22
+// ///////////// 新 18-10-22
 func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisScheduleVM, error) {
 	var vms []*MDialysisScheduleVM
 	db := readDb.
@@ -2051,3 +2051,16 @@ func GetFiledConfig(orgid int64) (models.FiledConfig, error) {
 	err := XTReadDB().Where("filed_name = 'dialyzer_perfusion_apparatus' and org_id = ? and module =1 and is_show = 1", orgid).First(&config).Error
 	return config, err
 }
+
+func GetDoctorAdviceCheckList(patient_id int64, advice_date int64, user_org_id int64) (doctor []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id =? and status= 1 and check_state= 0", patient_id, advice_date, user_org_id).Find(&doctor).Error
+	return doctor, err
+}
+
+func UpdateDoctorAdviceList(id int64, checker int64) error {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id = ? and status =1", id).Updates(map[string]interface{}{"checker": checker, "check_state": 1, "check_time": time.Now().Unix()}).Error
+	return err
+}

service/dialysis_solution_service.go

@@ -234,7 +234,7 @@ func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id
 	}
 	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ?", orgID, scheduleDate).
+		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 2", orgID, scheduleDate).
 		Preload("HisDoctorAdvice", func(db *gorm.DB) *gorm.DB {
 			return db.Where("user_org_id = ? and status = 1 and advice_date = ?", orgID, scheduleDate).Preload("Drug", "org_id =? and status = 1", orgID)
 		}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error

service/gobal_config_service.go

@@ -237,7 +237,7 @@ func UpdateHisStockPriceRecord(config *models.HisStockPriceConfig) (err error) {
 	return
 }
 
-//TODO:项目开关
+// TODO:项目开关
 func FindXTHisProjectByOrgId(org_id int64) (err error, config models.XtHisProjectConfig) {
 	err = readDb.Model(&models.XtHisProjectConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
 	return
@@ -1034,3 +1034,30 @@ func GetScheduleConfigById(id int64) (config models.ScheduleConfig, err error) {
 //	err = XTReadDB().Model(&models.ScheduleConfig{}).Where("id = ?", id).First(&config).Error
 //	return config, err
 //}
+
+func GetMobileScheduleList(orgid int64) (schedule []*models.MyVmBloodSchedule, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status= 1 and schedule_date>=1667232000 and schedule_date<=1669737600", orgid).Preload("SchedualPatient", "user_org_id = ? and status = 1", orgid).Find(&schedule).Error
+	return schedule, err
+}
+
+func GetPrescriptionList(patient_id int64, schedule_date int64, user_org_id int64) (models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+	err := XTReadDB().Where("patient_id = ? and record_date =? and user_org_id = ? and status =1", patient_id, schedule_date, user_org_id).Find(&prescription).Error
+	return prescription, err
+}
+
+func GetLastMonitorRecordList(patient_id int64, schedule_date int64, user_org_id int64) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	err := XTReadDB().Where("patient_id =? and monitoring_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, user_org_id).Last(&record).Error
+	return record, err
+}
+
+func GetLastAfter(patient_id int64, schedule_date int64, user_org_id int64) (models.XtAssessmentAfterDislysis, error) {
+
+	dislysis := models.XtAssessmentAfterDislysis{}
+	err := XTReadDB().Where("patient_id = ? and assessment_date = ? and user_org_id =? and status= 1", patient_id, schedule_date, user_org_id).Find(&dislysis).Error
+	return dislysis, err
+}

service/inspection_service.go

@@ -33,6 +33,18 @@ func GetAdvices(orgid int64, patientid int64, recorddate int64) (advcie []*model
 	err = XTReadDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and status =1", patientid, orgid, recorddate).Find(&advcie).Error
 	return
 }
+func GetAdvicesByPrescription(orgid int64, patientid int64, recorddate int64) (models.DoctorAdvice, error) {
+	advice := models.DoctorAdvice{}
+	err = XTReadDB().Where("patient_id = ? and user_org_id = ? and record_date = ? and status =1 and is_prescription = 1", patientid, orgid, recorddate).Find(&advice).Error
+	return advice, err
+}
+
+func UpdateDoctorAdvieById(id int64, prescription_number float64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id=? and status= 1", id).Updates(map[string]interface{}{"prescribing_number": prescription_number}).Error
+	return advice, err
+}
 
 func CreatePatientInspection(inspectins []models.Inspection) (err error) {
 	if len(inspectins) == 0 {

service/mobile_dialysis_service.go

@@ -2214,7 +2214,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -5249,3 +5249,11 @@ func UpdateDeviceInformation(patientid int64, dialysis_date int64) error {
 	err := UserWriteDB().Model(&information).Where("patient_id = ? and date = ? and status = 1", patientid, dialysis_date).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func MobileGetDoubleCheckSix(orgID int64, patientID int64, recordDate int64) (models.DoubleCheck, error) {
+	var record models.DoubleCheck
+
+	err := readDb.Where("patient_id = ? and user_org_id = ? and status = 1 and check_date = ?", patientID, orgID, recordDate).First(&record).Error
+
+	return record, err
+}

service/patient_service.go

@@ -11,7 +11,7 @@ import (
 	"github.com/jinzhu/gorm"
 )
 
-//GetPatientList 返回患者的列表
+// GetPatientList 返回患者的列表
 func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
@@ -79,7 +79,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 }
 
-//GetAllPatientList 返回全部患者的列表
+// GetAllPatientList 返回全部患者的列表
 func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
@@ -103,7 +103,7 @@ func GetAllPatientListSix(orgID int64) (patients []*models.MSchedualPatientList,
 	return patients, err
 }
 
-//GetAllPatientList 返回全部患者的列表
+// GetAllPatientList 返回全部患者的列表
 func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -557,10 +557,10 @@ func FindPatientByIdTwo(orgID int64, id int64) (patient models.XtPatientsNew, er
 	return
 }
 
-//func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
+// func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
 // err = readDb.Model(&models.Patients{}).Preload("Contagions", "status = 1").Preload("Diseases", "status = 1").Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
 // return
-//}
+// }
 func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -919,7 +919,7 @@ func UpdatePatientDialysisSolution(solution *models.DialysisSolution) (err error
 	return
 }
 
-//GetPatientDialysisSolutionList 返回患者透析方案的列表
+// GetPatientDialysisSolutionList 返回患者透析方案的列表
 func GetPatientDialysisSolutionList(orgID int64, patientID int64, page, limit int64) (solutions []*models.DialysisSolution, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -964,7 +964,7 @@ func GetPatientDialysisSolutionList(orgID int64, patientID int64, page, limit in
 	return
 }
 
-//GetPatientDryWeightAdjustList 返回患者调整干体重的列表
+// GetPatientDryWeightAdjustList 返回患者调整干体重的列表
 func GetPatientDryWeightAdjustList(orgID int64, patientID int64, page int64, limit int64) (weights []*models.DryWeightAdjust, total int64, err error) {
 	db := readDb.Table("xt_dry_weight_adjust as dwa").Where("dwa.status=1")
 	if orgID > 0 {
@@ -2358,11 +2358,46 @@ func GetAllDialysisOrdersByListSeven(orgID int64, scheduleDate int64) (dialysisO
 	return dialysisOrders, err
 }
 
+func GetAllPrescriptionByListSix(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
+
+	err = readDb.Model(&models.VMDialysisPrescription{}).Where("status= 1 and user_org_id = ? and record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+	return prescriptions, err
+	//redis := RedisClient()
+	//defer redis.Close()
+	//key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+	//redis.Set(key, "", time.Second)
+	//prescriptions_list_all, _ := redis.Get(key).Result()
+	//
+	//if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+	//	err = readDb.Model(&models.VMDialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+	//	if err != nil {
+	//		if err == gorm.ErrRecordNotFound {
+	//			return nil, nil
+	//		} else {
+	//			return nil, err
+	//		}
+	//	} else {
+	//		if len(prescriptions) > 0 {
+	//			//缓存数据
+	//			prescriptions_list_all, err := json.Marshal(&prescriptions)
+	//			if err == nil {
+	//				redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
+	//			}
+	//		}
+	//		return prescriptions, nil
+	//	}
+	//} else { //缓存数据了数据，将redis缓存的json字符串转为map
+	//	json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+	//	return prescriptions, nil
+	//}
+}
+
 func GetAllPrescriptionByList(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
 
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+	redis.Set(key, "", time.Second)
 	prescriptions_list_all, _ := redis.Get(key).Result()
 
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -2457,10 +2492,45 @@ func GetAllDialysisOrdersByListOne(orgID int64, scheduleDate int64) (dialysisOrd
 	}
 }
 
+func GetAllAssessmentAfterDislysisByListSix(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.VMAssessmentAfterDislysis, err error) {
+
+	err = readDb.Model(&models.VMAssessmentAfterDislysis{}).Where("status=1 and user_org_id = ? and assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+	return assessmentAfterDislysis, err
+	//redis := RedisClient()
+	//defer redis.Close()
+	//key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
+	//redis.Set(key, "", time.Second)
+	//assessment_after_dislysis__all, _ := redis.Get(key).Result()
+	//
+	//if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+	//	err = readDb.Model(&models.VMAssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+	//	if err != nil {
+	//		if err == gorm.ErrRecordNotFound {
+	//			return nil, nil
+	//		} else {
+	//			return nil, err
+	//		}
+	//	} else {
+	//		if len(assessmentAfterDislysis) > 0 {
+	//			//缓存数据
+	//			assessment_after_dislysis__all, err := json.Marshal(&assessmentAfterDislysis)
+	//			if err == nil {
+	//				redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
+	//			}
+	//		}
+	//		return assessmentAfterDislysis, nil
+	//	}
+	//} else { //缓存数据了数据，将redis缓存的json字符串转为map
+	//	json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
+	//	return assessmentAfterDislysis, nil
+	//}
+}
+
 func GetAllAssessmentAfterDislysisByListOne(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.VMAssessmentAfterDislysis, err error) {
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":assessment_after_dislysis_list_all"
+	redis.Set(key, "", time.Second)
 	assessment_after_dislysis__all, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -207,7 +207,13 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 
 func GetDialysisOrderCountSeven(patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
 	order := models.VmDialysisOrder{}
-	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date  from xt_dialysis_order where dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ?", recordDate, patient_id).Scan(&order).Error
+	err := p_service.XTReadDB().Raw("SELECT Count(id) as count,Max(dialysis_date) as dialysis_date,dialysis_total from xt_dialysis_order where dialysis_date <= ? AND status = 1 AND stage = 2 AND patient_id = ?", recordDate, patient_id).Scan(&order).Error
+	return order, err
+}
+
+func GetDialysisOrderCountTen(patient_id int64, recordDate int64) (models.VmDialysisOrder, error) {
+	order := models.VmDialysisOrder{}
+	err := p_service.XTReadDB().Where("patient_id = ? and dialysis_date = ? and status = 1", patient_id, recordDate).Last(&order).Error
 	return order, err
 }
 
@@ -456,7 +462,7 @@ func GetHisBatchDoctorAdvice(orgid int64, patient_id int64, advice_date int64) (
 
 func GetHisBatchProject(orgid int64, patient_id int64, advice_date int64) (project []*models.HisPrescriptionProject, err error) {
 
-	err = p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status= 1", orgid, patient_id, advice_date).Find(&project).Error
+	err = p_service.XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status= 1", orgid, patient_id, advice_date).Preload("HisProject").Preload("GoodInfo", "status=1").Find(&project).Error
 	return project, err
 }
 

service/schedule_service.go

@@ -129,6 +129,31 @@ func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, schedule
 	return
 }
 
+func GetScheduleTotalCount(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.MySchedule, err error) {
+
+	db := readDb.Table("xt_schedule as s").Where("status= 1 and (mode_id = 2 or mode_id= 3)")
+	if len(schIds) > 0 {
+		db = db.Where("s.partition_id in (?)", schIds)
+	}
+	if scheduletype > 0 {
+		db = db.Where("s.schedule_type = ?", scheduletype)
+	}
+	if orgID > 0 {
+		db = db.Where("s.user_org_id = ?", orgID)
+	}
+	if start > 0 {
+		db = db.Where("s.schedule_date>=?", start)
+	}
+	if end > 0 {
+		db = db.Where("s.schedule_date<=?", end)
+	}
+
+	err = db.Select("Count(id) as count,schedule_date,mode_id,user_org_id,schedule_week,schedule_type").Group("schedule_date,schedule_type,mode_id").Find(&schedules).Error
+
+	return schedules, err
+
+}
+
 func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.Schedule, err error) {
 
 	db := readDb.Table("xt_schedule as s")

service/user_service.go

@@ -28,7 +28,7 @@ type AdminUserList struct {
 	Status   int64  `json:"status"`
 }
 
-func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
+func GetAllDoctorAndNurse(orgId int64, appid int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
 
 	var users []AdminUserList
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and org_id=? and app_id =? and uar.user_type IN (2,3) and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&users).Error
@@ -48,7 +48,7 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 	return
 }
 
-func GetAllDoctorAndNurseSix(orgId, appid int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
+func GetAllDoctorAndNurseSix(orgId int64, appid int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
 
 	var users []AdminUserList
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("org_id=? and app_id =? and uar.user_type IN (2,3)", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&users).Error