库存调拨修改

controllers/dialysis_api_controller.go

@@ -324,6 +324,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,25 +437,31 @@ 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 == 10340 {
+	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 {
 		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:            0,
-			SingleDoseUnit:        "",
+			SingleDose:            5000,
+			SingleDoseUnit:        "iu",
 			DrugSpec:              0,
 			DrugSpecUnit:          "",
-			PrescribingNumber:     0, // 前端传过来的开药数量
+			PrescribingNumber:     prescribing_number, // 前端传过来的开药数量
 			PrescribingNumberUnit: "支",
 			DeliveryWay:           "静脉注射",
 			ExecutionFrequency:    "上机前",
@@ -517,14 +528,27 @@ func (c *DialysisApiController) PostPrescription() {
 
 		// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
 		advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
-		if advicePrescription.ID > 0 {
+		if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7) {
+			advice.AdviceName = "低分子肝素钠注射液"
 			// 修改患者临时医嘱里的抗凝剂医嘱
 			advice.ID = advicePrescription.ID
 			service.UpdateDoctorAdvice(&advice)
 		} else {
-			// 新增患者临时医嘱里的抗凝剂医嘱
-			service.CreateDoctorAdvice(&advice)
+			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 {
@@ -773,6 +797,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)
 
@@ -901,6 +930,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,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1072,6 +1106,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,
 	}
 
 	//针对河间咸得
@@ -1101,6 +1140,113 @@ func (c *DialysisApiController) PostSoulution() {
 	//更新状态
 	service.UpdateDialysisSolutionStatusTwo(dialysisSolution.ID, dialysisSolution.ModeId, dialysisSolution.UserOrgId, dialysisSolution.PatientId)
 
+	//长沙南雅医院，自动生成抗凝剂的临时处方
+	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 {
+		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 == 5 || anticoagulant == 7) {
+			advice.AdviceName = "低分子肝素钙注射液"
+			// 修改患者临时医嘱里的抗凝剂医嘱
+			advice.ID = advicePrescription.ID
+			service.UpdateDoctorAdvice(&advice)
+		} else {
+			// 新增患者临时医嘱里的抗凝剂医嘱
+			if anticoagulant == 3 || anticoagulant == 5 || 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()
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1389,6 +1389,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 +1408,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 +1540,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 +1633,113 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		err := service.AddSigleRecord(&prescription)
 
+		//长沙南雅医院，自动生成抗凝剂的临时处方
+		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 {
+			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 {
+				advice.AdviceDoctor = appRole.AdminUserId
+			}
+
+			// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
+			if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 5 || anticoagulant == 7) {
+				advice.AdviceName = "低分子肝素钠注射液"
+				// 修改患者临时医嘱里的抗凝剂医嘱
+				advice.ID = advicePrescription.ID
+				service.UpdateDoctorAdvice(&advice)
+			} else {
+				if anticoagulant == 3 || anticoagulant == 5 || 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()
@@ -2597,9 +2717,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
 			record.BreathingRate = befor.BreathingRate
-			if adminUserInfo.Org.Id != 10445 {
-				record.PulseFrequency = befor.PulseFrequency
-			}
+			record.PulseFrequency = befor.PulseFrequency
 			record.Temperature = befor.Temperature
 		}
 	}
@@ -2794,6 +2912,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
@@ -2931,6 +3055,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)
@@ -3030,6 +3159,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,
 	}
 
 	//针对河间咸的
@@ -3052,6 +3186,110 @@ func (c *DialysisAPIController) PostSolution() {
 	//更新状态
 	service.UpdateDialysisSolutionStatusTwo(dialysisSolution.ID, dialysisSolution.ModeId, dialysisSolution.UserOrgId, dialysisSolution.PatientId)
 
+	//长沙南雅医院，自动生成抗凝剂的临时处方
+	if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 {
+		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 {
+			advice.AdviceDoctor = appRole.AdminUserId
+		}
+
+		// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
+		advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
+
+		if advicePrescription.ID > 0 {
+			// 修改患者临时医嘱里的抗凝剂医嘱
+			advice.ID = advicePrescription.ID
+			service.UpdateDoctorAdvice(&advice)
+		} else {
+			// 新增患者临时医嘱里的抗凝剂医嘱
+			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()

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 {

service/inspection_service.go

@@ -33,9 +33,10 @@ 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) (advcie *models.DoctorAdvice, err error) {
-	err = XTReadDB().Model(&models.DoctorAdvice{}).Where("patient_id = ? and user_org_id = ? and record_date = ? and status =1 and is_prescription = 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 CreatePatientInspection(inspectins []models.Inspection) (err error) {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -462,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
 }