11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #
@@ -219,13 +219,6 @@ writesgjpatientmysqlpass = 1Q2W3e4r!@#$
 writesgjpatientmysqlname = sgj_patient
 
 
-
-
-
-
-
-#redishost = 120.77.235.13
-#redishost = 112.74.16.180
 redishost = kuyi6666.redis.rds.aliyuncs.com
 redisport = 6379
 redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP

controllers/base_api_controller.go

@@ -4,7 +4,7 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
-	_"fmt"
+	_ "fmt"
 	"strconv"
 	"strings"
 )
@@ -72,17 +72,17 @@ func (this *BaseAuthAPIController) Prepare() {
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
+		userAdmin.Mobile = "13416402574"
 
 		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
+		userAdmin.Mobile = "13416402574"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.CreateTime = 1530786071
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9675
+		subscibe.OrgId = 10016
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -92,7 +92,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9675
+		adminUserInfo.CurrentOrgId = 10016
 		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -318,17 +318,17 @@ func (this *BaseServeAPIController) Prepare() {
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
-		userAdmin.Mobile = "13318599895"
+		userAdmin.Mobile = "13416402574"
 
 		userAdmin.Id = 597
-		userAdmin.Mobile = "19874122664"
+		userAdmin.Mobile = "13416402574"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.CreateTime = 1530786071
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9675
+		subscibe.OrgId = 10016
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,7 +338,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9675
+		adminUserInfo.CurrentOrgId = 10016
 		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -152,7 +152,7 @@ func (c *DialysisApiController) UpdateQueueCall() {
 }
 
 func (c *DialysisApiController) PostPrescription() {
-	patient, _ := c.GetInt64("patient", 0)
+	patient, _ := c.GetInt64("patient_id", 0)
 	recordDateStr := c.GetString("record_date")
 
 	if patient <= 0 {
@@ -385,10 +385,13 @@ func (c *DialysisApiController) PostPrescription() {
 		err := service.AddSigleRecord(&prescription)
 		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()
 		//清空key 值
 		redis.Set(key, "", time.Second)
-
+		keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+		redis.Set(keyTwo, "", time.Second)
+		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
 		if err == nil {
 			updateErr := service.UpdateScheduleModeId(patient, adminUserInfo.CurrentOrgId, recordDate.Unix(), mode_id)
 			if updateErr != nil {
@@ -442,11 +445,17 @@ func (c *DialysisApiController) PostPrescription() {
 		prescription.ID = dialysisPrescription.ID
 
 		updateErr := service.UpDateDialysisPrescription(&prescription)
+
 		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()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+		redis.Set(keyOne, "", time.Second)
+		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyThree, "", time.Second)
 		if updateErr == nil {
 			updateErr := service.UpdateScheduleModeId(patient, adminUserInfo.CurrentOrgId, recordDate.Unix(), mode_id)
 			if updateErr != nil {
@@ -570,6 +579,9 @@ func (c *DialysisApiController) PostSoulution() {
 	epo := c.GetString("epo")
 	epo_count, _ := c.GetFloat("epo_count", 0)
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
+	impulse := c.GetString("impulse")
+	preImpules, parseDateErr := strconv.ParseFloat(impulse, 64)
+	fmt.Println("", preImpules)
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -681,6 +693,7 @@ func (c *DialysisApiController) PostSoulution() {
 		Epo:                        epo,
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
+		PreImpulse:                 preImpules,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -846,6 +859,10 @@ func (c *DialysisApiController) PostSoulution() {
 		Epo:                        epo,
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
+		OxygenUptake:               oxygen_uptake,
+		OxygenFlow:                 oxygen_flow,
+		OxygenTime:                 oxygen_time,
+		PreImpulse:                 preImpules,
 	}
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
@@ -857,6 +874,12 @@ func (c *DialysisApiController) PostSoulution() {
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 	//清空key 值
 	redis.Set(keyOne, "", time.Second)
+
+	keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+	redis.Set(keyTwo, "", time.Second)
+
+	keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+	redis.Set(keyThree, "", time.Second)
 	defer redis.Close()
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -957,11 +980,17 @@ func (c *DialysisApiController) PostDouleCheck() {
 		doubleCheck.Modifier = modifier
 
 		err := service.AddSigleDoubleCheck(&doubleCheck)
-		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
-		defer redis.Close()
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
+		fmt.Println("key2333223233223232323", key)
 		//清空key 值
 		redis.Set(key, "", time.Second)
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		fmt.Println("keyTwo23332323223233223323232", keyTwo)
+		redis.Set(keyTwo, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"doubleCheck": doubleCheck,
@@ -978,7 +1007,18 @@ func (c *DialysisApiController) PostDouleCheck() {
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.UpdatedTime = time.Now().Unix()
 		doubleCheck.ID = check.ID
+		redis := service.RedisClient()
 		err := service.UpdateDoubleCheck(&doubleCheck)
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
+		fmt.Println("key2333223233223232323", key)
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyTwo, "", time.Second)
+		fmt.Println("keyTwo23332323223233223323232", keyTwo)
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"doubleCheck": doubleCheck,
@@ -1067,6 +1107,11 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 	if receiveTreatment.ID == 0 { //新增
 		receiveTreatmentAsses.Creater = adminUserInfo.AdminUser.Id
 		err := service.AddSigleReceiveTreatmentAssesRecord(&receiveTreatmentAsses)
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":receive_treatment_asses"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		defer redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"receiveTreatmentAsses": receiveTreatmentAsses,
@@ -1095,6 +1140,10 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 		receiveTreatmentAsses.Modifier = adminUserInfo.AdminUser.Id
 		receiveTreatmentAsses.ID = receiveTreatment.ID
 		err := service.UpadateReceiveTreatmentAsses(&receiveTreatmentAsses)
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":receive_treatment_asses"
+		redis := service.RedisClient()
+		defer redis.Close()
+		redis.Set(keyOne, "", time.Second*60*60*18)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"receiveTreatmentAsses": receiveTreatmentAsses,
@@ -1235,6 +1284,15 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 
 		assessment.UpdatedTime = time.Now().Unix()
 		err = service.UpdateAssessmentAfterDislysisRecord(&assessment)
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyTwo, "", time.Second)
+		defer redis.Close()
 	} else {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
@@ -1251,9 +1309,13 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		err = service.AddSigleAssessmentAfterDislysisRecord(&assessment)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_after_dislysis_list_all"
+		redis.Set(keyThree, "", time.Second)
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyTwo, "", time.Second)
+		defer redis.Close()
 	}
 
 	if err != nil {
@@ -1440,9 +1502,16 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 		redis := service.RedisClient()
-		defer redis.Close()
+
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyTwo, "", time.Second)
+		defer redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentBeforeDislysis": &assessmentBeforeDislysis,
@@ -1658,7 +1727,16 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		err := service.UpadatePredialysisEvaluation(&assessmentBeforeDislysis)
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
 
+		keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+		defer redis.Close()
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+		redis.Set(keyTwo, "", time.Second)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentBeforeDislysis": &assessmentBeforeDislysis,
@@ -2940,7 +3018,7 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 	}
 	adviceDate, _ := dataBody["advice_date"].(string)
 	theTime, err := time.ParseInLocation(timeLayout2, adviceDate, loc2)
-	fmt.Println("the-----------------", theTime)
+
 	AdviceDate := theTime.Unix()
 	RecordDate := theTime.Unix()
 
@@ -3174,7 +3252,10 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 	}
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
-
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	redis.Set(key, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return
@@ -3195,9 +3276,9 @@ func (c *DialysisApiController) GetSolution() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 
-	solution, err := service.MobileGetDialysisSolutionByModeId(adminUserInfo.CurrentOrgId, patient_id, mode_id)
-	prescription, err := service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, patient_id, mode_id)
-	system_prescription, err := service.MobileGetSystemDialysisPrescribeByModeId(adminUserInfo.CurrentOrgId, mode_id)
+	solution, err := service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.CurrentOrgId, patient_id, mode_id)
+	prescription, err := service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, patient_id, mode_id)
+	system_prescription, err := service.MobileGetSystemDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, mode_id)
 
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/dialysis_record_api_controller.go

@@ -74,15 +74,126 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	adminInfo := this.GetAdminUserInfo()
 	orgID := adminInfo.CurrentOrgId
 
-	schedules, err := service.GetDialysisScheduals(orgID, date.Unix())
-	if err != nil {
-		this.ErrorLog("获取排班信息失败:%v", err)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	} else {
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
+
+	scheduals_json_str, _ := redis.Get(key).Result()
+
+	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		scheduals, err := service.GetDialysisSchedualsOne(orgID, date.Unix())
+
+		if err != nil {
+			this.ErrorLog("获取排班信息失败:%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		} else {
+			if len(scheduals) > 0 {
+				patients, _ := service.GetAllPcPatientListByList(orgID)
+
+				dialysisOrders, _ := service.GetAllPcDialysisOrdersByList(orgID, date.Unix())
+
+				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())
+
+				assessmentBefores, _ := service.GetAllAssessmentBeforesByList(orgID, date.Unix())
+
+				treatmentSummarys, _ := service.GetAllPcTreatmentSummarysByList(orgID, date.Unix())
+
+				AssessmentAfterDislysis, _ := service.GetAllPcAssessmentAfterDislysisByList(orgID, date.Unix())
+
+				advices, _ := service.GetAllPcAdvicestByList(orgID, date.Unix())
+
+				for key, item := range scheduals {
+					// 获取患者信息
+					for _, patient := range patients {
+						if item.PatientId == patient.ID {
+							scheduals[key].SchedualPatient = patient
+							break
+						}
+					}
+
+					for _, advice := range advices {
+						if item.PatientId == advice.PatientId {
+							scheduals[key].Advices = append(scheduals[key].Advices, advice)
+						}
+					}
+
+					// 医嘱信息
+					for _, prescription := range prescriptions {
+						if item.PatientId == prescription.PatientId {
+							scheduals[key].Prescription = prescription
+							break
+						}
+					}
+
+					// 透前评估
+					for _, assessmentBefore := range assessmentBefores {
+						if item.PatientId == assessmentBefore.PatientId {
+							scheduals[key].AssessmentBeforeDislysis = assessmentBefore
+							break
+						}
+					}
+
+					// 透析上下机
+					for _, dialysisOrder := range dialysisOrders {
+						if item.PatientId == dialysisOrder.PatientId {
+							scheduals[key].DialysisOrder = dialysisOrder
+							break
+						}
+					}
+
+					// 治疗小节
+					for _, afterDislysis := range AssessmentAfterDislysis {
+						if item.PatientId == afterDislysis.PatientId {
+							scheduals[key].AssessmentAfterDislysis = afterDislysis
+							break
+						}
+					}
+
+					// 透后评估
+					for _, treatmentSummary := range treatmentSummarys {
+						if item.PatientId == treatmentSummary.PatientId {
+							scheduals[key].TreatmentSummary = treatmentSummary
+							break
+						}
+					}
+				}
+
+				//缓存数据
+				scheduals_json, err := json.Marshal(&scheduals)
+				if err == nil {
+					redis.Set(key, scheduals_json, time.Second*60)
+				}
+			}
+
+			this.ServeSuccessJSON(map[string]interface{}{
+				"schedules": scheduals,
+			})
+
+		}
+
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		var dat []map[string]interface{}
+
+		if err := json.Unmarshal([]byte(scheduals_json_str), &dat); err == nil {
+
+		} else {
+
+		}
+
 		this.ServeSuccessJSON(map[string]interface{}{
-			"schedules": schedules,
+			"schedules": dat,
 		})
+
 	}
+
+	//if err != nil {
+	//	this.ErrorLog("获取排班信息失败:%v", err)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//} else {
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"schedules": schedules,
+	//	})
+	//}
 }
 
 // /api/dislysis/schedule [get]
@@ -106,78 +217,108 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 	}
 
 	adminInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.MobileGetPatientDetail(adminInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败：%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	ch := make(chan struct{})
+	count := 15 // count 表示活动的协程个数
+	var patient *service.MPatient
+	var schedual *service.MDialysisScheduleVM
+	var receiverTreatmentAccess *models.ReceiveTreatmentAsses
+	var predialysisEvaluation *models.PredialysisEvaluation
+	var doctorAdvices []*models.DoctorAdvice
+	var dialysisOrder *models.DialysisOrder
+	var doubleCheck *models.DoubleCheck
+	var monitorRecords []*models.MonitoringRecord
+	var assessmentAfterDislysis *models.AssessmentAfterDislysis
+	var treatmentSummary *models.TreatmentSummary
+	var record models.GobalConfig
+	var is_open_config models.XtHisConfig
+	var stockType []*models.GoodsTypeOne
+	var prepare []*models.XtDialysisBeforePrepare
+	var lastAssessment models.XtPatientVascularAccess
+	go func() {
+		patient, _ = service.MobileGetPatientDetail(adminInfo.CurrentOrgId, patientID)
+		ch <- struct{}{}
+	}()
 
-	schedual, getSchedualErr := service.MobileGetSchedualDetail(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getSchedualErr != nil {
-		this.ErrorLog("获取患者排班信息失败:%v", getSchedualErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		schedual, _ = service.MobileGetSchedualDetail(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	receiverTreatmentAccess, getRTARErr := service.MobileGetReceiverTreatmentAccessRecord(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getRTARErr != nil {
-		this.ErrorLog("获取接诊评估失败:%v", getRTARErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		receiverTreatmentAccess, _ = service.MobileGetReceiverTreatmentAccessRecord(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	predialysisEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminInfo.CurrentOrgId, patientID, date.Unix())
-	fmt.Println("predialysisEvaluatiotion", predialysisEvaluation)
-	if getPEErr != nil {
-		this.ErrorLog("获取透前评估失败:%v", getPEErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		predialysisEvaluation, _ = service.MobileGetPredialysisEvaluation(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	doctorAdvices, getDoctorAdvicesErr := service.MobileGetDoctorAdvices(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getDoctorAdvicesErr != nil {
-		this.ErrorLog("获取临时医嘱失败:%v", getDoctorAdvicesErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		doctorAdvices, _ = service.MobileGetDoctorAdvices(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecord(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getDialysisOrderErr != nil {
-		this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		dialysisOrder, _ = service.MobileGetSchedualDialysisRecord(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	doubleCheck, getDoubleCheckErr := service.MobileGetDoubleCheck(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getDoubleCheckErr != nil {
-		this.ErrorLog("获取双人核对记录失败:%v", getDoubleCheckErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		doubleCheck, _ = service.MobileGetDoubleCheck(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	monitorRecords, getMonitorRecordsErr := service.MobileGetMonitorRecords(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getMonitorRecordsErr != nil {
-		this.ErrorLog("获取透析监测记录失败:%v", getMonitorRecordsErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		monitorRecords, _ = service.MobileGetMonitorRecords(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysis(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getAADErr != nil {
-		this.ErrorLog("获取透后评估失败:%v", getAADErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		assessmentAfterDislysis, _ = service.MobileGetAssessmentAfterDislysis(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	treatmentSummary, getTreatmentSummaryErr := service.MobileGetTreatmentSummary(adminInfo.CurrentOrgId, patientID, date.Unix())
-	if getTreatmentSummaryErr != nil {
-		this.ErrorLog("获取治疗小结失败:%v", getTreatmentSummaryErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	go func() {
+		treatmentSummary, _ = service.MobileGetTreatmentSummary(adminInfo.CurrentOrgId, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
+
+	go func() {
+		_, record = service.FindAutomaticReduceRecordByOrgId(adminInfo.CurrentOrgId)
+		ch <- struct{}{}
+	}()
+
+	go func() {
+		_, is_open_config = service.FindXTHisRecordByOrgId(adminInfo.CurrentOrgId)
+		ch <- struct{}{}
+	}()
+
+	go func() {
+		//获取耗材类型
+		stockType, _ = service.GetStockType(adminInfo.CurrentOrgId)
+		ch <- struct{}{}
+	}()
+
+	go func() {
+		prepare, _ = service.GetDialyStockOut(adminInfo.CurrentOrgId, date.Unix(), patientID)
+
+		ch <- struct{}{}
+	}()
+
+	go func() {
+		//获取患者的最后一次血管通路数据
+		lastAssessment, _ = service.GetLastPassWayAssessment(adminInfo.CurrentOrgId, patientID)
+		ch <- struct{}{}
+	}()
+
+	for range ch {
+		// 每次从ch中接收数据，表明一个活动的协程结束
+		count--
+		// 当所有活动的协程都结束时，关闭管道
+		if count == 0 {
+			close(ch)
+		}
 	}
 
 	admins, getAdminsErr := service.GetAllAdminUsers(adminInfo.CurrentOrgId, adminInfo.CurrentAppId)
@@ -223,39 +364,19 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 	}
 
 	dialysisPrescribe, _ := service.GetDialysisPrescribe(adminInfo.CurrentOrgId, patientID, date.Unix())
-	//if getDialysisPrescribeErr != nil {
-	//	this.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
-	dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
-	//dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolutionOne(adminInfo.CurrentOrgId, schedual.ModeId)
 
-	if getDialysisSolutionErr != nil {
-		this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	dialysisSolution, _ := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
 
-	lastDialysisPrescribe, _ := service.GetLastDialysisPrescribeByModeId(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
-	//if getDialysisPrescribeErr != nil {
-	//	this.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
+	//
+	//if getDialysisSolutionErr != nil {
+	//	this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	//	return
 	//}
 
-	systemDialysisPrescribe, _ := service.GetSystemDialysisPrescribeByModeId(adminInfo.CurrentOrgId, schedual.ModeId)
-	//if getSystemDialysisPrescribeErr != nil {
-	//	this.ErrorLog("获取系统透析处方失败:%v", getSystemDialysisPrescribeErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	lastDialysisPrescribe, _ := service.GetLastDialysisPrescribeByModeId(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
 
-	if getLPEErr != nil {
-		this.ErrorLog("获取上一次透前评估失败:%v", getLPEErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	systemDialysisPrescribe, _ := service.GetSystemDialysisPrescribeByModeId(adminInfo.CurrentOrgId, schedual.ModeId)
 
 	lastDryWeightDislysis, getDryErr := service.GetLastDryWeight(adminInfo.CurrentOrgId, patientID)
 	if getDryErr != nil {
@@ -266,23 +387,12 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.CurrentOrgId, adminInfo.CurrentAppId, models.SpecialPermissionTypeHeadNurse)
 
-	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.CurrentOrgId)
-
-	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.CurrentOrgId)
-
-	//获取耗材类型
-	stockType, _ := service.GetStockType(adminInfo.CurrentOrgId)
-
-	prepare, _ := service.GetDialyStockOut(adminInfo.CurrentOrgId, date.Unix(), patientID)
-
 	var his_advices []*models.HisDoctorAdviceInfo
+	fmt.Println("hhh2333223322323223", is_open_config.IsOpen)
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
 	}
 
-	//获取患者的最后一次血管通路数据
-	lastAssessment, parseDateErr := service.GetLastPassWayAssessment(adminInfo.CurrentOrgId, patientID)
-
 	returnData := map[string]interface{}{
 		"patient":                     patient,
 		"schedual":                    schedual,
@@ -486,6 +596,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
 		if createErr != nil {
 			this.ErrorLog("创建监测记录失败：%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -558,6 +669,11 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.BloodThickness = monitorParam.BloodThickness
 		monitor.BloodMonitor = monitorParam.BloodMonitor
 		updateErr := service.UpdateMonitor(monitor)
+		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
+		redis := service.RedisClient()
+		defer redis.Close()
+		//清空key 值
+		redis.Set(key, "", time.Second)
 		if updateErr != nil {
 			this.ErrorLog("修改透析监测记录失败:%v", updateErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -772,6 +888,10 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	defer redis.Close()
 	//清空key 值
 	redis.Set(key, "", time.Second)
+
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":dialysis_orders_list_all"
+	redis.Set(keyOne, "", time.Second)
+
 	newdialysisRecord, getRecordErr := service.MobileGetDialysisRecord(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 
 	if createErr != nil {
@@ -829,7 +949,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 						fmt.Println("ultrafiltration_rate", ultrafiltration_rate)
 					}
 				}
-				fmt.Println("hhh233223323223232332233233223323223323232322332322323", adminUserInfo.CurrentOrgId)
+
 				//针对肇庆三鹤血液透析中心
 				if adminUserInfo.CurrentOrgId == 10215 || template.TemplateId == 43 {
 
@@ -1099,6 +1219,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	}
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -1115,6 +1236,15 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	}()
 
 	updateErr := service.ModifyDialysisRecord(dialysisRecord.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id)
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
+	redis := service.RedisClient()
+	defer redis.Close()
+	//清空key 值
+	redis.Set(key, "", time.Second)
+
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":dialysis_orders_list_all"
+	redis.Set(keyOne, "", time.Second)
+
 	if updateErr != nil {
 		this.ErrorLog("下机失败:%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1127,6 +1257,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		dialysisRecord.EndTime = endDate.Unix()
 		// 结束时候透析次数加1
 		service.UpdateSolutionByPatientId(patientID)
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"dialysis_order":          dialysisRecord,
 			"assessmentAfterDislysis": tempassessmentAfterDislysis,
@@ -1365,6 +1496,15 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":dialysis_order"
+	redis := service.RedisClient()
+	defer redis.Close()
+	//清空key 值
+	redis.Set(key, "", time.Second)
+
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":dialysis_orders_list_all"
+	redis.Set(keyOne, "", time.Second)
+
 	if updateErr != nil {
 		c.ErrorLog("修改下机失败：%v", updateErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/his_api_controller.go

@@ -559,189 +559,53 @@ func (c *HisApiController) GetHisPatientInfo() {
 	return
 
 }
+
 func (c *HisApiController) GetHisPrescriptionConfig() {
 	adminInfo := c.GetAdminUserInfo()
 	//获取医嘱模版
-	//advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
+	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
 	//获取所有基础药
+	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
 
-	drugways_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_drugways"
-	efs_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_efs"
-	//doctors_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_doctors"
-	department_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_department"
-	sick_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_sick"
-	diagnose_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_diagnose"
-
-	redis := service.RedisClient()
-	defer redis.Close()
-	drugways_str, _ := redis.Get(drugways_keys).Result()
-	efs_str, _ := redis.Get(efs_keys).Result()
-	//doctors_str, _ := redis.Get(doctors_keys).Result()
-	department_str, _ := redis.Get(department_keys).Result()
-	sick_str, _ := redis.Get(sick_keys).Result()
-	diagnose_str, _ := redis.Get(diagnose_keys).Result()
-
-	var drugways []*models.DrugwayDic
-	var efs []*models.ExecutionFrequencyDic
-	var roles []*models.UserAdminRole
-	var departments []*models.XtHisDepartment
-	var sicks []*models.OutpatientServiceSick
-	var diagnose []*models.HisXtDiagnoseConfig
-
-	if len(drugways_str) == 0 {
-		drugways, _, _ = service.GetDrugWayDics(adminInfo.CurrentOrgId)
-		drugways_str, err := json.Marshal(drugways)
-		if err == nil {
-			redis.Set(drugways_keys, string(drugways_str), time.Second*60*60*18)
-
-		} else {
-			redis.Set(drugways_keys, "", time.Second*60*60*18)
-
-		}
-
-	} else {
-		err := json.Unmarshal([]byte(drugways_str), &drugways)
-		if err != nil {
-			drugways, _, _ = service.GetDrugWayDics(adminInfo.CurrentOrgId)
-			drugways_str, err := json.Marshal(drugways)
-			if err == nil {
-				redis.Set(drugways_keys, string(drugways_str), time.Second*60*60*18)
-
-			} else {
-				redis.Set(drugways_keys, "", time.Second*60*60*18)
-
-			}
-
-		}
-
-	}
-	if len(efs_str) == 0 {
-		efs, _, _ = service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
-		efs_str, err := json.Marshal(efs)
-		if err == nil {
-
-			redis.Set(efs_keys, string(efs_str), time.Second*60*60*18)
-
-		} else {
-
-			redis.Set(efs_keys, "", time.Second*60*60*18)
-
-		}
-	} else {
-		err := json.Unmarshal([]byte(efs_str), &efs)
-		if err != nil {
-			efs, _, _ = service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
-			efs_str, err := json.Marshal(efs)
-			if err == nil {
-
-				redis.Set(efs_keys, string(efs_str), time.Second*60*60*18)
-
-			} else {
-
-				redis.Set(efs_keys, "", time.Second*60*60*18)
-
+	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
+	if config.ID > 0 && config.IsOpen == 1 {
+		for _, item := range drugs {
+			var index = 0
+			for _, subItem := range item.OtherDrugWarehouseInfo {
+				if index == 0 {
+					if subItem.StockMaxNumber*item.MinNumber+subItem.StockMinNumber > 0 {
+						index = index + 1
+						item.MinPrice = subItem.Price
+					}
+				}
 			}
 		}
 	}
 
-	//if len(doctors_str) == 0 {
-	//	roles, _ = service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
-	//	doctors_str, err := json.Marshal(roles)
-	//	if err == nil {
-	//		redis.Set(doctors_keys, string(doctors_str), time.Second*60*60*18)
-	//	} else {
-	//		redis.Set(doctors_keys, "", time.Second*60*60*18)
-	//	}
-	//
-	//} else {
-	//	err := json.Unmarshal([]byte(doctors_str), &efs)
-	//	if err != nil {
-	//		roles, _ = service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
-	//		doctors_str, err := json.Marshal(roles)
-	//		if err == nil {
-	//			redis.Set(doctors_keys, string(doctors_str), time.Second*60*60*18)
-	//		} else {
-	//			redis.Set(doctors_keys, "", time.Second*60*60*18)
-	//		}
-	//
-	//	}
-	//}
-
-	if len(department_str) == 0 {
-		departments, _ = service.GetAllDepartMent(adminInfo.CurrentOrgId)
-		department_str, err := json.Marshal(departments)
-		if err == nil {
-			redis.Set(department_keys, string(department_str), time.Second*60*60*18)
-		} else {
-			redis.Set(department_keys, "", time.Second*60*60*18)
-		}
-	} else {
-		err := json.Unmarshal([]byte(department_str), &departments)
-		if err != nil {
-			departments, _ = service.GetAllDepartMent(adminInfo.CurrentOrgId)
-			department_str, _ := json.Marshal(departments)
-			redis.Set(department_keys, string(department_str), time.Second*60*60*18)
-		}
-	}
-
-	if len(sick_str) == 0 {
-		sicks, _ = service.FindAllSick(adminInfo.CurrentOrgId)
-		sick_str, err := json.Marshal(sicks)
-		if err == nil {
-			redis.Set(sick_keys, string(sick_str), time.Second*60*60*18)
-		} else {
-			redis.Set(sick_keys, "", time.Second*60*60*18)
-		}
+	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
+	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
+	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
 
-	} else {
-		err := json.Unmarshal([]byte(sick_str), &sicks)
-		if err != nil {
-			sicks, _ = service.FindAllSick(adminInfo.CurrentOrgId)
-			sick_str, _ := json.Marshal(sicks)
-			redis.Set(sick_keys, string(sick_str), time.Second*60*60*18)
+	//获取诊断信息
 
-		}
+	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
 
-	}
-
-	if len(diagnose_str) == 0 {
-		diagnose, _ = service.FindAllDiagnose(adminInfo.CurrentOrgId)
-		diagnose_str, err := json.Marshal(diagnose)
-		if err == nil {
-			redis.Set(diagnose_keys, string(diagnose_str), time.Second*60*60*18)
-		} else {
-			redis.Set(diagnose_keys, "", time.Second*60*60*18)
-		}
-	} else {
-		err := json.Unmarshal([]byte(diagnose_str), &sicks)
-		if err != nil {
-			diagnose, _ = service.FindAllDiagnose(adminInfo.CurrentOrgId)
-			diagnose_str, err := json.Marshal(diagnose)
-			if err == nil {
-				redis.Set(diagnose_keys, string(diagnose_str), time.Second*60*60*18)
-			} else {
-				redis.Set(diagnose_keys, "", time.Second*60*60*18)
-			}
-		}
-	}
-
-	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
-	roles, _ = service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
-	//获取所有科室信息
-	//获取诊断信息
+	diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
 
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"drugs": drugs,
-		//"advices_template": advices,
-		"drugways":   drugways,
-		"efs":        efs,
-		"doctors":    roles,
-		"department": departments,
-		"sick":       sicks,
-		"additions":  additions,
-		"diagnose":   diagnose,
+		"drugs":            drugs,
+		"advices_template": advices,
+		"drugways":         drugways,
+		"efs":              efs,
+		"doctors":          doctors,
+		"department":       department,
+		"sick":             sick,
+		"additions":        additions,
+		"diagnose":         diagnose,
 	})
 }
 func (c *HisApiController) CreateHisPrescription() {
@@ -784,8 +648,10 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	}
 
-	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	patient, _ := service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)
 
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	fmt.Println("drugStockConfig94394343344334344343434334", drugStockConfig)
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	if drugStockConfig.IsOpen == 1 {
@@ -823,8 +689,17 @@ func (c *HisApiController) CreateHisPrescription() {
 									return
 								}
 
+								//查询药品的搜有库存
+								list, _ := service.GetDrugWarehouseInfoPrescription(drug_id, adminInfo.CurrentOrgId)
+								var total_count int64
+								for _, it := range list {
+									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+								}
+								totals := strconv.FormatInt(total_count, 10)
+								all_count, _ := strconv.ParseFloat(totals, 64)
+								fmt.Println("all_count2323323233232", all_count)
 								if prescribingNumberUnit == drug.MinUnit {
-									if prescribing_number > drug.Total {
+									if prescribing_number > all_count {
 										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
@@ -832,13 +707,14 @@ func (c *HisApiController) CreateHisPrescription() {
 								} else {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
-										if num > drug.Total {
+										if num > all_count {
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
 										}
 									}
 								}
+
 							}
 						}
 					}
@@ -877,9 +753,17 @@ func (c *HisApiController) CreateHisPrescription() {
 										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 										return
 									}
-									if totals > good.Total {
+									//查询耗材库存
+									list, _ := service.GetGoodWarehouseInfo(project_id)
+									var stock_count int64
+									for _, it := range list {
+										stock_count += it.StockCount
+									}
+									stock_counts := strconv.FormatInt(stock_count, 10)
+									stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
+									if totals > stock_total_count {
 										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
-										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+
 										return
 									}
 
@@ -891,7 +775,6 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 		}
-
 	}
 
 	info, _ := service.FindHisPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
@@ -977,10 +860,10 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 				types := int64(items["type"].(float64))
 
-				if items["order_status"] == nil || reflect.TypeOf(items["order_status"]).String() != "float64" {
-					utils.ErrorLog("order_status")
-				}
-				order_status := int64(items["order_status"].(float64))
+				//if items["order_status"] == nil || reflect.TypeOf(items["order_status"]).String() != "float64" {
+				//	utils.ErrorLog("order_status")
+				//}
+				//order_status := int64(items["order_status"].(float64))
 
 				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
 					utils.ErrorLog("med_type")
@@ -993,9 +876,9 @@ func (c *HisApiController) CreateHisPrescription() {
 					med_type = "14"
 				}
 
-				if order_status == 0 {
-					order_status = 1
-				}
+				//if order_status == 0 {
+				//	order_status = 1
+				//}
 
 				if items["pre_time"] == nil || reflect.TypeOf(items["pre_time"]).String() != "string" {
 					utils.ErrorLog("pre_time")
@@ -1027,7 +910,7 @@ func (c *HisApiController) CreateHisPrescription() {
 						Status:             1,
 						Doctor:             role.UserName,
 						HisPatientId:       his_patient_id,
-						OrderStatus:        order_status,
+						OrderStatus:        1,
 						BatchNumber:        "",
 						PrescriptionNumber: hpInfo.PrescriptionNumber,
 						PreTime:            pTime,
@@ -1043,7 +926,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					tempPrescription.Modifier = adminInfo.AdminUser.Id
 					tempPrescription.Mtime = time.Now().Unix()
 					tempPrescription.Doctor = role.UserName
-					tempPrescription.OrderStatus = order_status
+					//tempPrescription.OrderStatus = order_status
 					tempPrescription.PreTime = pTime
 					tempPrescription.MedType = med_type
 					service.SaveHisPrescription(tempPrescription)
@@ -1077,6 +960,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.PatientId = patient_id
 							s.HisPatientId = his_patient_id
 							s.StartTime = pTime
+
 							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
 							if errcode > 0 {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -1085,6 +969,10 @@ func (c *HisApiController) CreateHisPrescription() {
 
 							s.StartTime = pTime
 							service.CreateHisDoctorAdvice(&s)
+							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+							redis := service.RedisClient()
+							redis.Set(key, "", time.Second)
+							defer redis.Close()
 							var randNum int
 							randNum = rand.Intn(10000) + 1000
 							timestamp := time.Now().Unix()
@@ -1092,7 +980,8 @@ func (c *HisApiController) CreateHisPrescription() {
 							timeFormat := tempTime.Format("20060102150405")
 							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 							service.CreateHisDoctorAdvice(&s)
-
+							keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+							redis.Set(keyOne, "", time.Second)
 						}
 					}
 				}
@@ -1117,23 +1006,74 @@ func (c *HisApiController) CreateHisPrescription() {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
 								return
 							}
-							service.CreateHisProjectTwo(&p)
 
+							service.CreateHisProjectTwo(&p)
 							var randNum int
 							randNum = rand.Intn(10000) + 1000
 							timestamp := time.Now().Unix()
 							tempTime := time.Unix(timestamp, 0)
 							timeFormat := tempTime.Format("20060102150405")
 							p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
+
+							//新增或者编辑项目，修改对应的标签数据
+							labelOrigin, _ := service.GetProjectById(p.UserOrgId, p.ID, patient_id, recordDateTime)
+							if labelOrigin.ID == 0 { //当天某个人的处方中的项目不存在
+								var label models.HisLabelPrintInfo
+								project, _ := service.GetProjectDetail(p.ProjectId)
+								if project.CostClassify == 3 { //类别为检验检查
+									if p.TeamId > 0 { //检验检查组套
+										tempLabel, _ := service.GetProjectByTeamId(p.UserOrgId, p.TeamId, patient_id, recordDateTime)
+										if tempLabel.ID == 0 {
+											team, _ := service.GetProjectTeamDetail(p.TeamId)
+											label.Number = tempPrescription.PrescriptionNumber
+											label.ProjectId = project.ID
+											label.Status = 1
+											label.IsPrint = 2
+											label.DoctorId = info.DoctorId
+											label.UserOrgId = p.UserOrgId
+											label.PatientId = patient_id
+											label.RecordDate = recordDateTime
+											label.Ctime = time.Now().Unix()
+											label.Mtime = time.Now().Unix()
+											label.ItemId = p.TeamId
+											label.FeedetlSn = p.FeedetlSn
+											label.PProjectId = p.ID
+											label.ProjectName = team.ProjectTeam
+											label.PatientName = patient.Name
+											service.CreateHisLabelRecord(&label)
+										}
+									} else { //单条检验检查项目
+										label.Number = tempPrescription.PrescriptionNumber
+										label.ProjectId = project.ID
+										label.Status = 1
+										label.DoctorId = info.DoctorId
+										label.UserOrgId = p.UserOrgId
+										label.PatientId = patient_id
+										label.RecordDate = recordDateTime
+										label.IsPrint = 2
+										label.Ctime = time.Now().Unix()
+										label.Mtime = time.Now().Unix()
+										label.FeedetlSn = p.FeedetlSn
+										label.PProjectId = p.ID
+										label.ItemId = p.TeamId
+										label.ProjectName = project.ProjectName
+										label.PatientName = patient.Name
+										service.CreateHisLabelRecord(&label)
+									}
+								}
+							}
+
 							service.SaveHisProjectTwo(&p)
 
 							if p.Type == 3 { //处理透前准备耗材数量数据
 								consumables, _ := service.FindHisConsumablesByID(adminInfo.CurrentOrgId, patient_id, recordDateTime, p.ProjectId)
 								if consumables.ID > 0 {
-									consumables.Count = int64(p.Count)
+									cnt, _ := strconv.ParseInt(p.Count, 10, 64)
+									consumables.Count = cnt
 									service.UpdateConsumables(&consumables)
 								}
 							}
+
 						}
 					}
 				}
@@ -1443,10 +1383,12 @@ func (c *HisApiController) DeletePrescription() {
 	if err == nil {
 		if len(projects) > 0 {
 			for _, item := range projects {
+				service.DeletePrintInfo(item.ID) //删除打印信息
 				if stockConfig.IsOpen == 1 {
 					if item.Type == 3 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
-						f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(item.Count), 10), 64)
+						//cnt, _ := strconv.ParseInt(item.Count, 10, 64)
+						f_count, _ := strconv.ParseFloat(item.Count, 64)
 						good.Total = good.Total + f_count
 						service.UpdateGoodInfo(&good)
 					}
@@ -1531,10 +1473,16 @@ func (c *HisApiController) DeleteProject() {
 	}
 	err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
+		service.DeletePrintInfo(id)
+		label, _ := service.GetProjectById(adminInfo.CurrentOrgId, id, project.RecordDate, project.PatientId)
+		label.Status = 0
+		service.CreateHisLabelRecord(&label)
+
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -2032,8 +1980,7 @@ func (c *HisApiController) setProjectWithJSONTwo(project *models.HisPrescription
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -2179,6 +2126,41 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 	//	advice.WeekDay = week_day
 	//}
 
+	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
+		drugSpecUnit, _ := json["min_unit"].(string)
+		advice.DrugSpecUnit = drugSpecUnit
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
+		advice.SingleDose = singleDose
+	}
+	if json["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
+		singleDoseUnit, _ := json["single_dose_unit"].(string)
+		advice.SingleDoseUnit = singleDoseUnit
+	}
+
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		deliveryWay, _ := json["delivery_way"].(string)
+		advice.DeliveryWay = deliveryWay
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		executionFrequency, _ := json["execution_frequency"].(string)
+		advice.ExecutionFrequency = executionFrequency
+	}
+
+	if json["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
+		advice.Price = price
+	}
+	if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
+		med_list_codg, _ := json["medical_insurance_number"].(string)
+		advice.MedListCodg = med_list_codg
+	}
+	if json["day"] != nil || reflect.TypeOf(json["day"]).String() == "float64" {
+		day := int64(json["day"].(float64))
+		advice.Day = day
+	}
+
 	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
 		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
 		advice.PrescribingNumberUnit = prescribingNumberUnit
@@ -2191,6 +2173,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 			hisAdvice, err := service.GetHisDoctorAdvicesById(advice.ID)
 			if err == nil {
 				if hisAdvice.ID > 0 {
+
 					advice.ExecutionTime = hisAdvice.ExecutionTime
 					advice.ExecutionStaff = hisAdvice.ExecutionStaff
 					advice.ExecutionState = hisAdvice.ExecutionState
@@ -2199,6 +2182,16 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.CheckState = hisAdvice.CheckState
 					advice.StartTime = hisAdvice.StartTime
 					advice.HospApprFlag = hisAdvice.HospApprFlag
+
+					if hisAdvice.SingleDose != advice.SingleDose || hisAdvice.DeliveryWay != advice.DeliveryWay || hisAdvice.ExecutionFrequency != advice.ExecutionFrequency || hisAdvice.Day != advice.Day || hisAdvice.PrescribingNumber != advice.PrescribingNumber || hisAdvice.Price != advice.Price || hisAdvice.Remark != advice.Remark {
+						advice.ExecutionTime = 0
+						advice.ExecutionStaff = 0
+						advice.ExecutionState = 2
+						advice.CheckTime = 0
+						advice.Checker = 0
+						advice.CheckState = 2
+					}
+
 					//advice.Groupno = hisAdvice.Groupno
 
 				}
@@ -2326,40 +2319,6 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 	//	advice.StartTime = start_time
 	//}
 
-	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
-		drugSpecUnit, _ := json["min_unit"].(string)
-		advice.DrugSpecUnit = drugSpecUnit
-	}
-	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
-		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
-		advice.SingleDose = singleDose
-	}
-	if json["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
-		singleDoseUnit, _ := json["single_dose_unit"].(string)
-		advice.SingleDoseUnit = singleDoseUnit
-	}
-
-	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
-		deliveryWay, _ := json["delivery_way"].(string)
-		advice.DeliveryWay = deliveryWay
-	}
-	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
-		executionFrequency, _ := json["execution_frequency"].(string)
-		advice.ExecutionFrequency = executionFrequency
-	}
-
-	if json["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
-		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
-		advice.Price = price
-	}
-	if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
-		med_list_codg, _ := json["medical_insurance_number"].(string)
-		advice.MedListCodg = med_list_codg
-	}
-	if json["day"] != nil || reflect.TypeOf(json["day"]).String() == "float64" {
-		day := int64(json["day"].(float64))
-		advice.Day = day
-	}
 	return 0
 }
 
@@ -2406,8 +2365,8 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -2463,7 +2422,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total - f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -2476,12 +2435,18 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 				if project.Count < temp_project.Count {
-					other_count := temp_project.Count - project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_two - f_count_one
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total + other_count_two
 					service.UpdateGoodInfo(&good)
 				} else if project.Count > temp_project.Count {
-					other_count := project.Count - temp_project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_one - f_count_two
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total - other_count_two
 					service.UpdateGoodInfo(&good)
@@ -3287,13 +3252,15 @@ func (c *HisApiController) GetUploadInfo() {
 	if tempOrder.ID == 0 {
 		if settle_accounts_type == 1 { //日结
 			fmt.Println(reg_type)
-			if reg_type == 11 {
-				fmt.Println(reg_type)
+
+			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
+
 				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
 			} else {
 				prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
 			}
 		} else { //月结
+
 			start_time_str := c.GetString("start_time")
 			end_time_str := c.GetString("end_time")
 			timeLayout := "2006-01-02"
@@ -3338,7 +3305,8 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
-					total = total + (subItem.Price * float64(subItem.Count))
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+					total = total + (subItem.Price * cnt)
 				}
 			}
 
@@ -3347,7 +3315,11 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 		}
 
-		allTotal := fmt.Sprintf("%.2f", total)
+		if reg_type == 1111 || reg_type == 1112 {
+			reg_type = 11
+		}
+
+		allTotal := fmt.Sprintf("%.4f", total)
 		totals, _ := strconv.ParseFloat(allTotal, 64)
 		order := &models.HisOrder{
 			UserOrgId:             adminUser.CurrentOrgId,
@@ -3392,8 +3364,8 @@ func (c *HisApiController) GetUploadInfo() {
 					cus := &Custom{
 						AdviceId:         subItem.ID,
 						ProjectId:        0,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.MedListCodg,
@@ -3404,13 +3376,14 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
+					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 					cus := &Custom{
 						AdviceId:         0,
 						ProjectId:        subItem.ID,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+						Cut:              fmt.Sprintf("%.4f", cnt),
 						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 						MedListCodg:      subItem.MedListCodg,
 						Type:             2,
 					}
@@ -3422,10 +3395,10 @@ func (c *HisApiController) GetUploadInfo() {
 					ItemId:           item.ID,
 					AdviceId:         0,
 					ProjectId:        0,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
-					Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
+					DetItemFeeSumamt: fmt.Sprintf("%.4f", item.Price),
+					Cut:              fmt.Sprintf("%.4f", float64(item.Count)),
 					FeedetlSn:        item.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", float64(item.Price)),
+					Price:            fmt.Sprintf("%.4f", float64(item.Price)),
 					MedListCodg:      item.XtHisAddtionConfig.Code,
 					Type:             3,
 				}
@@ -5112,7 +5085,7 @@ func (c *HisApiController) PreSettle() {
 
 	if settle_accounts_type == 1 { //日结
 
-		if reg_type == 11 {
+		if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 
 			prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
 		} else {
@@ -5171,7 +5144,8 @@ func (c *HisApiController) PreSettle() {
 		}
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
-				total = total + (subItem.Price * float64(subItem.Count))
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+				total = total + (subItem.Price * cnt)
 			}
 		}
 
@@ -5229,12 +5203,12 @@ func (c *HisApiController) PreSettle() {
 
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
-
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 				cus := &Custom{
 					AdviceId:         0,
 					ProjectId:        subItem.ID,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cnt),
+					Cut:              fmt.Sprintf("%.2f", cnt),
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 					MedListCodg:      subItem.MedListCodg,
@@ -5323,6 +5297,15 @@ func (c *HisApiController) PreSettle() {
 	}
 }
 
+type CustomOrderInfo struct {
+	Name  string
+	Spec  string
+	Unit  string
+	Count float64
+	Price float64
+	Total float64
+}
+
 func (c *HisApiController) GetPrivateExpensesInfo() {
 	order_id, _ := c.GetInt64("id", 0)
 	his_patient_id, _ := c.GetInt64("his_patient_id", 0)
@@ -5336,16 +5319,56 @@ func (c *HisApiController) GetPrivateExpensesInfo() {
 	his, _ := service.GetHisPatientByIdThree(his_patient_id)
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
-	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
+	//order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
+
+	orderInfos, _ := service.GetHisOrderInfoByNumberOne(order.Number)
+	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
+	orderInfos_three, _ := service.GetHisOrderInfoByNumberThree(order.Number)
+
+	var orderInfos_four []*models.HisOrderInfoTwo
+	for _, item := range orderInfos_three {
+		if item.HisPrescriptionProject.HisProject.CostClassify == 3 {
+			item.HisPrescriptionProject.IsCheckTeam = 1
+			orderInfos_four = append(orderInfos_four, item)
+
+		}
+		if item.HisPrescriptionProject.HisProject.CostClassify != 3 {
+			item.HisPrescriptionProject.IsCheckTeam = 2
+			orderInfos_two = append(orderInfos_two, item)
+		}
+	}
+
+	new_order_info := RemoveRepeatedTeam(orderInfos_four)
+	var cus_slice []CustomOrderInfo
+	for _, item := range new_order_info {
+		var cus CustomOrderInfo
+		cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
+		cus.Unit = ""
+		cus.Spec = ""
+		var total float64
+		for _, subItem := range orderInfos_four {
+			if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
+				total = total + subItem.DetItemFeeSumamt
+				fmt.Println(subItem.DetItemFeeSumamt)
+			}
+		}
+		cus.Count = 1
+		cus.Total = total
+		cus_slice = append(cus_slice, cus)
+	}
+
+	orderInfos = append(orderInfos, orderInfos_two...)
+
 	patient, _ := service.GetPatientByID(org_id, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order":         order,
-		"order_info":    order_info,
-		"patient":       patient,
-		"admin_info":    adminInfo,
-		"his":           his,
-		"current_admin": role,
-		"org_config":    miConfig,
+		"order":          order,
+		"order_info":     orderInfos,
+		"patient":        patient,
+		"admin_info":     adminInfo,
+		"his":            his,
+		"current_admin":  role,
+		"org_config":     miConfig,
+		"new_order_info": cus_slice,
 	})
 
 }
@@ -5509,3 +5532,20 @@ func (c *HisApiController) GetAllOrder() {
 	return
 
 }
+
+func RemoveRepeatedTeam(arr []*models.HisOrderInfoTwo) (newArr []*models.HisOrderInfoTwo) {
+	newArr = make([]*models.HisOrderInfoTwo, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].HisPrescriptionProject.TeamId == arr[j].HisPrescriptionProject.TeamId {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}

controllers/his_hospital_api_controller.go

@@ -468,7 +468,8 @@ func (c *HisHospitalApiController) GetSettleInfo() {
 		}
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
-				total = total + (subItem.Price * float64(subItem.Count))
+				cut, _ := strconv.ParseFloat(subItem.Count, 64)
+				total = total + (subItem.Price * cut)
 			}
 		}
 
@@ -532,12 +533,15 @@ func (c *HisHospitalApiController) GetSettleInfo() {
 			}
 		}
 		if item.Type == 2 { //项目
+
 			for _, subItem := range item.HisPrescriptionProject {
+				cut, _ := strconv.ParseFloat(subItem.Count, 64)
+
 				cus := &Custom{
 					AdviceId:         0,
 					ProjectId:        subItem.ID,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cut),
+					Cut:              fmt.Sprintf("%.2f", cut),
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 					MedListCodg:      subItem.MedListCodg,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -86,7 +86,6 @@ func (this *DialysisAPIController) Scheduals() {
 	redis := service.RedisClient()
 	defer redis.Close()
 
-	// cur_date := time.Now().Format("2006-01-02")
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
 
 	scheduals_json_str, _ := redis.Get(key).Result()
@@ -105,6 +104,7 @@ func (this *DialysisAPIController) Scheduals() {
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())
 				assessmentBefores, _ := service.GetAllAssessmentBeforesByList(orgID, date.Unix())
 				dialysisOrders, _ := service.GetAllDialysisOrdersByList(orgID, date.Unix())
+
 				treatmentSummarys, _ := service.GetAllTreatmentSummarysByList(orgID, date.Unix())
 				AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByList(orgID, date.Unix())
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
@@ -325,209 +325,189 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	adminInfo := this.GetMobileAdminUserInfo()
 
+	ch := make(chan struct{})
+	count := 25 // count 表示活动的协程个数
+	var patient models.Patients
+	var receiverTreatmentAccess *models.ReceiveTreatmentAsses
+	var predialysisEvaluation *models.PredialysisEvaluation
+	var lastPredialysisEvaluation *models.PredialysisEvaluation
+	var doctorAdvices []*models.DoctorAdvice
+	var dialysisOrder *models.DialysisOrder
+	var doubleCheck *models.DoubleCheck
+	var monitorRecords []*models.MonitoringRecord
+	var lastMonitorRecord *models.MonitoringRecord
+	var assessmentAfterDislysis *models.AssessmentAfterDislysis
+	var lastAssessmentAfterDislysis *models.AssessmentAfterDislysis
+	var treatmentSummary *models.TreatmentSummary
+	var dialysisPrescribe *models.DialysisPrescription
+	var dialysisSolution *models.DialysisSolution
+	var lastDialysisPrescribe *models.DialysisPrescription
+	var systemDialysisPrescribe *models.SystemPrescription
+	var is_project_open_config models.XtHisProjectConfig
+	var projects []*models.HisPrescriptionProject
+	var stockType []*models.GoodsTypeOne
+	var prepare []*models.XtDialysisBeforePrepare
+	var lastAssessment models.XtPatientVascularAccess
+	var prescribeOne *models.DialysisPrescription
+	var lastDryWeightDislysis *models.SgjPatientDryweight
+	var gobalConfig models.GobalConfig
+	var operators []*models.SgjUserAdminRoles
+
 	// 先走redis，没有走数据库
-	patient, _ := service.FindPatientByIdWithDiseases(adminInfo.Org.Id, patientID)
+	schedual, _ := service.MobileGetSchedualDetailOne(adminInfo.Org.Id, patientID, date.Unix())
+	go func() {
+		patient, _ = service.FindPatientByIdWithDiseases(adminInfo.Org.Id, patientID)
+		ch <- struct{}{}
+	}()
 
-	//if getPatientErr != nil {
-	//	this.ErrorLog("获取患者信息失败：%v", getPatientErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//} else if patient.ID == 0 {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-	//	return
-	//}
+	go func() {
+		receiverTreatmentAccess, _ = service.MobileGetReceiverTreatmentAccessRecord(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	schedual, _ := service.MobileGetSchedualDetail(adminInfo.Org.Id, patientID, date.Unix())
+	go func() {
+		predialysisEvaluation, _ = service.MobileGetPredialysisEvaluation(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	//if getSchedualErr != nil {
-	//	this.ErrorLog("获取患者排班信息失败:%v", getSchedualErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		lastPredialysisEvaluation, _ = service.MobileGetLastTimePredialysisEvaluation(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	receiverTreatmentAccess, _ := service.MobileGetReceiverTreatmentAccessRecord(adminInfo.Org.Id, patientID, date.Unix())
-	//if getRTARErr != nil {
-	//	this.ErrorLog("获取接诊评估失败:%v", getRTARErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		doctorAdvices, _ = service.MobileGetDoctorAdvicesByGroups(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	predialysisEvaluation, _ := service.MobileGetPredialysisEvaluation(adminInfo.Org.Id, patientID, date.Unix())
-	//if getPEErr != nil {
-	//	this.ErrorLog("获取透前评估失败:%v", getPEErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		dialysisOrder, _ = service.MobileGetSchedualDialysisRecord(adminInfo.Org.Id, patientID, date.Unix())
 
-	// // 先走redis，没有走数据库
-	lastPredialysisEvaluation, _ := service.MobileGetLastTimePredialysisEvaluation(adminInfo.Org.Id, patientID, date.Unix())
-	//if getLPEErr != nil {
-	//	this.ErrorLog("获取上一次透前评估失败:%v", getLPEErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	doctorAdvices, _ := service.MobileGetDoctorAdvicesByGroups(adminInfo.Org.Id, patientID, date.Unix())
+	go func() {
+		doubleCheck, _ = service.MobileGetDoubleCheck(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	//if getDoctorAdvicesErr != nil {
-	//	this.ErrorLog("获取临时医嘱失败:%v", getDoctorAdvicesErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		monitorRecords, _ = service.MobileGetMonitorRecords(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	dialysisOrder, _ := service.MobileGetSchedualDialysisRecord(adminInfo.Org.Id, patientID, date.Unix())
-	//if getDialysisOrderErr != nil {
-	//	this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		lastMonitorRecord, _ = service.MobileGetLastMonitorRecord(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	doubleCheck, _ := service.MobileGetDoubleCheck(adminInfo.Org.Id, patientID, date.Unix())
-	//if getDoubleCheckErr != nil {
-	//	this.ErrorLog("获取双人核对记录失败:%v", getDoubleCheckErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		assessmentAfterDislysis, _ = service.MobileGetAssessmentAfterDislysis(adminInfo.Org.Id, patientID, date.Unix())
 
-	// // 先走redis，没有走数据库
-	monitorRecords, _ := service.MobileGetMonitorRecords(adminInfo.Org.Id, patientID, date.Unix())
-	//if getMonitorRecordsErr != nil {
-	//	this.ErrorLog("获取透析监测记录失败:%v", getMonitorRecordsErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
-	var lastMonitorRecord *models.MonitoringRecord
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	lastMonitorRecord, getLastErr := service.MobileGetLastMonitorRecord(adminInfo.Org.Id, patientID, date.Unix())
-	if getLastErr != nil {
-		this.ErrorLog("获取上一次透析的监测记录失败:%v", getLastErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	go func() {
+		lastAssessmentAfterDislysis, _ = service.MobileGetLastTimeAssessmentAfterDislysis(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	assessmentAfterDislysis, _ := service.MobileGetAssessmentAfterDislysis(adminInfo.Org.Id, patientID, date.Unix())
-	//if getAADErr != nil {
-	//	this.ErrorLog("获取透后评估失败:%v", getAADErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		treatmentSummary, _ = service.MobileGetTreatmentSummary(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	lastAssessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminInfo.Org.Id, patientID, date.Unix())
-	//if getLAADErr != nil {
-	//	this.ErrorLog("获取上一次透后评估失败:%v", getLAADErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		dialysisPrescribe, _ = service.MobileGetDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, date.Unix(), schedual.ModeId)
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	treatmentSummary, _ := service.MobileGetTreatmentSummary(adminInfo.Org.Id, patientID, date.Unix())
-	//if getTreatmentSummaryErr != nil {
-	//	this.ErrorLog("获取治疗小结失败:%v", getTreatmentSummaryErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		dialysisSolution, _ = service.MobileGetDialysisSolutionByModeId(adminInfo.Org.Id, patientID, schedual.ModeId)
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	dialysisPrescribe, _ := service.MobileGetDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, date.Unix(), schedual.ModeId)
-
-	// //if getDialysisPrescribeErr != nil {
-	// //	this.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
-	// //	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	// //	return
-	// //}
-
-	// // 先走redis，没有走数据库
-	dialysisSolution, _ := service.MobileGetDialysisSolutionByModeId(adminInfo.Org.Id, patientID, schedual.ModeId)
-	// //if getDialysisSolutionErr != nil {
-	// //	this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-	// //	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	// //	return
-	// //}
-
-	// // 先走redis，没有走数据库
-	lastDialysisPrescribe, _ := service.MobileGetLastDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, schedual.ModeId)
-	// //fmt.Println("上次透析处方",lastDialysisPrescribe.DialyzerPerfusionApparatus)
-	// //if getDialysisPrescribeErr != nil {
-	// //	this.ErrorLog("获取透析处方失败:%v", getDialysisPrescribeErr)
-	// //	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	// //	return
-	// //}
-
-	// //获取系统透析处方模版
-	// // 先走redis，没有走数据库
-	systemDialysisPrescribe, _ := service.MobileGetSystemDialysisPrescribeByModeId(adminInfo.Org.Id, schedual.ModeId)
-	// //if getSystemDialysisPrescribeErr != nil {
-	// //	this.ErrorLog("获取系统透析处方失败:%v", getSystemDialysisPrescribeErr)
-	// //	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	// //	return
-	// //}
-
-	// //dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminInfo.Org.Id, patientID)
-
-	// //operators, _ := service.GetAllAdminUserES(adminInfo.Org.Id, adminInfo.App.Id)
+	go func() {
+		lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeId(adminInfo.Org.Id, patientID, schedual.ModeId)
 
-	// 先走redis，没有走数据库
-	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	_, is_project_open_config := service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
+	go func() {
+		systemDialysisPrescribe, _ = service.MobileGetSystemDialysisPrescribeByModeId(adminInfo.Org.Id, schedual.ModeId)
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	projects, _ := service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+	go func() {
+		// 先走redis，没有走数据库
+		_, is_project_open_config = service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
+		ch <- struct{}{}
+	}()
 
-	// // 先走redis，没有走数据库
-	stockType, _ := service.GetStockType(adminInfo.Org.Id)
+	go func() {
+		// 先走redis，没有走数据库
+		projects, _ = service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	prepare, _ := service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
+	go func() {
+		// // 先走redis，没有走数据库
+		stockType, _ = service.GetStockType(adminInfo.Org.Id)
+		ch <- struct{}{}
+	}()
 
-	// //获取最后一次血管通路
-	// 先走redis，没有走数据库
-	lastAssessment, _ := service.GetLastPassWayAssessment(adminInfo.Org.Id, patientID)
+	go func() {
+		// 先走redis，没有走数据库
+		prepare, _ = service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	prescribeOne, _ := service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
-	var his_advices []*models.HisDoctorAdviceInfo
-	if is_open_config.IsOpen == 1 {
+	go func() {
+		// //获取最后一次血管通路
 		// 先走redis，没有走数据库
-		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
-	}
+		lastAssessment, _ = service.GetLastPassWayAssessment(adminInfo.Org.Id, patientID)
+		ch <- struct{}{}
+	}()
 
-	// if getLPEErr != nil {
-	// 	this.ErrorLog("获取上一次透前评估失败:%v", getLPEErr)
-	// 	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	// 	return
-	// }
+	go func() {
+		// 先走redis，没有走数据库
+		prescribeOne, _ = service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	lastDryWeightDislysis, _ := service.MobileGetLastDryWeight(adminInfo.Org.Id, patientID)
-	//if getDryErr != nil {
-	//	this.ErrorLog("获取最后一条干体重失败:%v", getDryErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
+	go func() {
+		// 先走redis，没有走数据库
+		lastDryWeightDislysis, _ = service.MobileGetLastDryWeight(adminInfo.Org.Id, patientID)
+		ch <- struct{}{}
+	}()
 
-	// //headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.Org.Id, adminInfo.App.Id, models.SpecialPermissionTypeHeadNurse)
+	go func() {
+		// 先走redis，没有走数据库
+		_, gobalConfig = service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	_, gobalConfig := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
-	// //goodTypes, _ := service.FindAllGoodTypeByType(1)          //查出所有库存配置的系统类型
-	// //goodInfos, _ := service.FindAllGoodInfo(adminInfo.Org.Id) //查出所有库存配置的系统类型
+	go func() {
+		// 先走redis，没有走数据库
+		operators, _ = service.GetAllStarfEs(adminInfo.Org.Id)
+		ch <- struct{}{}
+	}()
 
-	// 先走redis，没有走数据库
-	operators, _ := service.GetAllStarfEs(adminInfo.Org.Id)
+	for range ch {
+		// 每次从ch中接收数据，表明一个活动的协程结束
+		count--
+		// 当所有活动的协程都结束时，关闭管道
+		if count == 0 {
+			close(ch)
+		}
+	}
+	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
+	var his_advices []*models.HisDoctorAdviceInfo
+	if is_open_config.IsOpen == 1 {
+		// 先走redis，没有走数据库
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
+	}
 
-	//consumables, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patientID, date.Unix())
-	//lastConsumables, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patientID, date.Unix())
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -645,9 +625,13 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		service.AddSigleSummaryRecord(&summary)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summary"
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":treatment_summarys_list_all"
+		redis.Set(keyOne, "", time.Second)
+		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
 		c.ServeSuccessJSON(map[string]interface{}{
 			"summary": summary,
 		})
@@ -669,6 +653,15 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 		summary.Modifier = adminUserInfo.AdminUser.Id
 		summary.ID = treatmentSummary.ID
 		service.UpdateSummeRecord(&summary)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":treatment_summary"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":treatment_summarys_list_all"
+		redis.Set(keyOne, "", time.Second)
+		keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
 		c.ServeSuccessJSON(map[string]interface{}{
 			"summary": summary,
 		})
@@ -1119,10 +1112,12 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+		redis.Set(keyOne, "", time.Second)
+		defer redis.Close()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
@@ -1142,6 +1137,13 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
 		assessmentAfterDislysis.ID = assessmentAfter.ID
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
+		redis := service.RedisClient()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+		redis.Set(keyOne, "", time.Second)
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -1267,6 +1269,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
 	//if template.TemplateId == 2 || template.TemplateId == 6 {
@@ -1456,8 +1459,38 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		//清空key 值
 		redis.Set(key, "", time.Second)
 
+		keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+
+		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
+		//清空key 值
+		redis.Set(keyTwo, "", time.Second)
+
+		keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+		redis.Set(keySix, "", time.Second)
+
+		keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
+		redis.Set(keySeven, "", time.Second)
+
 		if err == nil {
 			updateErr := service.UpdateScheduleModeId(patient.ID, adminUserInfo.Org.Id, recordDate.Unix(), mode_id)
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe_by_mode"
+			//清空key 值
+			redis.Set(keyThree, "", time.Second)
+
+			keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":system_dialysis_prescribe"
+			//清空key 值
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":schedual_detail"
+			redis.Set(keyFive, "", time.Second)
+
+			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
+			redis.Set(keySeven, "", time.Second)
+
+			keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
 			if updateErr != nil {
 				utils.ErrorLog("%v", updateErr)
 			}
@@ -1509,8 +1542,21 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
+		keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		//清空key 值
+		redis.Set(keyOne, "", time.Second)
+
+		keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+		redis.Set(keySix, "", time.Second)
+
+		keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
+		redis.Set(keySeven, "", time.Second)
 		if err == nil {
 			updateErr := service.UpdateScheduleModeId(patient.ID, adminUserInfo.Org.Id, recordDate.Unix(), mode_id)
+			keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
 			if updateErr != nil {
 				utils.ErrorLog("%v", updateErr)
 			}
@@ -1591,14 +1637,14 @@ func (c *DialysisAPIController) Finish() {
 	}
 	fmt.Println(endmonitorRecords.UltrafiltrationVolume)
 
-	assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysis(adminUserInfo.Org.Id, id, recordDate.Unix())
+	assessmentAfterDislysis, getAADErr := service.MobileGetAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 	if getAADErr != nil {
 		c.ErrorLog("获取透后评估失败:%v", getAADErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
 
-	lastAssessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.Org.Id, id, recordDate.Unix())
+	lastAssessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 
 	_, dialysisOrder := service.FindDialysisRecordById(adminUserInfo.Org.Id, id, recordDate.Unix())
 
@@ -1614,7 +1660,7 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.PatientId = id
 		tempassessmentAfterDislysis.UserOrgId = adminUserInfo.Org.Id
 	}
-
+	fmt.Println("上机状态233323232232332322332233232323223", dialysisOrder.Stage)
 	if dialysisOrder.Stage == 1 {
 		temp_time := (float64(endDate.Unix()) - float64(dialysisOrder.StartTime)) / 3600
 		value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", temp_time), 64)
@@ -1623,7 +1669,7 @@ func (c *DialysisAPIController) Finish() {
 		c, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", b), 64)
 		hour, _ := strconv.ParseInt(fmt.Sprintf("%.0f", a), 10, 64)
 		minute, _ := strconv.ParseInt(fmt.Sprintf("%.0f", c*60), 10, 64)
-		fmt.Println(hour)
+		fmt.Println("323332322332323223232323232323232323", hour)
 		fmt.Println(minute)
 		tempassessmentAfterDislysis.ActualTreatmentHour = hour
 		tempassessmentAfterDislysis.ActualTreatmentMinute = minute
@@ -1648,7 +1694,7 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
 	}
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 {
 		evaluation, _ := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1657,6 +1703,11 @@ func (c *DialysisAPIController) Finish() {
 			}
 			fmt.Println("prew", pre)
 			getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			defer redis.Close()
 			fmt.Println(getNurseErr)
 		}
 		if evaluation.DiastolicBloodPressure == 0 {
@@ -1665,6 +1716,14 @@ func (c *DialysisAPIController) Finish() {
 				DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
 			}
 			getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
 			fmt.Println(getNurseErr)
 		}
 		if evaluation.PulseFrequency == 0 {
@@ -1673,6 +1732,13 @@ func (c *DialysisAPIController) Finish() {
 				PulseFrequency: evaluation.PulseFrequency,
 			}
 			getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
+
+			redis := service.RedisClient()
+			redis.Set(key, "", time.Second)
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+			redis.Set(keyOne, "", time.Second)
+			defer redis.Close()
 			fmt.Println(getNurseErr)
 		}
 	}
@@ -1768,6 +1834,17 @@ func (c *DialysisAPIController) Finish() {
 	}
 
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
+
+	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
+	redis := service.RedisClient()
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+	redis.Set(keyOne, "", time.Second)
+
+	keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_last"
+	redis.Set(keyTwo, "", time.Second)
+	defer redis.Close()
+	//清空key 值
+	redis.Set(key, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
@@ -1783,6 +1860,15 @@ func (c *DialysisAPIController) Finish() {
 	}
 	if dialysisOrder.Stage == 1 {
 		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id)
+
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
+		redis := service.RedisClient()
+		defer redis.Close()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+		redis.Set(keyOne, "", time.Second)
 		//结束时候透析次数加1
 		service.UpdateSolutionByPatientId(id)
 		dialysisOrder.Stage = 2
@@ -1906,15 +1992,6 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	nurse, getNurseErr = service.GetAdminUserByUserID(puncture_nurse)
-	//if getNurseErr != nil {
-	//	this.ErrorLog("获取护士失败:%v", getNurseErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//} else if nurse == nil {
-	//	this.ErrorLog("护士不存在")
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
 
 	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.Org.Id, bedID)
 	if getDeviceNumberErr != nil {
@@ -2049,6 +2126,10 @@ func (this *DialysisAPIController) StartDialysis() {
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
 
+		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		//清空key 值
+		redis.Set(keyTwo, "", time.Second)
+
 		if createErr != nil {
 			this.ErrorLog("上机失败：%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2098,7 +2179,6 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			if template.TemplateId == 43 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
-				fmt.Println("hhhh232332322323232332", ultrafiltration_rate)
 			}
 
 			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
@@ -2146,6 +2226,12 @@ func (this *DialysisAPIController) StartDialysis() {
 	// 如果当天有插入数据，则不再往透析纪录里插入数据
 	if newdialysisRecord.ID > 0 {
 		err := service.CreateMonitor(&record)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
+		redis := service.RedisClient()
+		defer redis.Close()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)
 			return
@@ -2164,9 +2250,11 @@ func (this *DialysisAPIController) StartDialysis() {
 	}()
 
 	this.ServeSuccessJSON(map[string]interface{}{
+
 		"dialysis_order": newdialysisRecord,
 		"monitor":        record,
 	})
+	return
 }
 
 func (c *DialysisAPIController) PostSolution() {
@@ -2278,6 +2366,8 @@ func (c *DialysisAPIController) PostSolution() {
 	epo := c.GetString("epo")
 	epo_count, _ := c.GetFloat("epo_count", 0)
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
+	pre_impulse := c.GetString("pre_impulse")
+	impulse, _ := strconv.ParseFloat(pre_impulse, 64)
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2383,6 +2473,7 @@ func (c *DialysisAPIController) PostSolution() {
 		Epo:                        epo,
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
+		PreImpulse:                 impulse,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2479,6 +2570,7 @@ func (c *DialysisAPIController) PostSolution() {
 		Epo:                        epo,
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
+		PreImpulse:                 impulse,
 	}
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
@@ -2494,6 +2586,17 @@ func (c *DialysisAPIController) PostSolution() {
 	redis.Set(soulution_key, "", time.Second)
 	//查询最近透析准备表里是否存在 透析器 灌流器
 
+	keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+	redis.Set(keyOne, "", time.Second)
+
+	keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":schedual_detail"
+	redis.Set(keyTwo, "", time.Second)
+
+	keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+	redis.Set(keyThree, "", time.Second)
+
+	keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_prescribe_by_mode"
+	redis.Set(keyFour, "", time.Second)
 	//splitStr := strings.Split(dialysis_dialyszers, ",")
 	//
 	//splitIrrigation := strings.Split(dialysis_irrigation, ",")
@@ -2851,12 +2954,33 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
 	redis := service.RedisClient()
-	defer redis.Close()
+
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":dialysis_order"
 	redis.Set(key, "", time.Second)
 	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+	fmt.Println("keyOne23332233223322332322332", keyOne)
 	//清空key 值
 	redis.Set(keyOne, "", time.Second)
+	scheduleDateStartOne := startDate.Format("2006-01-02")
+	keyTwo := "scheduals_" + scheduleDateStartOne + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+	fmt.Println("keyTwo2332323232233223232323", keyTwo)
+	redis.Set(keyTwo, "", time.Second)
+
+	keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":doctor_advices"
+	redis.Set(keyThree, "", time.Second)
+	keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":monitor_records"
+	redis.Set(keyFour, "", time.Second)
+
+	keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":patient_info"
+	redis.Set(keyFive, "", time.Second)
+
+	keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":his_doctor_advice"
+	redis.Set(keySix, "", time.Second)
+
+	keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":device_list_all"
+	redis.Set(keySeven, "", time.Second)
+
+	defer redis.Close()
 	if updateErr != nil {
 		this.ErrorLog("修改上机失败：%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2935,6 +3059,14 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 	}
 
 	updateErr := service.ModifyFinishDialysisOrder(dialysisRecord)
+	redis := service.RedisClient()
+	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":dialysis_order"
+	//清空key 值
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+	//清空key 值
+	redis.Set(keyOne, "", time.Second)
+	redis.Close()
 	if updateErr != nil {
 		c.ErrorLog("修改下机失败：%v", updateErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2949,6 +3081,20 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 		hour, _ := strconv.ParseInt(fmt.Sprintf("%.0f", a), 10, 64)
 		minute, _ := strconv.ParseInt(fmt.Sprintf("%.0f", tempMinute*60), 10, 64)
 		updateAssessmentErr := service.UpdateAssessmentAfterDate(tempDialysisRecords.PatientId, tempDialysisRecords.UserOrgId, tempDialysisRecords.DialysisDate, hour, minute)
+
+		redis := service.RedisClient()
+		keyTen := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":assessment_after_dislysis"
+		redis.Set(keyTen, "", time.Second)
+
+		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(tempDialysisRecords.PatientId, 10) + ":" + strconv.FormatInt(tempDialysisRecords.DialysisDate, 10) + ":assessment_after_dislysis_last"
+		redis.Set(keyTwo, "", time.Second)
+
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+
+		redis.Set(key, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+		redis.Set(keyThree, "", time.Second)
+		defer redis.Close()
 		if updateAssessmentErr != nil {
 			utils.ErrorLog("%v", updateAssessmentErr)
 		}
@@ -2965,7 +3111,7 @@ func (c *DialysisAPIController) GetLongAdvice() {
 	patient_id, _ := c.GetInt64("id")
 	adminUserInfo := c.GetMobileAdminUserInfo()
 	_, config := service.FindDoctorAdviceRecordByOrgId(adminUserInfo.Org.Id)
-
+	_, hisConfig := service.FindXTHisRecordByOrgId(adminUserInfo.Org.Id)
 	//patient, _ := service.FindPatientIsOpenRemindById(patient_id, adminUserInfo.Org.Id)
 	if config.IsOpenRemind == 0 { //针对老用户，即没开启推送功能，也没有	不开启推送功能，不做任何处理
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -2975,9 +3121,9 @@ func (c *DialysisAPIController) GetLongAdvice() {
 	} else { //开启推送提醒
 		//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
 		var advice_three []*models.DoctorAdvice
-		//groupNo := service.GetMaxLongAdviceGroupID(adminUserInfo.Org.Id, patient_id)
-		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.Org.Id, patient_id)
-		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.Org.Id, patient_id)
+
+		advices, err := service.GetLastLongAdviceByGroupNoOne(adminUserInfo.Org.Id, patient_id)
+		advices_two, err := service.GetLastLongAdviceByGroupNoFour(adminUserInfo.Org.Id, patient_id)
 
 		for _, advice := range advices {
 			if advice.FrequencyType == 3 {
@@ -3042,10 +3188,11 @@ func (c *DialysisAPIController) GetLongAdvice() {
 		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"status":         "2",
-				"advices":        advices,
-				"advices_two":    RemoveRepeatedElement(advice_three),
-				"is_open_remind": config.IsOpenRemind,
+				"status":          "2",
+				"advices":         advices,
+				"advices_two":     RemoveRepeatedElement(advice_three),
+				"is_open_remind":  config.IsOpenRemind,
+				"his_config_open": hisConfig.IsOpen,
 			})
 		}
 	}
@@ -3352,9 +3499,15 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 		list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+		keyThree := "scheduals_" + adviceDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+		defer redis.Close()
+		redis.Set(keyThree, "", time.Second)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 			return
@@ -3398,7 +3551,18 @@ func (c *DialysisAPIController) UploadDryWeight() {
 			UserId:        adminUserInfo.AdminUser.Id,
 		}
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
-
+		redis := service.RedisClient()
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+		loc, _ := time.LoadLocation("Local")
+		nowTime := time.Now()
+		nowDay := nowTime.Format("2006-01-02")
+		dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
+		redis.Set(key, "", time.Second)
+		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":last_dry_weight"
+		redis.Set(keyTwo, "", time.Second)
+		redis.Close()
 		if createErr == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "提交成功",
@@ -3431,6 +3595,18 @@ func (c *DialysisAPIController) UploadDryWeight() {
 		}
 
 		createErr := service.CreatePatientWeightAdjust(dryWeight)
+		redis := service.RedisClient()
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+		redis.Set(keyOne, "", time.Second)
+		loc, _ := time.LoadLocation("Local")
+		nowTime := time.Now()
+		nowDay := nowTime.Format("2006-01-02")
+		dayTime, _ := time.ParseInLocation("2006-01-02 15:04:05", nowDay+" 00:00:00", loc)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dayTime.Unix(), 10) + ":assessment_before_dislysis"
+		redis.Set(key, "", time.Second)
+		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":last_dry_weight"
+		redis.Set(keyTwo, "", time.Second)
+		redis.Close()
 		if createErr == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "提交成功",
@@ -3483,7 +3659,7 @@ func (c *DialysisAPIController) GetSchedule() {
 func (c *DialysisAPIController) GetPatientId() {
 
 	id, _ := c.GetInt64("id")
-
+	//orgid := c.GetMobileAdminUserInfo().Org.Id
 	patientId, _ := service.GetPatientId(id)
 	//获取该患者的所有传染病
 	list, _ := service.GetPatientInfectious(id)
@@ -4604,12 +4780,21 @@ func (c *DialysisAPIController) GetMobilePrintStockGood() {
 }
 
 func (c *DialysisAPIController) BatchDeleteMonitor() {
-	fmt.Println("jin2222245555555555")
+
 	ids := c.GetString("ids")
-	fmt.Println("dis22222222", ids)
+	//patient_id, _ := c.GetInt64("patient_id")
+	//monitoring_date, _ := c.GetInt64("monitoring_date")
 	idArray := strings.Split(ids, ",")
 	err := service.BatchDeleteMonitor(idArray)
 	fmt.Print("err", err)
+	//orgid := c.GetMobileAdminUserInfo().Org.Id
+	//redis := service.RedisClient()
+	//key := strconv.FormatInt(orgid, 10) + ":" + ":monitor_record_list_all"
+	//redis.Set(key, "", time.Second)
+	//keyOne := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(monitoring_date, 10) + ":monitor_records"
+	//redis.Set(keyOne, "", time.Second)
+	//fmt.Println("keyo呢32332322332332232332",keyOne)
+	//redis.Close()
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "批量删除成功",
 	})

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -170,9 +170,11 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	err := service.CreateMonitor(&record)
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()
-	defer redis.Close()
 	//清空key 值
 	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + ":monitor_record_list_all"
+	redis.Set(keyOne, "", time.Second)
+	defer redis.Close()
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorCreate)
 		return
@@ -332,9 +334,13 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	err = service.UpdateMonitor(monitor)
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()
-	defer redis.Close()
 	//清空key 值
 	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + ":monitor_record_list_all"
+	redis.Set(keyOne, "", time.Second)
+
+	defer redis.Close()
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorUpdate)
 		return
@@ -372,6 +378,15 @@ func (this *DialysisAPIController) DeleteMonitor() {
 		return
 	}
 	err := service.DisableMonitor(adminInfo.Org.Id, patientID, recordID, adminInfo.AdminUser.Id)
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	redis := service.RedisClient()
+	key := strconv.FormatInt(orgid, 10) + ":" + ":monitor_record_list_all"
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":monitor_records"
+	redis.Set(keyOne, "", time.Second)
+	fmt.Println("keyo呢32332322332332232332", keyOne)
+	redis.Close()
+
 	if err != nil {
 		this.ErrorLog("删除透析监测记录失败：%v", err)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
@@ -485,7 +500,30 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 				UpdatedTime:  time.Now().Unix(),
 			}
 			createErr := service.CreateSchedule(newSchedule)
+			redis := service.RedisClient()
+
+			//处方
+			keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+			redis.Set(keyOne, "", time.Second)
 
+			//医嘱
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+			redis.Set(keySix, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+			redis.Set(keyThree, "", time.Second)
+
+			keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":monitor_record_list_all"
+			redis.Set(keyFour, "", time.Second)
+
+			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":treatment_summarys_list_all"
+			redis.Set(keyFive, "", time.Second)
+
+			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+			redis.Set(keySeven, "", time.Second)
+			redis.Close()
 			if createErr != nil {
 				this.ErrorLog("紧急排班失败:%v", createErr)
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateScheduleFail)
@@ -522,6 +560,29 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 					daySchedule.ScheduleType = scheduleType
 					daySchedule.UpdatedTime = time.Now().Unix()
 					err := service.UpdateSchedule(&daySchedule)
+					redis := service.RedisClient()
+					//处方
+					keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":prescriptions_list_all"
+					redis.Set(keyOne, "", time.Second)
+
+					//医嘱
+					keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+					redis.Set(keyTwo, "", time.Second)
+
+					keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+					redis.Set(keySix, "", time.Second)
+					keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
+					redis.Set(keyThree, "", time.Second)
+
+					keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":monitor_record_list_all"
+					redis.Set(keyFour, "", time.Second)
+
+					keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":treatment_summarys_list_all"
+					redis.Set(keyFive, "", time.Second)
+
+					keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+					redis.Set(keySeven, "", time.Second)
+					redis.Close()
 					if err != nil {
 						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 						return

controllers/mobile_api_controllers/patient_api_controller.go

@@ -240,7 +240,12 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 
 	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()
+	defer redis.Close()
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+	redis.Set(keyOne, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return
@@ -255,11 +260,13 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 
 func (c *PatientApiController) EditDoctorAdvice() {
 	id, _ := c.GetInt64("id", 0)
+	patient_id, _ := c.GetInt64("patient_id")
+	doc_advice_date, _ := c.GetInt64("advice_date")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-
+	redis := service.RedisClient()
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -306,17 +313,34 @@ func (c *PatientApiController) EditDoctorAdvice() {
 			//判断前端上传上来的开始时间和数据库中想要修改的那条医嘱的开始时间是否相同，如果不同，需要修改子医嘱的开始时间，如果相同直接修改，不需要修改子医嘱的开始时间
 			if advice.StartTime == sourceAdvice.StartTime {
 				err = service.UpdateDoctorAdvice(&advice)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+				defer redis.Close()
+				redis.Set(key, "", time.Second)
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+				redis.Set(keyOne, "", time.Second)
 				isChangeGroup = false
 			} else {
 				err = service.UpdateDoctorAdviceAndSubAdvice(&advice)
 				isChangeGroup = false
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
+				defer redis.Close()
+				redis.Set(key, "", time.Second)
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+				redis.Set(keyOne, "", time.Second)
 			}
 		} else if len(adviceSlice) > 1 {
 
 			//判断前端上传上来的开始时间和数据库中想要修改的那条医嘱的开始时间是否相同，如果不同，需要重新分配组，如果相同直接修改，不需要分配组
 			if advice.StartTime == sourceAdvice.StartTime {
 				err = service.UpdateDoctorAdvice(&advice)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+				defer redis.Close()
+				redis.Set(key, "", time.Second)
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+				redis.Set(keyOne, "", time.Second)
 				isChangeGroup = false
 
 			} else {
@@ -324,6 +348,12 @@ func (c *PatientApiController) EditDoctorAdvice() {
 				gruopNo = gruopNo + 1
 				advice.GroupNo = gruopNo
 				err = service.UpdateDoctorAdviceAndSubAdvice(&advice)
+				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+				defer redis.Close()
+				redis.Set(key, "", time.Second)
+				keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+				redis.Set(keyOne, "", time.Second)
 				isChangeGroup = true
 
 			}
@@ -331,6 +361,13 @@ func (c *PatientApiController) EditDoctorAdvice() {
 	} else {
 		isChangeGroup = false
 		err = service.UpdateDoctorAdvice(&advice)
+		redis := service.RedisClient()
+		defer redis.Close()
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+		redis.Set(keyOne, "", time.Second)
+
 	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
@@ -510,6 +547,7 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 
 func (c *PatientApiController) ExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
+
 	origin, _ := c.GetInt64("origin", 0)
 	groupno, _ := c.GetInt64("groupno", -1)
 
@@ -587,14 +625,35 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			err = service.ExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
-			defer redis.Close()
 			//清空key 值
 			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			toTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", execution_time)
+			theTime := toTime.Format("2006-01-02")
+
+			fmt.Println("theTIME", theTime)
+			keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			fmt.Println("keyFour323223323232323232", keyFour)
+			redis.Set(keyFour, "", time.Second)
+			defer redis.Close()
 		} else {
 
 			err = service.BatchExceOldDoctorAdvice(&advices, ids)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			toTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", execution_time)
+			theTime := toTime.Format("2006-01-02")
+			fmt.Println("theTIME", theTime)
+			keyFour := "scheduals_" + theTime + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			fmt.Println("keyFour323223323232323232", keyFour)
+			redis.Set(keyFour, "", time.Second)
 			defer redis.Close()
 			//清空key 值
 			redis.Set(key, "", time.Second)
@@ -904,9 +963,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			err = service.SaveHisDoctorAdvice(item)
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
-			defer redis.Close()
 			//清空key 值
 			redis.Set(key, "", time.Second)
+			keyTwo := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			keyFour := "scheduals_" + execution_time + "_" + strconv.FormatInt(adminInfo.Org.Id, 10)
+			redis.Set(keyFour, "", time.Second)
+			defer redis.Close()
 		}
 
 		if err == nil {
@@ -1570,14 +1635,18 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 	// 	}
 	// }
-	fmt.Println("hh233232323232evaluation", evaluation)
+
 	err = service.UpadatePredialysisEvaluation(&evaluation)
-	fmt.Println("除非3333223323233232323323232", err)
+
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_before_dislysis"
 	redis := service.RedisClient()
 	defer redis.Close()
 	//清空key 值
 	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_befores_list_all"
+	redis.Set(keyOne, "", time.Second)
+	keyTwo := "scheduals_" + assessmentDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+	redis.Set(keyTwo, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
@@ -2120,9 +2189,10 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		evaluation.PunctureNeedle = punctureNeedle
 	}
 
-	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "float64" {
+	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "string" {
 
 		humor_excessive_symptom, _ := dataBody["humor_excessive_symptom"].(string)
+
 		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
 	}
 
@@ -2203,6 +2273,10 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		evaluation.BloodPressureDuringDialysis = blood_pressure_during_dialysis
 	}
 
+	if dataBody["pre_dialysis_drugs"] != nil && reflect.TypeOf(dataBody["pre_dialysis_drugs"]).String() == "string" {
+		pre_dialysis_drugs := dataBody["pre_dialysis_drugs"].(string)
+		evaluation.PreDialysisDrugs = pre_dialysis_drugs
+	}
 	return
 }
 
@@ -2542,6 +2616,7 @@ func (c *PatientApiController) GetPatientMonitor() {
 	adminInfo := c.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
 	monitor, err := service.GetMonitorRecord(orgID, theStartTime, partition, patient_id)
+
 	if err != nil {
 		c.ErrorLog("获取排班信息失败:%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2615,12 +2690,10 @@ func (c *PatientApiController) GetPatientMonitor() {
 						break
 					}
 				}
-				records := make([]*models.VMMonitoringRecord, 0)
-				// 透析监测
+
 				for _, it := range monitorlist {
-					records := append(records, it)
 					if item.PatientId == it.PatientId {
-						monitor[key].MonitoringRecord = records
+						monitor[key].MonitoringRecord = append(monitor[key].MonitoringRecord, it)
 					}
 				}
 
@@ -2836,7 +2909,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			advice.CheckState = item.CheckState
 			advice.ExecutionState = item.ExecutionState
 			advice.ExecutionStaff = item.ExecutionStaff
-			advice.PrescribingNumber = float64(item.Count)
+			//advice.PrescribingNumber = float64(item.Count)
 			advice.PrescribingNumberUnit = item.Unit
 			advice.AdviceDoctor = item.Doctor
 			if item.Type == 3 {
@@ -3097,9 +3170,12 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		newAdvices, createErr := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, group_no)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
-		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+
+		defer redis.Close()
 		if createErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 			return
@@ -3125,26 +3201,6 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 			return
 		}
-		//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-
-		//if appRole.UserType == 3{
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdvicePermissionDeniedModify)
-		//	return
-		//}
-
-		//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-		//
-		//if appRole.UserType == 3 {
-		//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//	if getPermissionErr != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//		return
-		//	} else if headNursePermission == nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//		return
-		//	}
-		//}
-
 		var advice models.DoctorAdvice
 		code := adviceFormData(&advice, c.Ctx.Input.RequestBody, "create")
 		if code > 0 {
@@ -3185,6 +3241,14 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 
 		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()
+		//清空key 值
+		redis.Set(key, "", time.Second)
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		redis.Set(keyOne, "", time.Second)
+		fmt.Println("key`2232333332233223233232", key)
+		defer redis.Close()
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 			return
@@ -3298,7 +3362,9 @@ func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, jso
 func (c *PatientApiController) DelDoctorAdvice() {
 	groupno, _ := c.GetInt64("groupno", -1)
 	is_sub, _ := c.GetInt64("is_sub", -1) //是否子药
-
+	patient_id, _ := c.GetInt64("patient_id")
+	doc_advice_date, _ := c.GetInt64("advice_date")
+	redis := service.RedisClient()
 	if is_sub == 1 { //是
 
 		advice_id, _ := c.GetInt64("advice_id")
@@ -3314,6 +3380,15 @@ func (c *PatientApiController) DelDoctorAdvice() {
 		advice.Modifier = adminUserInfo.AdminUser.Id
 
 		err := service.DeleteDoctorAdvice(&advice)
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+		redis.Set(key, "", time.Second)
+
+		keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+		redis.Set(keyTwo, "", time.Second)
+		keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":his_doctor_advice"
+		redis.Set(keyThree, "", time.Second)
+		redis.Close()
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteAdviceFail)
 			return
@@ -3366,9 +3441,30 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 		var err error
 		if groupno > 0 {
+
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+			fmt.Println("key2332323223323232323232323", key)
+
+			redis.Set(key, "", time.Second)
+
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
 		} else {
+
 			err = service.BatchDeleteDoctorAdvice(ids, adminUserInfo.AdminUser.Id)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
+
+			redis.Set(key, "", time.Second)
+			fmt.Println("key2332323223323232323232323", key)
+			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":advice_list_all"
+			fmt.Println("key2332323223323232323232323", keyTwo)
+			redis.Set(keyTwo, "", time.Second)
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":his_doctor_advice"
+			redis.Set(keyThree, "", time.Second)
+			redis.Close()
 		}
 
 		if err != nil {

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -270,12 +270,14 @@ func (c *MobileHisApiController) DeletePrescription() {
 	projects, _ := service.GetHisPrescriptionProjectsByID(prescription_id)
 	advices, _ := service.GetHisPrescriptionAdviceByID(prescription_id)
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
-	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetMobileAdminUserInfo().Org.Id)
 
 	err := service.DelelteHisPrescription(prescription_id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
 		if len(projects) > 0 {
 			for _, item := range projects {
+				service.DeletePrintInfo(item.ID)
+
 				if item.Type == 3 { //处理透前准备耗材数量数据
 					consumables, _ := service.FindHisConsumablesByID(item.UserOrgId, item.PatientId, item.RecordDate, item.ProjectId)
 					if consumables.ID > 0 {
@@ -287,7 +289,7 @@ func (c *MobileHisApiController) DeletePrescription() {
 				if stockConfig.IsOpen == 1 {
 					if item.Type == 3 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
-						f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(item.Count), 10), 64)
+						f_count, _ := strconv.ParseFloat(item.Count, 64)
 						good.Total = good.Total + f_count
 						service.UpdateGoodInfo(&good)
 					}
@@ -361,10 +363,11 @@ func (c *MobileHisApiController) DeleteProject() {
 
 	err := service.DelelteProject(id, c.GetMobileAdminUserInfo().Org.Id)
 	if err == nil {
+		service.DeletePrintInfo(id)
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total + f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -762,7 +765,8 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 							if p.Type == 3 { //处理透前准备耗材数量数据
 								consumables, _ := service.FindHisConsumablesByID(adminInfo.Org.Id, patient_id, recordDateTime, p.ProjectId)
 								if consumables.ID > 0 {
-									consumables.Count = int64(p.Count)
+									cnt, _ := strconv.ParseInt(p.Count, 10, 64)
+									consumables.Count = cnt
 									service.UpdateConsumables(&consumables)
 								}
 							}
@@ -1086,8 +1090,8 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -1127,7 +1131,7 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 		if stockConfig.IsOpen == 1 {
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
-				f_count, _ := strconv.ParseFloat(strconv.FormatInt(int64(project.Count), 10), 64)
+				f_count, _ := strconv.ParseFloat(project.Count, 64)
 				good.Total = good.Total - f_count
 				service.UpdateGoodInfo(&good)
 			}
@@ -1140,12 +1144,18 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 			if project.Type == 3 {
 				good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 				if project.Count < temp_project.Count {
-					other_count := temp_project.Count - project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_two - f_count_one
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total + other_count_two
 					service.UpdateGoodInfo(&good)
 				} else if project.Count > temp_project.Count {
-					other_count := project.Count - temp_project.Count
+					f_count_one, _ := strconv.ParseFloat(project.Count, 64)
+					f_count_two, _ := strconv.ParseFloat(temp_project.Count, 64)
+
+					other_count := f_count_one - f_count_two
 					other_count_two, _ := strconv.ParseFloat(strconv.FormatInt(int64(other_count), 10), 64)
 					good.Total = good.Total - other_count_two
 					service.UpdateGoodInfo(&good)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -189,14 +189,13 @@ func (this *NewDialysisApiController) SavePatient() {
 		id, _ := strconv.ParseInt(contagion.(string), 10, 64)
 		ids = append(ids, id)
 	}
-	fmt.Print("传染病2", contagions)
+
 	is_infectious := int64(dataBody["is_infectious"].(float64))
-	fmt.Print("传染病", is_infectious)
+
 	adminssionNumber := dataBody["admissionNumber"].(string)
-	fmt.Print("住院号", adminssionNumber)
 
 	fistdate := dataBody["fistDate"].(string)
-	fmt.Print("首次透析日期", fistdate)
+
 	timeLayouts := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	times, err := time.ParseInLocation(timeLayouts+" 15:04:05", fistdate+" 00:00:00", loc)
@@ -205,14 +204,14 @@ func (this *NewDialysisApiController) SavePatient() {
 	fmt.Print(fisttime)
 
 	diagonse := dataBody["diagnose"].(string)
-	fmt.Print("诊断", diagonse)
+
 	avatar := dataBody["avatar"].(string)
-	fmt.Print("头像", avatar)
+
 	//慢性病
 	requipmentId := dataBody["requipmentId"].(string)
-	fmt.Print("设备ID", requipmentId)
+
 	slowContagions := dataBody["resultThree"].([]interface{})
-	fmt.Print("慢性传染病", slowContagions)
+
 	idss := make([]int64, 0)
 	for _, contagion := range slowContagions {
 		id, _ := strconv.ParseInt(contagion.(string), 10, 64)
@@ -224,25 +223,23 @@ func (this *NewDialysisApiController) SavePatient() {
 		id, _ := strconv.ParseInt(contagion.(string), 10, 64)
 		idsss = append(ids, id)
 	}
-	fmt.Print("慢性病", slowDiseases)
 
 	bloodPatient := int64(dataBody["bloodPatient"].(float64))
-	fmt.Print("血透病人", bloodPatient)
+
 	slowpatient := int64(dataBody["slowPatient"].(float64))
-	fmt.Print("慢病病人", slowpatient)
+
 	memberpatient := int64(dataBody["memberPatient"].(float64))
-	fmt.Print("会员病人", memberpatient)
+
 	//会员
 	memberFistDate := dataBody["memberFistDate"].(string)
-	fmt.Print("首次透析日期", memberFistDate)
+
 	//membertimes, err := utils.ParseTimeStringToTime(timeLayout, memberFistDate+"00:00:00")
 	membertimes, _ := time.ParseInLocation(timeLayouts+" 15:04:05", memberFistDate+" 00:00:00", loc)
 	memtime := membertimes.Unix()
-	fmt.Print("会员透析日期", memtime)
+
 	patient_type := int64(dataBody["patientType"].(float64))
-	fmt.Print("病种", patient_type)
+
 	treatmentmethod := int64(dataBody["treatmentMethod"].(float64))
-	fmt.Print("治疗方式", treatmentmethod)
 
 	//查询身份证号码是否存在
 	thisPatientOne, _ := service.FindPatientByIdCardNoFive(orgid, idCard)
@@ -296,7 +293,6 @@ func (this *NewDialysisApiController) SavePatient() {
 		err = service.CreateOldPatient(&patients)
 		fmt.Print("报错", err)
 		patient, err := service.GetLastOldPatient(orgid)
-		fmt.Print("病人ID", patient.ID)
 		//添加转归
 		patientLapseto := models.PatientLapseto{
 			LapsetoType: lapseto,
@@ -336,6 +332,11 @@ func (this *NewDialysisApiController) SavePatient() {
 			RelativePhone:     relative_phone,
 		}
 		err = service.CreateNewPatient(&patientsNew)
+		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.ID, 10) + ":patient_info"
+		redis := service.RedisClient()
+		defer redis.Close()
+		//清空key 值
+		redis.Set(key, "", time.Second)
 		fmt.Print("报错", err)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1234,55 +1235,46 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
-	fmt.Print("机构ID", orgid)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Print("err", err)
 	id := int64(dataBody["id"].(float64))
-	fmt.Print("id", id)
 	name := dataBody["name"].(string)
-	fmt.Println("姓名", name)
 	sex := int64(dataBody["sex"].(float64))
-	fmt.Print("性别", sex)
 	idCard := dataBody["idCard"].(string)
-	fmt.Print("身份证", idCard)
 	birthday := dataBody["birthday"].(string)
 	births := strings.Split(birthday, "-")
-	fmt.Print("生日", birthday)
 	birYear, _ := strconv.Atoi(births[0])
 	age := time.Now().Year() - birYear
 	ages := int64(age)
-	fmt.Println("age是多少", ages)
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
 	birth := theTime.Unix()
 	fmt.Print(birth)
 	phone := dataBody["phone"].(string)
-	fmt.Print("电话号码", phone)
 	relative_phone := dataBody["relative_phone"].(string)
 	patientType := dataBody["result"].([]interface{})
 	fmt.Print("患者标签", patientType)
 	dialysis := dataBody["dialysis"].(string)
-	fmt.Print("透析号", dialysis)
+
 	patientsoure := int64(dataBody["patientsoure"].(float64))
-	fmt.Print("患者来源", patientsoure)
+
 	lapseto := int64(dataBody["lapseto"].(float64))
-	fmt.Print("留置状态", lapseto)
+
 	contagions := dataBody["resultTwo"].([]interface{})
-	fmt.Print("传染病", contagions)
+
 	ids := make([]int64, 0)
 	for _, contagion := range contagions {
 		id, _ := strconv.ParseInt(contagion.(string), 10, 64)
 		ids = append(ids, id)
 	}
-	fmt.Print("传染病2", contagions)
+
 	is_infectious := int64(dataBody["is_infectious"].(float64))
-	fmt.Print("传染病", is_infectious)
+
 	adminssionNumber := dataBody["admissionNumber"].(string)
-	fmt.Print("住院号", adminssionNumber)
 
 	fistdate := dataBody["fistDate"].(string)
-	fmt.Print("首次透析日期", fistdate)
+
 	timeLayouts := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	times, err := time.ParseInLocation(timeLayouts+" 15:04:05", fistdate+" 00:00:00", loc)
@@ -1291,14 +1283,14 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 	fmt.Print(fisttime)
 
 	diagonse := dataBody["diagnose"].(string)
-	fmt.Print("诊断", diagonse)
+
 	avatar := dataBody["avatar"].(string)
-	fmt.Print("头像", avatar)
+
 	//慢性病
 	requipmentId := dataBody["requipmentId"].(string)
-	fmt.Print("设备ID", requipmentId)
+
 	slowContagions := dataBody["resultThree"].([]interface{})
-	fmt.Print("慢性传染病", slowContagions)
+
 	idss := make([]int64, 0)
 	for _, contagion := range slowContagions {
 		id, _ := strconv.ParseInt(contagion.(string), 10, 64)
@@ -1312,27 +1304,26 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		idsss = append(ids, id)
 	}
 	fmt.Print("idsss", idsss)
-	fmt.Print("慢性病", slowDiseases)
+
 	bloodPatient := int64(dataBody["bloodPatient"].(float64))
-	fmt.Print("血透病人", bloodPatient)
+
 	slowpatient := int64(dataBody["slowPatient"].(float64))
-	fmt.Print("慢病病人", slowpatient)
+
 	memberpatient := int64(dataBody["memberPatient"].(float64))
-	fmt.Print("会员病人", memberpatient)
+
 	//会员
 	memberFistDate := dataBody["memberFistDate"].(string)
-	fmt.Print("首次透析日期", memberFistDate)
+
 	//membertimes, err := utils.ParseTimeStringToTime(timeLayout, memberFistDate+"00:00:00")
 	membertimes, _ := time.ParseInLocation(timeLayouts+" 15:04:05", memberFistDate+" 00:00:00", loc)
 	memtime := membertimes.Unix()
-	fmt.Print("会员透析日期", memtime)
+
 	patient_type := int64(dataBody["patientType"].(float64))
-	fmt.Print("病种", patient_type)
+
 	treatmentmethod := int64(dataBody["treatmentMethod"].(float64))
-	fmt.Print("治疗方式", treatmentmethod)
 
 	deathtime := dataBody["death_time"].(string)
-	fmt.Print("首次透析日期", deathtime)
+
 	deathtimes, err := time.ParseInLocation(timeLayouts+" 15:04:05", deathtime+" 00:00:00", loc)
 	//times, err := utils.ParseTimeStringToTime(timeLayout, fistdate+"00:00:00")
 	death_time := deathtimes.Unix()
@@ -1366,7 +1357,6 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 		//查询号透析号是否相同
 		thisPatientother, _ := service.FindPatientByDialysisNoOne(orgid, dialysis, id)
 		if thisPatientother.ID > 0 && thisPatientother.ID != patient.BloodId {
-			fmt.Println("进来没有")
 			returnData := make(map[string]interface{}, 0)
 			returnData["msg"] = "透析号码已存在"
 			this.ServeSuccessJSON(returnData)
@@ -1396,12 +1386,11 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			RelativePhone:     relative_phone,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
-		//patientLapseto := models.PatientLapseto{
-		//	LapsetoType: lapseto,
-		//	LapsetoTime: time.Now().Unix(),
-		//	UpdatedTime: time.Now().Unix(),
-		//}
-		//err = service.UpdatePatientLapseto(patient.BloodId, patientLapseto)
+		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.BloodId, 10) + ":patient_info"
+		redis := service.RedisClient()
+		defer redis.Close()
+		//清空key 值
+		redis.Set(key, "", time.Second)
 		fmt.Println("编辑转归失败", err)
 		patientsNew := models.XtPatientsNew{
 			ID:                id,

controllers/patient_api_controller.go

@@ -1414,7 +1414,12 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	}
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
-
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	redis.Set(keyOne, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return
@@ -1497,6 +1502,12 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 
 	err := service.CreateDoctorAdvice(&advice)
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	redis.Set(keyOne, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return
@@ -2199,6 +2210,12 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
 	err := service.UpdateDoctorAdvice(&advice)
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+	redis.Set(keyOne, "", time.Second)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
 		return

controllers/schedule_api_controller.go

@@ -367,13 +367,33 @@ func (c *ScheduleApiController) CreateSchedule() {
 	}
 
 	redis := service.RedisClient()
-	defer redis.Close()
 	err = service.CreateSchedule(&schedule)
-
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+
 	redis.Set(key, "", time.Second)
+	//处方
+	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":prescriptions_list_all"
+	redis.Set(keyOne, "", time.Second)
+
+	//医嘱
+	keyTwo := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":advice_list_all"
+	redis.Set(keyTwo, "", time.Second)
 
+	keySix := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_befores_list_all"
+	redis.Set(keySix, "", time.Second)
+	keyThree := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":assessment_after_dislysis_list_all"
+	redis.Set(keyThree, "", time.Second)
+
+	keyFour := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":monitor_record_list_all"
+	redis.Set(keyFour, "", time.Second)
+
+	keyFive := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":treatment_summarys_list_all"
+	redis.Set(keyFive, "", time.Second)
+
+	keySeven := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + ":dialysis_orders_list_all"
+	redis.Set(keySeven, "", time.Second)
 	fmt.Println(err)
+	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateScheduleFail)
 		return

models/good_models.go

@@ -79,6 +79,7 @@ type GoodInfo struct {
 	Total                       float64              `gorm:"column:total" json:"total" form:"total"`
 	StWarehousingInfo           []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
 	CancelStockInfo             []*CancelStockInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
+	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (GoodInfo) TableName() string {

models/his_charge_models.go

@@ -1,14 +1,14 @@
 package models
 
 type HisChargePrescriptionProject struct {
-	ID         int64 `gorm:"column:id" json:"id" form:"id"`
-	ProjectId  int64 `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status     int64 `gorm:"column:status" json:"status" form:"status"`
-	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count      int64 `gorm:"column:count" json:"count" form:"count"`
-	Type       int64 `gorm:"column:type" json:"type" form:"type"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count      string `gorm:"column:count" json:"count" form:"count"`
+	Type       int64  `gorm:"column:type" json:"type" form:"type"`
 
 	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
@@ -172,8 +172,34 @@ type HisChargeGoodInfo struct {
 	GoodName           string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	GoodUnit           int64  `gorm:"column:good_unit" json:"good_unit"`
 	SpecificationnName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	RegisterNumber     string `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (HisChargeGoodInfo) TableName() string {
 	return "xt_good_information"
 }
+
+type HisLabelPrintInfo struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number      string `gorm:"column:number" json:"number" form:"number"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	DoctorId    int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsPrint     int64  `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ItemId      int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PProjectId  int64  `gorm:"column:p_project_id" json:"p_project_id" form:"p_project_id"`
+
+	FeedetlSn   string `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	DoctorName  string `gorm:"column:doctor_name" json:"doctor_name" form:"doctor_name"`
+	PatientName string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
+}
+
+func (HisLabelPrintInfo) TableName() string {
+	return "his_label_print_info"
+}

models/his_models.go

@@ -467,9 +467,8 @@ type TempHisOrder struct {
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
 	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	AccountPrice          float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
-
-	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
-	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	FaPiaoCode            string    `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber          string    `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
 
 	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 
@@ -508,6 +507,7 @@ type HisPrescription struct {
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	HisPrescriptionInfo    HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	HisOrder               HisOrder                  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
 	Total                  string                    `gorm:"-" json:"total" form:"total"`
 	PType                  int64                     `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
@@ -749,7 +749,7 @@ type HisPrescriptionProject struct {
 	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64      `gorm:"column:count" json:"count" form:"count"`
+	Count              string     `gorm:"column:count" json:"count" form:"count"`
 	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
@@ -778,6 +778,7 @@ type HisPrescriptionProject struct {
 	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
 	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
 	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -1015,6 +1016,49 @@ func (HisOrderInfo) TableName() string {
 	return "his_order_info"
 }
 
+type HisOrderInfoTwo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId     int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+
+	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+}
+
+func (HisOrderInfoTwo) TableName() string {
+	return "his_order_info"
+}
+
 type VMHisPatient struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
@@ -1475,3 +1519,115 @@ type NewHisOrder struct {
 func (NewHisOrder) TableName() string {
 	return "his_order"
 }
+
+type VMHisOrderTwo 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"`
+	HisPatientId          int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate    int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                 int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                int64     `gorm:"column:status" json:"status" form:"status"`
+	Number                string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId             int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode               int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg               string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime           string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid           string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus           int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId               string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                 string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName               string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType           string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                  string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                  string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                  time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                   float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype              string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType               string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag           string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime              string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType         string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType               string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt          float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt       float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay        float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt         float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt           float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc            float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay               float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay            float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay       float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay              float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay              float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay              float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt         float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt            float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay               float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay            float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt           float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                  float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay         float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId          string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins             string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType               string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail            string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance   int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+
+	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+
+	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+
+	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime   int64 `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+
+	HisOrderInfo           HisOrderInfo           `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	Patients               Patients               `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient             HisPatient             `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
+	HisHospitalCheckRecord HisHospitalCheckRecord `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"his_hospital_patient"`
+
+	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
+
+	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
+	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis               string                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+}
+
+func (VMHisOrderTwo) TableName() string {
+	return "his_order"
+}
+
+type HisStockPriceConfig 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"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (HisStockPriceConfig) TableName() string {
+	return "his_stock_price_config"
+}

models/patient_models.go

@@ -335,7 +335,7 @@ type DialysisPrescriptionList struct {
 	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 	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"`
@@ -439,6 +439,7 @@ type DialysisSolution struct {
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	PreImpulse                 float64 `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
 }
 
 func (DialysisSolution) TableName() string {

models/stock_models.go

@@ -1104,3 +1104,22 @@ type SgjCancelStockInfo struct {
 	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 }
+
+type PatientWarehouseInfo struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Number            string `gorm:"column:number" json:"number" form:"number"`
+	ProductDate       int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingUnit   string `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Dealer            int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	GoodName          string `gorm:"column:good_name" json:"good_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
+}
+
+func (PatientWarehouseInfo) TableName() string {
+	return "xt_warehouse_info"
+}

service/device_service.go

@@ -2,8 +2,10 @@ package service
 
 import (
 	"XT_New/models"
+	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -720,3 +722,45 @@ func GetPatientInfectious(id int64) (infectious []*models.InfectiousDiseases, er
 	err = XTReadDB().Where("patient_id=? and status=1", id).Find(&infectious).Error
 	return infectious, err
 }
+
+func GetPatientIdOne(patient_id int64, orgId int64) (models.XtPatientsNew, error) {
+
+	patientsNew := models.XtPatientsNew{}
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":patient_info"
+
+	patient_info_str, _ := redis.Get(key).Result()
+
+	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.Patients{}).Where("blood_id = ? and user_org_id=? and status=1", patient_id, orgId).First(&patientsNew).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return patientsNew, nil
+			} else {
+				return patientsNew, err
+			}
+		} else {
+			if patientsNew.ID > 0 {
+				//缓存数据
+				patient_info_json, err := json.Marshal(&patientsNew)
+
+				if err == nil {
+					redis.Set(key, patient_info_json, time.Second*60*60*18)
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+			}
+			return patientsNew, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+
+		if patient_info_str == "null" {
+			return patientsNew, nil
+		} else {
+			json.Unmarshal([]byte(patient_info_str), &patientsNew)
+			return patientsNew, nil
+		}
+
+	}
+}

service/dialysis_service.go

@@ -649,14 +649,33 @@ func GetDialysisScheduals(orgID int64, scheduleDate int64) ([]*MDialysisSchedule
 		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND  assessment_date = ?", orgID, scheduleDate).
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 		Preload("TreatmentSummary", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
 		Preload("AssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
-		// Preload("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
+		Where("status = 1 AND user_org_id = ?", orgID)
+	if scheduleDate != 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+
+	err := db.Find(&vms).Error
+	return vms, err
+}
+
+func GetDialysisSchedualsOne(orgID int64, scheduleDate int64) ([]*MDialysisScheduleVM, error) {
+	var vms []*MDialysisScheduleVM
+	db := readDb.
+		Table("xt_schedule").
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		//Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).
+		//Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND  assessment_date = ?", orgID, scheduleDate).
+		//Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		//Preload("TreatmentSummary", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
+		//Preload("Advices", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
+		//Preload("AssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -1096,11 +1115,95 @@ func GetLastLongAdviceByGroupNo(orgId int64, patient_id int64) (advice []*models
 	return
 }
 
+func GetLastLongAdviceByGroupNoOne(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":long_advice"
+	long_advice_str, _ := redis.Get(key).Result()
+
+	if len(long_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(advice) > 0 {
+				//缓存数据
+				starfes_str, err := json.Marshal(advice)
+				if err == nil {
+					redis.Set(key, starfes_str, time.Second*60*60*18)
+					return advice, nil
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+				return advice, nil
+			}
+			return advice, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if long_advice_str == "null" {
+			return advice, nil
+		} else {
+			json.Unmarshal([]byte(long_advice_str), &advice)
+			return advice, nil
+		}
+	}
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	return
+}
+
 func GetLastLongAdviceByGroupNoThree(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	return
 }
 
+func GetLastLongAdviceByGroupNoFour(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
+	//err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	//return
+
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":long_advice"
+	long_advice_str, _ := redis.Get(key).Result()
+
+	if len(long_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(advice) > 0 {
+				//缓存数据
+				starfes_str, err := json.Marshal(advice)
+				if err == nil {
+					redis.Set(key, starfes_str, time.Second*60*60*18)
+					return advice, nil
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+				return advice, nil
+			}
+			return advice, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if long_advice_str == "null" {
+			return advice, nil
+		} else {
+			json.Unmarshal([]byte(long_advice_str), &advice)
+			return advice, nil
+		}
+	}
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0 AND frequency_type <> 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	return
+}
+
 func FindAllDoctorAdviceByTime(now int64, end int64, patient_id int64, orgId int64, temp_id string) (advice []*models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 2   AND advice_date > ? AND advice_date <= ? AND template_id = ?  ", orgId, patient_id, end, now, temp_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	return
@@ -1281,3 +1384,199 @@ func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (ad
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }
+
+func GetAllPcPatientListByList(orgID int64) (patients []*MSchedualPatientVMList, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
+	patient_info_str, _ := redis.Get(key).Result()
+
+	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				if len(patients) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(patients) > 0 {
+				//缓存数据
+				patient_info_json, err := json.Marshal(&patients)
+				if err == nil {
+					redis.Set(key, patient_info_json, time.Second*60*60*18)
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+			}
+			return patients, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if patient_info_str == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(patient_info_str), &patients)
+			return patients, nil
+		}
+	}
+}
+
+func GetAllPcAdvicestByList(orgID int64, scheduleDate int64) (advices []*VMDoctorAdvice, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":advice_list_all"
+	advice_list_str, _ := redis.Get(key).Result()
+
+	if len(advice_list_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? ", orgID, scheduleDate).Find(&advices).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				if len(advices) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(advices) > 0 {
+				//缓存数据
+				advice_list_str, err := json.Marshal(&advices)
+				if err == nil {
+					redis.Set(key, advice_list_str, time.Second*60*60*18)
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+			}
+			return advices, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if advice_list_str == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(advice_list_str), &advices)
+			return advices, nil
+		}
+
+	}
+}
+
+func GetAllPcDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVMList, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
+	dialysis_orders_list_all, _ := redis.Get(key).Result()
+
+	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(dialysisOrders) > 0 {
+				//缓存数据
+				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
+				if err == nil {
+					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+			}
+			return dialysisOrders, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if dialysis_orders_list_all == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
+			return dialysisOrders, nil
+		}
+
+	}
+}
+
+func GetAllPcAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*AssessmentAfterDislysis, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_after_dislysis_list_all"
+	assessment_after_dislysis__all, _ := redis.Get(key).Result()
+
+	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				if len(assessmentAfterDislysis) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				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)
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+			}
+			return assessmentAfterDislysis, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if assessment_after_dislysis__all == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
+			return assessmentAfterDislysis, nil
+		}
+
+	}
+}
+
+func GetAllPcTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSummarys []*VMTreatmentSummary, err error) {
+	redis := RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(orgID, 10) + ":" + ":treatment_summarys_list_all"
+	treatment_summarys_all, _ := redis.Get(key).Result()
+
+	if len(treatment_summarys_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+		err = readDb.Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&treatmentSummarys).Error
+		if err != nil {
+			if err == gorm.ErrRecordNotFound {
+				if len(treatment_summarys_all) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
+				return nil, nil
+			} else {
+				return nil, err
+			}
+		} else {
+			if len(treatmentSummarys) > 0 {
+				//缓存数据
+				treatment_summarys_all, err := json.Marshal(&treatmentSummarys)
+				if err == nil {
+					redis.Set(key, treatment_summarys_all, time.Second*60*60*18)
+				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
+			}
+			return treatmentSummarys, nil
+		}
+	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if treatment_summarys_all == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(treatment_summarys_all), &treatmentSummarys)
+			return treatmentSummarys, nil
+		}
+	}
+}

service/gdyb_service.go

@@ -384,10 +384,10 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 				//var randNum int
 				//randNum = rand.Intn(10000) + 1000
 				if len(subItem.MedListCodg) > 0 {
-
+					cut, _ := strconv.ParseFloat(subItem.Count, 64)
 					cus := &Custom{
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*cut),
+						Cut:              fmt.Sprintf("%.2f", cut),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 						MedListCodg:      subItem.MedListCodg,

service/gobal_config_service.go

@@ -2,10 +2,8 @@ package service
 
 import (
 	"XT_New/models"
-	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
-	"strconv"
 	"time"
 )
 
@@ -20,47 +18,8 @@ func CreateDrugAutomaticReduceRecord(config *models.DrugStockConfig) (err error)
 }
 
 func FindAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.GobalConfig) {
-	redis := RedisClient()
-	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(org_id, 10) + ":gobal_config"
-	gobal_config_str, _ := redis.Get(key).Result()
-
-	if len(gobal_config_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if config.ID <= 0 {
-					redis.Set(key, "gobla_config_null", time.Second*60*60*18)
-				}
-				return nil, config
-			} else {
-				return err, config
-			}
-		} else {
-			if config.ID > 0 {
-				//缓存数据
-				gobal_config_str, err := json.Marshal(config)
-				if err == nil {
-					redis.Set(key, gobal_config_str, time.Second*60*60*18)
-					return nil, config
-				}
-			} else {
-				redis.Set(key, "gobla_config_null", time.Second*60*60*18)
-				return nil, config
-			}
-			return nil, config
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if gobal_config_str == "gobla_config_null" {
-			return nil, config
-		} else {
-			json.Unmarshal([]byte(gobal_config_str), &config)
-			return nil, config
-		}
-
-	}
+	err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
+	return
 }
 
 func FindDrugStockAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.DrugStockConfig) {
@@ -207,9 +166,9 @@ func FindAdviceInitConfig(org_id int64) (adviceInit models.AdviceInit, err error
 func GetPrint(ids []int64, orgid int64) (doctor []*models.DoctorAdvice, err error) {
 
 	if len(ids) == 1 {
-		err = XTReadDB().Model(&doctor).Where("groupno = ? and user_org_id = ?", ids[0], orgid).Find(&doctor).Error
+		err = XTReadDB().Model(&doctor).Where("groupno = ? and user_org_id = ? and status = 1", ids[0], orgid).Find(&doctor).Error
 	} else {
-		err = XTReadDB().Model(&doctor).Where("groupno IN(?) and user_org_id = ?", ids, orgid).Find(&doctor).Error
+		err = XTReadDB().Model(&doctor).Where("groupno IN(?) and user_org_id = ? and status = 1", ids, orgid).Find(&doctor).Error
 	}
 
 	return doctor, err
@@ -222,37 +181,13 @@ func GetExportLogByType(org_id int64, log_type int64) (log []*models.ExportLog,
 }
 
 func FindXTHisRecordByOrgId(org_id int64) (err error, config models.XtHisConfig) {
-	redis := RedisClient()
-	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(org_id, 10) + ":" + ":his_config"
-	his_config_str, _ := redis.Get(key).Result()
-
-	if len(his_config_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.XtHisConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, config
-			} else {
-				return err, config
-			}
-		} else {
-			if config.ID > 0 {
-				//缓存数据
-				his_config_str, err := json.Marshal(config)
-				if err == nil {
-					redis.Set(key, his_config_str, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
-			}
-			return nil, config
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(his_config_str), &config)
-		return nil, config
-	}
+	err = readDb.Model(&models.XtHisConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return
+}
+
+func FindHisStockPriceRecordByOrgId(org_id int64) (err error, config models.HisStockPriceConfig) {
+	err = readDb.Model(&models.HisStockPriceConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return
 }
 
 func UpdateXTHisRecord(config *models.XtHisConfig) (err error) {
@@ -265,39 +200,25 @@ func CreateXTHisRecord(config *models.XtHisConfig) (err error) {
 	return
 }
 
+func CreateHisStockPriceRecord(config *models.HisStockPriceConfig) (err error) {
+	err = writeDb.Model(&models.HisStockPriceConfig{}).Create(config).Error
+	return
+}
+
+func UpdateHisStockPriceRecord(config *models.HisStockPriceConfig) (err error) {
+	err = writeDb.Save(config).Error
+	return
+}
+
 //TODO:项目开关
 func FindXTHisProjectByOrgId(org_id int64) (err error, config models.XtHisProjectConfig) {
-	redis := RedisClient()
-	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(org_id, 10) + ":his_project_config"
-	his_project_config_str, _ := redis.Get(key).Result()
-
-	if len(his_project_config_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.XtHisProjectConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, config
-			} else {
-				return err, config
-			}
-		} else {
-			if config.ID > 0 {
-				//缓存数据
-				his_project_config_str, err := json.Marshal(config)
-				if err == nil {
-					redis.Set(key, his_project_config_str, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
-			}
-			return nil, config
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(his_project_config_str), &config)
-		return nil, config
-	}
+	err = readDb.Model(&models.XtHisProjectConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return
+}
+
+func FindXTHisProjectByOrgIdOne(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
 }
 
 func UpdateXTHisProjectRecord(config *models.XtHisProjectConfig) (err error) {
@@ -669,7 +590,7 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcategory int64, startime int64, endtime int64, orgid int64) (drug []*models.VmBaseDrug, total int64, err error) {
 
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_base_drug").Where("status = 1")
+	db := readDb2.Table("xt_base_drug").Where("status = 1")
 	likeKey := "%" + keyword + "%"
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
@@ -790,7 +711,7 @@ func GetDrugCountList(startime int64, endtime int64, orgid int64) (info []*model
 }
 
 func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	db := readDb2.Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -806,7 +727,7 @@ func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models
 }
 
 func GetOutDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
-	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	db := readDb2.Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -822,7 +743,7 @@ func GetOutDrugCountList(startime int64, endtime int64, orgid int64) (info []*mo
 }
 
 func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugAutomaticReduceDetail, err error) {
-	db := XTReadDB().Table("xt_drug_automatic_reduce_detail as x").Where("x.status = 1")
+	db := readDb2.Table("xt_drug_automatic_reduce_detail as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.record_time >=?", startime)
@@ -840,7 +761,7 @@ func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*m
 
 func GetCancelDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
 
-	db := XTReadDB().Table(" xt_drug_cancel_stock_info as x").Where("x.status = 1")
+	db := readDb2.Table(" xt_drug_cancel_stock_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -883,7 +804,7 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 		db = db.Where("x.warehouse_out_id = ?", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 
@@ -933,9 +854,3 @@ func GetDrugFlowBatch(ware_out_id int64, drug_id int64, orgid int64) (flow []*mo
 	err = XTReadDB().Where("warehouse_out_id = ? and drug_id = ? and user_org_id = ? and status = 1", ware_out_id, drug_id, orgid).Find(&flow).Error
 	return flow, err
 }
-
-func FindXTHisProjectByOrgIdOne(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 err, config
-}

service/his_service.go

@@ -2,10 +2,8 @@ package service
 
 import (
 	"XT_New/models"
-	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -590,11 +588,14 @@ func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_dat
 }
 
 type OtherDrugWarehouseInfo struct {
-	ID               int64 `gorm:"column:id" json:"id" form:"id"`
-	DrugId           int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingCount int64 `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Status           int64 `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
 }
 
 func (OtherDrugWarehouseInfo) TableName() string {
@@ -721,7 +722,7 @@ func (BaseDrugLib) TableName() string {
 }
 
 func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
-	err = readDb.Model(&BaseDrugLib{}).Preload("OtherDrugWarehouseInfo", "status = 1").Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
+	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", "status = 1 and (stock_max_number > 0 or stock_min_number >0)").Find(&list).Error
 	return
 }
 
@@ -1515,7 +1516,7 @@ type HisPrescriptionProject struct {
 	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64        `gorm:"column:count" json:"count" form:"count"`
+	Count              string       `gorm:"column:count" json:"count" form:"count"`
 	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
@@ -1585,6 +1586,43 @@ func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisO
 	return
 }
 
+//func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo, err error) {
+//	db := readDb.Model(&models.HisOrderInfo{}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+//		return db.Preload("BaseDrugLib", "status = 1").Where("status = 1")
+//	})
+//	err = db.Where("order_number = ? AND status = 1 AND advice_id > 0", order_number).Find(&order).Error
+//	return
+//}
+
+func GetHisOrderInfoByNumberOne(order_number string) (order []*models.HisOrderInfoTwo, err error) {
+	db := readDb.Model(&models.HisOrderInfoTwo{}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("Drug", "status = 1").Where("status = 1")
+	})
+	err = db.Where("order_number = ? AND status = 1 AND advice_id > 0", order_number).Find(&order).Error
+	return
+}
+
+func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfoTwo, err error) {
+	db := readDb.Model(&models.HisOrderInfoTwo{})
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id = 0")
+	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+	})
+	err = db.Where("his_order_info.order_number = ? AND his_order_info.status = 1 AND his_order_info.project_id > 0 ", order_number).Find(&order).Error
+	return
+}
+
+func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrderInfoTwo, err error) {
+	db := readDb.Model(&models.HisOrderInfoTwo{})
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id > 0")
+
+	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+	})
+	err = db.Where("his_order_info.order_number = ? AND his_order_info.status = 1 AND his_order_info.project_id > 0", order_number).Find(&order).Error
+	return
+}
+
 type MedicalInsuranceCostCompare struct {
 	ID        int64   `gorm:"column:id" json:"id" form:"id"`
 	StartTime int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
@@ -1986,46 +2024,13 @@ func GetHisPrescriptionProjectsByID(id int64) (projects []*models.HisPrescriptio
 }
 
 func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(user_org_id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_time, 10) + ":his_prescription_project"
-	his_prescription_project_str, _ := redis.Get(key).Result()
-
-	if len(his_prescription_project_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1", user_org_id, patient_id, record_time).Find(&projects).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(projects) <= 0 {
-					redis.Set(key, "his_prescription_null", time.Second*60*60*18)
-				}
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(projects) > 0 {
-				//缓存数据
-				his_prescription_project_str, err := json.Marshal(projects)
-				if err == nil {
-					redis.Set(key, his_prescription_project_str, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, "his_prescription_null", time.Second*60*60*18)
-			}
-			return projects, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if his_prescription_project_str == "his_prescription_null" {
-			return projects, nil
-		} else {
-			json.Unmarshal([]byte(his_prescription_project_str), &projects)
-			return projects, nil
-		}
-
-	}
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id = 0", user_org_id, patient_id, record_time).Find(&projects).Error
+	return
+}
 
+func GetHisPrescriptionTeamProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id > 0", user_org_id, patient_id, record_time).Find(&projects).Error
+	return
 }
 
 func GetHisPrescriptionProjectByID(id int64) (projects models.HisPrescriptionProject, err error) {
@@ -2194,3 +2199,22 @@ func FindAllHisProjectByTime(now int64, end int64, patient_id int64, orgId int64
 	err = readDb.Model(&models.HisPrescriptionProject{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND record_date > ? AND record_date <= ? AND project_id = ? ", orgId, patient_id, end, now, project_id).Find(&project).Error
 	return
 }
+
+func GetProjectByTeamId(user_org_id int64, team_id int64, patient_id int64, record_time int64) (label models.HisLabelPrintInfo, err error) {
+	err = readDb.Model(&models.HisLabelPrintInfo{}).Where("user_org_id = ? AND item_id = ? AND patient_id = ? AND record_date = ? AND status = 1", user_org_id, team_id, patient_id, record_time).First(&label).Error
+	return
+}
+
+func GetProjectById(user_org_id int64, p_project_id int64, record_time int64, patient_id int64) (label models.HisLabelPrintInfo, err error) {
+	err = readDb.Model(&models.HisLabelPrintInfo{}).Where("user_org_id = ? AND p_project_id = ? AND patient_id = ? AND record_date = ? AND status = 1", user_org_id, p_project_id, patient_id, record_time).First(&label).Error
+	return
+}
+
+func DeletePrintInfo(id int64) {
+	writeDb.Model(&models.HisLabelPrintInfo{}).Where("p_project_id = ?", id).Updates(map[string]interface{}{"status": 0})
+}
+
+func CreateHisLabelRecord(label *models.HisLabelPrintInfo) error {
+	err := writeDb.Save(&label).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -29,20 +29,6 @@ func MobileGetDialysisScheduals(orgID int64, scheduleDate int64, scheduleType in
 	var vms []*MDialysisScheduleVMForList
 	db := readDb.
 		Table("xt_schedule as sch").
-		// Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-		// Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		// Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-		// Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? ", orgID, scheduleDate).
-		// Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-		// Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
-		// Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).
-		// Preload("DialysisOrder.DeviceNumber", "status = 1 AND org_id = ?", orgID).
-		// Preload("TreatmentSummary", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
-		// Preload("AssessmentAfterDislysis", "status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).
-		// Preload("HisAdvices", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
-		// Preload("DialysisOrder.MonitoringRecords", func(rdb *gorm.DB) *gorm.DB {
-		// 	return rdb.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time DESC")
-		// }).
 		Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -410,6 +396,17 @@ func MobileGetPatientDetail(orgID int64, patientID int64) (*MPatient, error) {
 	}
 }
 
+func MobileGetSchedualDetailOne(orgID int64, patientID int64, schedualDate int64) (*MDialysisScheduleVM, error) {
+	var vm MDialysisScheduleVM
+	err := readDb.
+		Table("xt_schedule").
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Where("status = 1 AND user_org_id = ? AND schedule_date = ? AND patient_id = ?", orgID, schedualDate, patientID).
+		First(&vm).Error
+	return &vm, err
+}
+
 // 用户排班信息
 func MobileGetSchedualDetail(orgID int64, patientID int64, schedualDate int64) (*MDialysisScheduleVM, error) {
 	redis := RedisClient()
@@ -559,16 +556,13 @@ func MobileGetReceiverTreatmentAccessRecord(orgID int64, patientID int64, record
 
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":receive_treatment_asses"
 	receive_treatment_asses_str, _ := redis.Get(key).Result()
-	fmt.Println("长度233232323322332322323", receive_treatment_asses_str)
 	if len(receive_treatment_asses_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
-			fmt.Println("h2323232woweewweweweweeweeewweewweweweewweewwewe", record.ID)
+
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
-
-					redis.Set(key, "null", time.Second*60*60*18)
-					fmt.Println("j你来了呃呃呃呃呃呃呃呃呃呃")
+					redis.Set(key, "", time.Second*60*60*18)
 				}
 				return nil, nil
 			} else {
@@ -602,17 +596,14 @@ func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int
 	var record models.PredialysisEvaluation
 	redis := RedisClient()
 	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":assessment_before_dislysis"
 	assessment_before_dislysis_str, _ := redis.Get(key).Result()
-
 	if len(assessment_before_dislysis_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
+					redis.Set(key, "", time.Second*60*60*18)
 				}
 				return nil, nil
 			} else {
@@ -656,7 +647,7 @@ func MobileGetLastTimePredialysisEvaluation(orgID int64, patientID int64, maxDat
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
+					redis.Set(key, "", time.Second*60*60*18)
 				}
 				return nil, nil
 			} else {
@@ -710,7 +701,9 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":doctor_advices"
+	fmt.Println("医嘱keyh23232323223", key)
 	doctor_advices_str, _ := redis.Get(key).Result()
+	fmt.Println("长度hh2332233232233232", len(doctor_advices_str))
 	if len(doctor_advices_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DoctorAdvice{}).
 			Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 || advice_type = 3)", patientID, orgID, recordDate).
@@ -720,7 +713,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(records) <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
+					redis.Set(key, "", time.Second*60*60*18)
 				}
 				return nil, nil
 			} else {
@@ -756,17 +749,12 @@ func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate in
 	redis := RedisClient()
 	defer redis.Close()
 
-	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":dialysis_order"
 	dialysis_order_str, _ := redis.Get(key).Result()
-
 	if len(dialysis_order_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
-				if record.ID <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
-				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -784,7 +772,9 @@ func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate in
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+
 		if dialysis_order_str == "null" {
+			err = readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
 			return &record, nil
 		} else {
 			json.Unmarshal([]byte(dialysis_order_str), &record)
@@ -847,14 +837,14 @@ func MobileGetMonitorRecords(orgID int64, patientID int64, recordDate int64) ([]
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":monitor_records"
 	monitor_records_str, _ := redis.Get(key).Result()
-
+	fmt.Println("监测23323232323233232", len(monitor_records_str))
 	if len(monitor_records_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, recordDate).Order("operate_time asc").Find(&records).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
-				if len(records) <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
-				}
+				//if len(records) <= 0 {
+				//	redis.Set(key, "null", time.Second*60*60*18)
+				//}
 				return nil, nil
 			} else {
 				return nil, err
@@ -933,14 +923,26 @@ func MobileGetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64)
 	}
 }
 
+func MobileGetAssessmentAfterDislysisOne(orgID int64, patientID int64, recordDate int64) (*models.AssessmentAfterDislysis, error) {
+	var record models.AssessmentAfterDislysis
+	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 // 透后评估
 func MobileGetAssessmentAfterDislysis(orgID int64, patientID int64, recordDate int64) (*models.AssessmentAfterDislysis, error) {
 	var record models.AssessmentAfterDislysis
 	redis := RedisClient()
 	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":assessment_after_dislysis"
+
 	assessment_after_dislysis_str, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -1019,6 +1021,21 @@ func MobileGetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxD
 
 	}
 }
+
+func MobileGetLastTimeAssessmentAfterDislysisOne(orgID int64, patientID int64, maxDate int64) (*models.AssessmentAfterDislysis, error) {
+	var record models.AssessmentAfterDislysis
+	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+
+}
+
 func MobileGetLast(orgID int64, patientID int64, maxDate int64) (models.AssessmentAfterDislysis, error) {
 	dislysis := models.AssessmentAfterDislysis{}
 	err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&dislysis).Error
@@ -1932,6 +1949,20 @@ func MobileGetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDry
 	}
 }
 
+// 透析方案
+func MobileGetDialysisSolutionByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
+	var record models.DialysisSolution
+	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 // 透析方案
 func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution
@@ -1984,9 +2015,9 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
-
+	fmt.Println("key23323323223323")
 	dialysis_prescribe_str, _ := redis.Get(key).Result()
-
+	fmt.Println("c产杜3323232323232323232", len(dialysis_prescribe_str))
 	if len(dialysis_prescribe_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? AND mode_id = ?", patientID, orgID, recordDate, mode_id).First(&record).Error
 		if err != nil {
@@ -2082,17 +2113,20 @@ func MobileGetLastDialysisPrescribe(orgID int64, patientID int64) (*models.Dialy
 	return &record, nil
 }
 
+func MobileGetLastDialysisPrescribeByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
-	//var record models.DialysisPrescription
-	//err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
-	//if err != nil {
-	//	if err == gorm.ErrRecordNotFound {
-	//		return nil, nil
-	//	} else {
-	//		return nil, err
-	//	}
-	//}
-	//return &record, nil
 
 	var record models.DialysisPrescription
 	redis := RedisClient()
@@ -2102,7 +2136,7 @@ func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_i
 	dialysis_prescribe_by_mode_id, _ := redis.Get(key).Result()
 
 	if len(dialysis_prescribe_by_mode_id) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and mode_id = ?", patientID, orgID, mode_id).First(&record).Error
+		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
@@ -2140,40 +2174,14 @@ func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_i
 	}
 }
 
-//func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate int64,mode_id int64) (*models.DialysisPrescription, error) {
-//	var record models.DialysisPrescription
-//	redis := RedisClient()
-//	defer redis.Close()
-//
-//	// cur_date := time.Now().Format("2006-01-02")
-//	key := strconv.FormatInt(orgID, 10) + ":"+ strconv.FormatInt(patientID, 10) +  ":" + strconv.FormatInt(recordDate, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe_last"
-//	dialysis_prescribe_last_str, _ := redis.Get(key).Result()
-//
-//	if len(dialysis_prescribe_last_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-//		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?  AND record_date < ?", patientID, orgID, mode_id,recordDate).Last(&record).Error
-//		if err != nil {
-//			if err == gorm.ErrRecordNotFound {
-//				return nil, nil
-//			} else {
-//				return nil, err
-//			}
-//		} else {
-//			if record.ID > 0 {
-//				//缓存数据
-//				dialysis_prescribe_last_str, err := json.Marshal(record)
-//				if err == nil {
-//					redis.Set(key, dialysis_prescribe_last_str, time.Second*60*60*18)
-//				}
-//			} else {
-//				redis.Set(key, " ", time.Second*60*60*18)
-//			}
-//			return &record, nil
-//		}
-//	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-//		json.Unmarshal([]byte(dialysis_prescribe_last_str), &record)
-//		return &record, nil
-//	}
-//}
+func MobileGetLastDialysisPrescribeByModeIdOne(orgID int64, patientID int64, mode_id int64) (models.DialysisPrescription, error) {
+
+	var record models.DialysisPrescription
+
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+
+	return record, err
+}
 
 func GetAllAvaildDeviceNumbers(orgID int64, record_date int64, schedule_type int) ([]*DeviceNumberViewModel, error) {
 	var vms []*DeviceNumberViewModel = make([]*DeviceNumberViewModel, 0)
@@ -2311,6 +2319,19 @@ func GetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDryweight
 	return &record, nil
 }
 
+func MobileGetSystemDialysisPrescribeByModeIdSix(orgID int64, mode_id int64) (*models.SystemPrescription, error) {
+	var record models.SystemPrescription
+	err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
 func MobileGetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*models.SystemPrescription, error) {
 	var record models.SystemPrescription
 	redis := RedisClient()
@@ -2321,7 +2342,7 @@ func MobileGetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*mode
 	system_dialysis_prescribe_str, _ := redis.Get(key).Result()
 
 	if len(system_dialysis_prescribe_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).First(&record).Error
+		err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).Last(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
@@ -2353,6 +2374,14 @@ func MobileGetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*mode
 	}
 }
 
+func MobileGetSystemDialysisPrescribeByModeIdOne(orgID int64, mode_id int64) (models.SystemPrescription, error) {
+	var record models.SystemPrescription
+
+	err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).Last(&record).Error
+
+	return record, err
+}
+
 func GetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*models.SystemPrescription, error) {
 	var record models.SystemPrescription
 	err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).Last(&record).Error

service/patient_service.go

@@ -204,9 +204,9 @@ func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions [
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
 	prescriptions_list_all, _ := redis.Get(key).Result()
-
+	fmt.Println("铲毒23322332323232323", len(prescriptions_list_all))
 	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DialysisPrescriptionList{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+		err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(prescriptions) <= 0 {
@@ -246,7 +246,7 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 	assessment_befores_list_all, _ := redis.Get(key).Result()
 
 	if len(assessment_befores_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.PredialysisEvaluationList{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
+		err = readDb.Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(assessmentBefores) <= 0 {
@@ -270,6 +270,7 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
 		if assessment_befores_list_all == "null" {
+			fmt.Println("尽力2323232", assessment_befores_list_all)
 			return nil, nil
 		} else {
 			json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
@@ -283,15 +284,12 @@ func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
-
+	fmt.Println("dialysis_orders_list_all23323223232323323232332", len(dialysis_orders_list_all))
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
 
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
-				if len(dialysisOrders) <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
-				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -1414,54 +1412,6 @@ func GetPatientScheduleList(orgID int64, patientID int64, page int64, limit int6
 
 func GetMonitorRecord(orgID int64, date int64, partition int64, patientId int64) ([]*models.NewVMMonitorDialysisSchedule, error) {
 	var mds []*models.NewVMMonitorDialysisSchedule
-	//
-	//if patientId == 0 {
-	//	db := readDb.
-	//		Model(&models.NewVMMonitorDialysisSchedule{}).
-	//		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-	//		Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
-	//		Preload("TreatmentMode", "status = 1").
-	//		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, date).
-	//		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ?", orgID, date).
-	//		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND assessment_date = ? ", orgID, date).
-	//		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ? AND monitoring_date = ?", orgID, date).
-	//		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, date).
-	//		Preload("DialysisOrder.DeviceNumber", "status = 1 AND  org_id = ?", orgID).
-	//		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
-	//		Where("status = 1 AND user_org_id = ?", orgID)
-	//	if date != 0 {
-	//		db = db.Where("schedule_date = ? ", date)
-	//	}
-	//	if partition != 0 {
-	//		db = db.Where("partition_id = ? ", partition)
-	//	}
-	//	err := db.Find(&mds).Error
-	//	fmt.Println("err", err)
-
-	//if patientId > 0 {
-	//	db := readDb.Table("xt_schedule as x").Where("x.status = 1")
-	//	db = db.
-	//		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-	//		Preload("TreatmentMode", "status = 1").
-	//		Preload("Prescription", "status = 1 AND user_org_id = ? AND patient_id = ?", orgID, patientId).
-	//		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ? AND patient_id = ?", orgID, patientId).
-	//		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ? AND patient_id = ? ", orgID, patientId).
-	//		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ?  AND patient_id = ?", orgID, patientId).
-	//		Preload("DialysisOrder", "status = 1 AND user_org_id = ? AND patient_id = ?", orgID, patientId).
-	//		Preload("DialysisOrder.DeviceNumber", "status = 1 AND  org_id = ?", orgID).
-	//		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID).
-	//		Where("status = 1 AND user_org_id = ?", orgID)
-	//	if partition != 0 {
-	//		db = db.Where("partition_id = ? ", partition)
-	//	}
-	//
-	//	db = db.Where("schedule_date <= ? ", time.Now().Unix())
-	//
-	//	db = db.Where("patient_id = ?", patientId)
-	//	db = db.Order("schedule_date desc")
-	//	err := db.Find(&mds).Error
-	//	fmt.Println("err", err)
-	//}
 
 	db := readDb.Model(&models.NewVMMonitorDialysisSchedule{})
 	if date > 0 {
@@ -2104,22 +2054,11 @@ func GetAllAssessmentAfterDislysisByListOne(orgID int64, scheduleDate int64) (as
 
 func GetAllMonitorList(orgID int64, scheduleDate int64) (monitor []*models.VMMonitoringRecord, err error) {
 
-	//db := XTReadDB().Model(&monitor).Where("status = 1")
-	//if orgID > 0 {
-	//  db = db.Where("user_org_id = ?", orgID)
-	//}
-	//if scheduleDate > 0 {
-	//  db = db.Where("monitoring_date = ?", scheduleDate)
-	//}
-	//
-	//err = db.Find(&monitor).Error
-	//return  monitor,err
-
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":monitor_record_list_all"
 	monitor_record_list_all, _ := redis.Get(key).Result()
-
+	fmt.Println("monitor_recorde_list", len(monitor_record_list_all))
 	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
 		if err != nil {

service/self_drug_service.go

@@ -1034,12 +1034,12 @@ func GetLastDrugWarehouseOut(orgid int64) (models.DrugWarehouseOut, error) {
 	return info, err
 }
 
-func GetLastDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
-
-	info := models.XtDrugWarehouseInfo{}
-	err := XTReadDB().Model(&info).Where("id=? and status = 1", drugid).Last(&info).Error
-	return info, err
-}
+//func GetLastDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
+//
+//	info := models.XtDrugWarehouseInfo{}
+//	err := XTReadDB().Model(&info).Where("id=? and status = 1", drugid).Last(&info).Error
+//	return info, err
+//}
 
 func GetFirstDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
 

service/stock_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"XT_New/models"
-	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
@@ -247,6 +246,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"packing_price":                  goodInfo.PackingPrice,
 		"default_count_unit":             goodInfo.DefaultCountUnit,
 		"min_unit":                       goodInfo.MinUnit,
+		"register_number":                goodInfo.RegisterNumber,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
@@ -320,7 +320,7 @@ func FindGoodInfoById(id int64) (*models.GoodInfo, error) {
 }
 
 func FindAllGoodType(org_id int64) (goodType []*models.GoodsType, err error) {
-	err = readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1", org_id).Find(&goodType).Error
+	err = readDb2.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1", org_id).Find(&goodType).Error
 	return goodType, err
 }
 
@@ -330,7 +330,7 @@ func FindAllGoodTypeOne(org_id int64) (goodType []*models.GoodsType, err error)
 }
 
 func FindAllGoodInfo(org_id int64) (goodInfo []*models.GoodInfo, err error) {
-	err = readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1", org_id).Find(&goodInfo).Error
+	err = readDb2.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1", org_id).Find(&goodInfo).Error
 	return goodInfo, err
 }
 
@@ -580,6 +580,20 @@ func CreateDrugFlow(drugflow []*models.DrugFlow) (err error) {
 	return
 }
 
+func GetDrugFlowIsExist(warhouseing int64, drug_id int64) (*models.DrugFlow, error) {
+
+	info := models.DrugFlow{}
+	err = XTReadDB().Where("warehousing_id = ? and drug_id = ? and status = 1", warhouseing, drug_id).Find(&info).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
 func GetDrugByWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 
 	info := models.XtDrugWarehouseInfo{}
@@ -590,7 +604,7 @@ func GetDrugByWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 func UpdateDrugWarehouseingInfo(id int64, info models.XtDrugWarehouseInfo) error {
 
 	warehouseInfo := models.XtDrugWarehouseInfo{}
-	err := XTReadDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
+	err := XTWriteDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
 	return err
 }
 
@@ -600,6 +614,11 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 	return err
 }
 
+func CreateDrugFlowTwo(flow *models.DrugFlow) error {
+
+	err := XTWriteDB().Create(&flow).Error
+	return err
+}
 func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_order = ? AND status = 1", order).Last(&info).Error
 
@@ -630,6 +649,12 @@ func FindWarehousingInfoByIdSeven(id int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
+func FindWarehousingInfoTen(goodId int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1", goodId).Find(&info).Error
+	return info, err
+}
+
 //药品先进先出,找出最先入库的批次
 
 func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouseInfo, err error) {
@@ -1133,7 +1158,7 @@ func FindReturnInfoById(id int64) (list []*models.SalesReturnInfo, err error) {
 }
 
 func FindCancelStockInfoById(id int64) (list []*models.CancelStockInfo, err error) {
-	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Preload("GoodInfo", "status = 1").Find(&list).Error
+	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Preload("WarehousingInfo", "status = 1").Preload("GoodInfo", "status = 1").Find(&list).Error
 	return list, err
 }
 
@@ -1526,6 +1551,12 @@ func GetLastCancelStockById(orgid int64) (models.CancelStock, error) {
 	return stock, err
 }
 
+func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
+	stock := models.DrugCancelStock{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&stock).Error
+	return stock, err
+}
+
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
@@ -1574,6 +1605,18 @@ func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error
 
 }
 
+func CreateCancelStockInfoTwo(info *models.DrugCancelStockInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func CreateCancelStockInfoOne(info *models.CancelStockInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
 func CreateDrugCancelStockInfo(cancelStockInfo []*models.DrugCancelStockInfo) (err error) {
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1646,7 +1689,7 @@ func FindAllStockOutList(orgId int64, page int64, limit int64, startTime int64,
 
 func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string, startime int64, endtime int64, type_name int64) (list []*models.StockInfo, total int64, err error) {
 
-	db := readDb.Model(&models.StockInfo{})
+	db := readDb2.Model(&models.StockInfo{})
 	if startime > 0 {
 
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
@@ -1881,6 +1924,11 @@ func UpDateDrugWarehousingInfo(info *models.DrugWarehouseInfo) (err error) {
 	return err
 }
 
+func UpDateDrugWarehousingInfoTwo(id int64, info *models.DrugWarehouseInfo) (err error) {
+	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber}).Error
+	return err
+}
+
 func GetDrugWarehouseOrderOne(id int64, drug_id int64) (models.DrugWarehouseInfo, error) {
 
 	info := models.DrugWarehouseInfo{}
@@ -2798,98 +2846,25 @@ func PostSearchStock(keyword string, orgid int64) (goods []*models.GoodsType, er
 }
 
 func GetStockType(orgid int64) (goodstype []*models.GoodsTypeOne, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(orgid, 10) + ":stock_type"
-	stock_type_str, _ := redis.Get(key).Result()
-
-	if len(stock_type_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = XTReadDB().Where("org_id = ? and status = 1 and (stock_attribute = 2 or stock_attribute = 3)", orgid).
-			Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(goodstype) <= 0 {
-					redis.Set(key, "sotck_type_null", time.Second*60*60*18)
-				}
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(goodstype) > 0 {
-				//缓存数据
-				stock_type_str, err := json.Marshal(goodstype)
-				if err == nil {
-					redis.Set(key, stock_type_str, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, "sotck_type_null", time.Second*60*60*18)
-			}
-			return goodstype, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if stock_type_str == "sotck_type_null" {
-			return goodstype, nil
-		} else {
-			json.Unmarshal([]byte(stock_type_str), &goodstype)
-			return goodstype, nil
-		}
-
-	}
+	err = XTReadDB().Where("org_id = ? and status = 1 and (stock_attribute = 2 or stock_attribute = 3)", orgid).
+		Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
+	return goodstype, err
 }
 
 func GetDialyStockOut(orgid int64, recordtime int64, patientId int64) (prepare []*models.XtDialysisBeforePrepare, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-
-	// cur_date := time.Now().Format("2006-01-02")
-	key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patientId, 10) + ":" + strconv.FormatInt(recordtime, 10) + ":dialy_stock_out"
-	dialy_stock_out_str, _ := redis.Get(key).Result()
-
-	if len(dialy_stock_out_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		db := XTReadDB().Table("dialysis_before_prepare as x").Where("x.status = 1")
-		if orgid > 0 {
-			db = db.Where("x.user_org_id = ?", orgid)
-		}
-		if recordtime > 0 {
-			db = db.Where("x.record_date = ?", recordtime)
-		}
-		if patientId > 0 {
-			db = db.Where("x.patient_id = ?", patientId)
-		}
-		err = db.Select("x.id,x.user_org_id,x.patient_id,x.record_date,x.good_id,x.good_type_id,x.count,x.commdity_code,t.specification_name").Joins("left join xt_good_information as t on t.id = x.good_id and t.org_id = ? and t.status = 1", orgid).Scan(&prepare).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				if len(prepare) <= 0 {
-					redis.Set(key, "prepare_null", time.Second*60*60*18)
-				}
-				return nil, err
-			}
-		} else {
-			if len(prepare) > 0 {
-				//缓存数据
-				dialy_stock_out_str, err := json.Marshal(prepare)
-				if err == nil {
-					redis.Set(key, dialy_stock_out_str, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, "prepare_null", time.Second*60*60*18)
-			}
-			return prepare, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if dialy_stock_out_str == "prepare_null" {
-			return prepare, nil
-		} else {
-			json.Unmarshal([]byte(dialy_stock_out_str), &prepare)
-			return prepare, nil
-		}
 
+	db := XTReadDB().Table("dialysis_before_prepare as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
 	}
+	if recordtime > 0 {
+		db = db.Where("x.record_date = ?", recordtime)
+	}
+	if patientId > 0 {
+		db = db.Where("x.patient_id = ?", patientId)
+	}
+	err = db.Select("x.id,x.user_org_id,x.patient_id,x.record_date,x.good_id,x.good_type_id,x.count,x.commdity_code,t.specification_name").Joins("left join xt_good_information as t on t.id = x.good_id and t.org_id = ? and t.status = 1", orgid).Scan(&prepare).Error
+	return prepare, err
 }
 
 func GetAutoReduceRecordInfoById(orgid int64, recordtime int64, goodid int64, goodtypeid int64) (*models.XtAutomaticReduceDetail, error) {
@@ -2977,7 +2952,7 @@ func UpdateGoodsInformation(info *models.GoodInfo, goodName string, goodType int
 
 func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutInfo []*models.VmWarehouseOutInfo, err error) {
 
-	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status  =1")
+	db := readDb2.Table("xt_warehouse_out_info as x").Where("x.status  =1")
 	err = db.Select("x.good_id,Sum(x.count) as count,x.remark,x.price,x.org_id").Where("x.ctime >=? and x.ctime<=? and x.org_id = ?", startime, endtime, orgid).Group("x.good_id").Scan(&houseOutInfo).Error
 	return houseOutInfo, err
 }
@@ -2985,10 +2960,10 @@ func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutI
 func GetGoodInfomationList(orgid int64, keyword string) (goodInfo []*models.GoodInfo, err error) {
 	key := "%" + keyword + "%"
 	if len(keyword) == 0 {
-		err = XTReadDB().Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodInfo).Error
+		err = readDb2.Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodInfo).Error
 
 	} else {
-		err = XTReadDB().Where("org_id = ? and status = 1 AND good_name like ? AND  find_in_set('停用',good_status) = 0", orgid, key).Find(&goodInfo).Error
+		err = readDb2.Where("org_id = ? and status = 1 AND good_name like ? AND  find_in_set('停用',good_status) = 0", orgid, key).Find(&goodInfo).Error
 
 	}
 	return goodInfo, err
@@ -3069,7 +3044,7 @@ func EditDrugWarehousingOne(warehouse models.DrugWarehouse, id int64) {
 
 func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error) {
 
-	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	err = readDb2.Where("org_id = ? and status = 1", orgid).Find(&list).Error
 	return list, err
 }
 
@@ -3235,26 +3210,32 @@ func GetWarehouseOrderInfoList(orgid int64) (list []*models.WarehousingInfo, err
 
 func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib, err error) {
 
-	db := XTReadDB().Model(&drug).Where("org_id=? and status=1 ", orgid)
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用'", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(drug_name LIKE ?)", likekey).Find(&drug).Error
+		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid).Group("id")
+		}).Find(&drug).Error
 	} else {
-		err = db.Find(&drug).Error
+		err = db.Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid).Group("id")
+		}).Find(&drug).Error
 	}
 	return
 }
 
 func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, err error) {
 
-	db := XTReadDB().Model(&good).Where("org_id =? and status = 1", orgid)
+	db := XTReadDB().Model(&good).Where("org_id =? and status = 1 and good_status <> '停用'", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(good_name Like ?)", likekey).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
 		}).Find(&good).Error
 	} else {
-		err = db.Find(&good).Error
+		err = db.Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
+		}).Find(&good).Error
 	}
 	return
 }
@@ -3287,7 +3268,7 @@ func GetAutoMaticReduceDetail(orgid int64, patient_id int64, recordtime int64, g
 func DeleteAutoRedeceDetailTwo(orgid int64, patient_id int64, recordtime int64, goodid int64, goodtypeid int64) error {
 
 	detail := models.BloodAutomaticReduceDetail{}
-	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
 	return err
 }
 
@@ -3296,6 +3277,12 @@ func UpDateWarehouseInfoByStockDelete(id int64, count int64) (err error) {
 	return err
 }
 
+func UpDateWarehouStockFlowByStockDelete(id int64, recordtime int64, good_id int64, count int64, patient_id int64) (err error) {
+
+	err = writeDb.Model(&models.VmStockFlow{}).Where("warehousing_id = ? and system_time = ? and good_id = ? and patient_id = ?", id, recordtime, good_id, patient_id).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
+	return err
+}
+
 func UpDateWarehouseInfoByStockDeleteOne(id int64, count int64) (err error) {
 	err = writeDb.Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
 	return err
@@ -3320,6 +3307,12 @@ func FindGoodInfoByIdTwo(id int64) (goodInfo models.GoodInfo, err error) {
 	return
 }
 
+func GetGoodWarehouseInfo(good_id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = readDb.Where("good_id = ? and status = 1 and stock_count<>0", good_id).Find(&info).Error
+	return info, err
+}
+
 func GetAllStockList(page int64, limit int64, startime int64, endtime int64, good_type int64, keyword string, orgid int64) (info []*models.VmWarehousingInfo, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -3351,7 +3344,7 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 func GetAllGoodInfoStockList(page int64, limit int64, startime int64, endtime int64, good_type int64, keyword string, orgid int64) (info []*models.GoodInfo, total int64, err error) {
 
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_good_information as x").Where("x.status= 1")
+	db := readDb2.Table("xt_good_information as x").Where("x.status= 1")
 
 	likeKey := "%" + keyword + "%"
 	if len(likeKey) > 0 {
@@ -3438,7 +3431,7 @@ func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, starti
 
 func GetStockDrugCount(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	db := readDb2.Table("xt_warehouse_info as x").Where("x.status = 1")
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
 	}
@@ -3454,7 +3447,7 @@ func GetStockDrugCount(startime int64, endtime int64, orgid int64) (info []*mode
 }
 
 func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
-	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	db := readDb2.Table("xt_warehouse_out_info as x").Where("x.status = 1")
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
 	}
@@ -3472,7 +3465,7 @@ func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*
 func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	if endtime > 0 {
-		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+		err = readDb2.Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
 	}
 	if endtime == 0 {
 		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count,x.record_time FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
@@ -3493,7 +3486,7 @@ func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutI
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -3541,7 +3534,7 @@ func FindUserDetailByIdOne(good_id int64, record_time int64, org_id int64) (user
 	db = db.Preload("GoodsType", "status = 1")
 	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
 	db = db.Preload("WarehouseOutInfo", "org_id = ? and status = 1 and good_id = ? and sys_record_time = ?", org_id, good_id, record_time)
-	db = db.Where("status = 1 AND org_id = ? AND good_id = ? AND record_time = ? ", org_id, good_id, record_time)
+	db = db.Where("status = 1 AND org_id = ? AND good_id = ? AND record_time = ? and count<> 0 ", org_id, good_id, record_time)
 	db = db.Count(&total)
 	err = db.Find(&user).Error
 
@@ -3586,8 +3579,8 @@ func GetExprotStockList(orgid int64, orderid []string, startime int64, endtime i
 
 func GetDrugWarehouOrderInfo(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	db := readDb2.Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := readDb2.Table("xt_base_drug as t").Where("t.status = 1")
 	fmt.Println(table)
 	if startime > 0 {
 		db = db.Where("x.ctime>=?", startime)
@@ -3759,6 +3752,19 @@ func GetDrugTotalCountOne(drugid int64, orgid int64, id int64) (models.VmDrugWar
 	return info, err
 }
 
+func GetDrugTotalCountTwo(drugid int64) (list []*models.VmDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
+	fmt.Println(table)
+	if drugid > 0 {
+		db = db.Where("x.drug_id = ?", drugid)
+	}
+	err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
+
+	return list, err
+}
+
 func GetDrugByGoodId(drugid int64) (models.BaseDrugLib, error) {
 
 	lib := models.BaseDrugLib{}
@@ -3871,7 +3877,7 @@ func GetCancelStockOrderPrintOne(idstr []string, orgid int64) (info []*models.Ca
 
 func GetCancelOutTotalCount(startime int64, endtime int64, orgid int64) (info []*models.VmCancelStockInfo, err error) {
 
-	db := XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
+	db := readDb2.Table("xt_cancel_stock_info as x").Where("x.status = 1")
 
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -3916,6 +3922,21 @@ func GetWarehoureOrderInfoCount(goodid int64, orgid int64, id int64) (info model
 	return info, err
 }
 
+func GetWarehoureOrderStockOutFlow(goodid int64, orgid int64, id int64) (info models.VmStockFlow, err error) {
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status =1 and x.consumable_type = 2 or x.consumable_type = 3")
+	if goodid > 0 {
+		db = db.Where("x.good_id = ?", goodid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if id > 0 {
+		db = db.Where("x.warehousing_id = ?", id)
+	}
+	err = db.Select("x.good_id,sum(x.count) as count").Scan(&info).Error
+	return info, err
+}
+
 func UpdateCancelInfo(id int64) (models.CancelStock, error) {
 	stock := models.CancelStock{}
 	err := XTWriteDB().Model(&stock).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
@@ -3924,13 +3945,13 @@ func UpdateCancelInfo(id int64) (models.CancelStock, error) {
 
 func GetStockBatchNumber(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("good_id = ? and org_id = ? and status = 1 and number <> ''", id, orgid).Group("number").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("good_id = ? and org_id = ? and status = 1 and number <> ''", id, orgid).Find(&info).Error
 	return info, err
 }
 
 func GetWarehouseOutInfoById(id int64, goodid int64) (info []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("warehouse_out_id = ? and good_id = ? and status = 1", id, goodid).Find(&info).Error
+	err = XTReadDB().Where("warehouse_out_id = ? and good_id = ? and status = 1", id, goodid).Find(&info).Error
 	return info, err
 }
 
@@ -3942,7 +3963,7 @@ func GetStockFlowBatchNumber(id int64, goodid int64) (stock []*models.VmStockFlo
 
 func GetStockFlowBatchNumberOne(id int64, goodid int64) (stock []*models.VmStockFlowOne, err error) {
 
-	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1 and count > 0")
 	table := XTReadDB().Table("xt_patients as t").Where("t.status = 1")
 	fmt.Println(table)
 	tableone := XTReadDB().Table("xt_good_information as o").Where("o.status = 1")
@@ -3997,11 +4018,11 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date as expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }
 
-func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid int64) (models.WarehouseOutInfo, error) {
+func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid_id int64) (models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
 	err := XTReadDB().Where("good_id = ? and warehouse_info_id= ? and status =1", goodid, warehouse_info_id).Last(&info).Error
@@ -4036,7 +4057,7 @@ func UpdateWarehousingInfo(info models.WarehousingInfo, id int64) error {
 }
 
 func FindFirstWarehousingInfoByGoodId(good_id int64, id int64) (info models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND status = 1 and id<>?", good_id, id).Order("ctime").First(&info).Error
+	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND status = 1 and stock_count > 0", good_id).Order("ctime asc").First(&info).Error
 	return info, err
 }
 
@@ -4103,6 +4124,12 @@ func UpdatedStockFlow(flow models.VmStockFlow) error {
 	return err
 }
 
+func UpdatedStockFlowOne(flow models.VmStockFlow, warehousing_id int64, patient_id int64, record_time int64, good_id int64) error {
+
+	err = XTWriteDB().Model(&flow).Where("warehousing_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1", warehousing_id, patient_id, record_time, good_id).Updates(map[string]interface{}{"number": flow.Number, "license_number": flow.LicenseNumber, "count": flow.Count, "expire_date": flow.ExpireDate, "product_date": flow.ProductDate, "price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer}).Error
+	return err
+}
+
 func GetStockFlowIsExsit(warehousing_id int64, patient_id int64, record_time int64, good_id int64) (*models.VmStockFlow, error) {
 
 	stock := models.VmStockFlow{}
@@ -4169,6 +4196,13 @@ func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int6
 		if consumable_type == 4 {
 			db = db.Where(" consumable_type = ?", consumable_type)
 		}
+
+		if consumable_type == 10 {
+			db = db.Where(" consumable_type = ?", consumable_type)
+		}
+		if consumable_type == 11 {
+			db = db.Where(" consumable_type = ?", consumable_type)
+		}
 	}
 	if orgId > 0 {
 		db = db.Where("user_org_id = ?", orgId)
@@ -4354,6 +4388,12 @@ func GetDrugWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 	return info, err
 }
 
+func GetDrugWarehouseInfoPrescription(drugid int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and org_id =? and status = 1", drugid, orgid).Find(&info).Error
+	return info, err
+}
+
 func GetDrugWarehouseInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
 
 	info := models.XtDrugWarehouseInfo{}
@@ -4384,15 +4424,29 @@ func GetLastCancelStockInfo(id int64) (models.DrugCancelStockInfo, error) {
 	return info, err
 }
 
+func GetLastCancelStockInfoOne(id int64, drug_id int64) (models.DrugCancelStockInfo, error) {
+
+	info := models.DrugCancelStockInfo{}
+
+	err := XTReadDB().Where("cancel_stock_id = ? and drug_id = ? and status = 1", id, drug_id).Find(&info).Error
+	return info, err
+}
+
 func UpdatedDrugInfo(id int64, count int64) (err error) {
 
-	err = writeDb.Model(&models.DrugWarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	err = XTWriteDB().Model(&models.XtDrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	return err
+}
+
+func UpdatedDrugFlow(cancelstockid int64, drug_id int64, flow models.DrugFlow) error {
+
+	err := XTWriteDB().Model(&models.DrugFlow{}).Where("cancel_stock_id = ? and drug_id = ? and status = 1", cancelstockid, drug_id).Updates(map[string]interface{}{"count": flow.Count}).Error
 	return err
 }
 
 func UpdatedDrugInfoOne(id int64, count int64) (err error) {
 
-	err = writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	err = XTWriteDB().Model(&models.XtDrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
 	return err
 }
 
@@ -4614,6 +4668,63 @@ func GetReportStockList(startime int64, endtime int64, orgid int64, keyword stri
 	return adjust, total, err
 }
 
+func GetStockDamagedList(orgid int64, keyword string, page int64, limit int64, startime int64, endtime int64) (adjust []*models.VmStockInventory, total int64, err error) {
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and x.inventory_type = 4")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
+	fmt.Println(table, tab)
+
+	if len(keyword) > 0 {
+		db = db.Where("x.warehousing_order like ? or r.user_name like ?", likeKey, likeKey)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime <=?", endtime)
+	}
+
+	err = db.Group("x.id").Select("x.ctime,x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,t.packing_unit,r.user_name").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
+	return adjust, total, err
+
+}
+
+func GetStockDamagedCountOne(orgid int64, keyword string, inventory_type int64) (adjust []*models.VmStockInventory, err error) {
+
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1")
+	if inventory_type == 0 {
+		db = db.Where("x.inventory_type = 4")
+	}
+	if inventory_type > 0 {
+		db = db.Where("x.inventory_type = ?", inventory_type)
+	}
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("x.warehousing_order like ?", likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.good_id").Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,sum(x.count) as count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number").Scan(&adjust).Error
+	return adjust, err
+}
+
+func GetStockDamagedCount(orgid int64) (adjust []*models.VmStockInventory, err error) {
+
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and inventory_type = 4 ")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Group("x.good_id").Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,sum(x.count) as count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number").Scan(&adjust).Error
+	return adjust, err
+}
+
 func UpdateCheckDamage(ids []string, reportPrice models.XtStockReportPrice) error {
 
 	err := XTWriteDB().Model(&reportPrice).Where("id in(?) and status = 1", ids).Updates(map[string]interface{}{"checker": reportPrice.Checker, "checker_time": reportPrice.CheckerTime, "checker_status": reportPrice.CheckerStatus}).Error
@@ -4752,17 +4863,17 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_stock_inventory as x").Where("x.status = 1 and x.type = 10")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
 	if len(keyword) > 0 {
-		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
+		db = db.Where("x.good_name like ?", likeKey)
 	}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 
@@ -4845,3 +4956,135 @@ func ModifyDrugWarehouseInfo(info *models.DrugWarehouseInfo, id int64) error {
 	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber, "stock_min_number": info.StockMinNumber}).Error
 	return err
 }
+
+func GetGoodInventoryWarehouseList(id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("good_id = ? and status = 1", id).Preload("GoodInfo", "status = 1").Find(&info).Error
+	return info, err
+}
+
+func UpdatedWarehousingInfo(info models.WarehousingInfo, id int64) error {
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
+	return err
+}
+
+func GetDamageDetailByGoodId(good_id int64, keyword string, inventory_type int64) (list []*models.XtStockInventory, err error) {
+
+	db := XTReadDB().Model(&list).Where(" status = 1")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("warehousing_order like ?", likeKey)
+	}
+	if inventory_type > 0 {
+		db = db.Where("inventory_type = ?", inventory_type)
+	}
+	if inventory_type == 0 {
+		db = db.Where("inventory_type = 4")
+	}
+	err = db.Find(&list).Error
+
+	return list, err
+}
+
+func GetCancelStockId(cancelstock_id int64, drug_id int64) (*models.DrugFlow, error) {
+	flow := models.DrugFlow{}
+	err := XTReadDB().Where("cancel_stock_id = ? and drug_id = ?", cancelstock_id, drug_id).Find(&flow).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &flow, nil
+}
+
+func GetTotalDrugCancelInfo(batchNumber_id int64, drug_id int64, id int64) (info []*models.DrugCancelStockInfo, err error) {
+
+	err = XTReadDB().Where("batch_number_id = ? and drug_id = ? and status = 1 and id<>?", batchNumber_id, drug_id, id).Find(&info).Error
+	return info, err
+}
+
+func GetLastDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Where("drug_id = ? and status =1", drugid).Last(&info).Error
+	return info, err
+}
+
+func GetLastGoodWarehouseInfo(goodid int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Where("good_id =? and status = 1", goodid).Find(&info).Error
+	return info, err
+}
+
+func GetGoodStockFlowInfo(warehouseid int64, goodid int64) (*models.VmStockFlow, error) {
+
+	flow := models.VmStockFlow{}
+	err := XTReadDB().Where("warehousing_detail_id = ? and good_id = ? and status = 1", warehouseid, goodid).Find(&flow).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &flow, nil
+}
+
+func GetLastInfoMationById(id int64) (models.GoodInfo, error) {
+	info := models.GoodInfo{}
+	err := XTReadDB().Where("id =? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdateGoodInfoMation(goodid int64, info models.GoodInfo) error {
+
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", goodid).Updates(map[string]interface{}{"total": info.Total}).Error
+	return err
+}
+
+func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount}).Error
+	return err
+}
+
+func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error {
+
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark}).Error
+	return err
+}
+
+func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
+
+	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count}).Error
+	return err
+}
+
+func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
+	return info, err
+}
+
+func GetDrugWarehouseingInfo(id int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdateDrugWarehouseingInfoSix(id int64, info models.XtDrugWarehouseInfo) error {
+
+	warehouseInfo := models.XtDrugWarehouseInfo{}
+	err := XTWriteDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit}).Error
+	return err
+}