新功能

conf/app.conf

@@ -123,7 +123,8 @@ redisdb = 0
 
 
 
-niprocart =  63
+
+                niprocart =  63
 jms = 58
 fistula_needle_set = 65
 fistula_needle_set_16 = 64
@@ -213,14 +214,11 @@ writesgjpatientmysqlname = sgj_patient
 
 
 
-
-
-
 #redishost = 120.77.235.13
 #redishost = 112.74.16.180
 redishost = localhost
 redisport = 6379
-redispasswrod = syh@#$%123456!
+redispasswrod = 123456
 redisdb = 0
 
 niprocart =  83

controllers/dialysis_api_controller.go

@@ -4370,6 +4370,10 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	receiverTreatmentAccess, _ := service.FindReceiverTreatmentAccessRecordById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+	fmt.Println(dialysis_count)
+	patientInfo.TotalDialysis = dialysis_count
+	fmt.Println(patientInfo.TotalDialysis)
 
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
@@ -4852,7 +4856,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -4873,8 +4877,8 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 {
-		if ultrafiltration_rate > 0 {
+	if template.TemplateId == 6 || template.TemplateId == 20 {
+		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}

controllers/dialysis_record_api_controller.go

@@ -2146,7 +2146,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 {
+				if template.TemplateId == 6 || template.TemplateId == 20 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院
@@ -2281,6 +2281,8 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		return
 	}
 
+	lastAssessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+
 	var tempassessmentAfterDislysis models.AssessmentAfterDislysis
 
 	if assessmentAfterDislysis != nil {
@@ -2318,6 +2320,68 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 	}
 
+	if lastAssessmentAfterDislysis != nil {
+		tempassessmentAfterDislysis.BloodPressureType = lastAssessmentAfterDislysis.BloodPressureType
+
+		tempassessmentAfterDislysis.WeighingWay = lastAssessmentAfterDislysis.WeighingWay
+
+		tempassessmentAfterDislysis.Cruor = lastAssessmentAfterDislysis.Cruor
+		tempassessmentAfterDislysis.SymptomAfterDialysis = lastAssessmentAfterDislysis.SymptomAfterDialysis
+		tempassessmentAfterDislysis.InternalFistula = lastAssessmentAfterDislysis.InternalFistula
+		tempassessmentAfterDislysis.Catheter = lastAssessmentAfterDislysis.Catheter
+		tempassessmentAfterDislysis.Complication = lastAssessmentAfterDislysis.Complication
+		tempassessmentAfterDislysis.Remark = lastAssessmentAfterDislysis.Remark
+		tempassessmentAfterDislysis.DialysisIntakes = lastAssessmentAfterDislysis.DialysisIntakes
+		tempassessmentAfterDislysis.DialysisIntakesFeed = lastAssessmentAfterDislysis.DialysisIntakesFeed
+		tempassessmentAfterDislysis.DialysisIntakesTransfusion = lastAssessmentAfterDislysis.DialysisIntakesTransfusion
+		tempassessmentAfterDislysis.DialysisIntakesBloodTransfusion = lastAssessmentAfterDislysis.DialysisIntakesBloodTransfusion
+
+		tempassessmentAfterDislysis.DialysisIntakesWashpipe = lastAssessmentAfterDislysis.DialysisIntakesWashpipe
+
+		tempassessmentAfterDislysis.BloodAccessPartId = lastAssessmentAfterDislysis.BloodAccessPartId
+		tempassessmentAfterDislysis.BloodAccessPartOperaId = lastAssessmentAfterDislysis.BloodAccessPartOperaId
+
+		tempassessmentAfterDislysis.PuncturePointOozingBlood = lastAssessmentAfterDislysis.PuncturePointOozingBlood
+		tempassessmentAfterDislysis.PuncturePointHaematoma = lastAssessmentAfterDislysis.PuncturePointHaematoma
+		tempassessmentAfterDislysis.InternalFistulaTremorAc = lastAssessmentAfterDislysis.InternalFistulaTremorAc
+		tempassessmentAfterDislysis.PatientGose = lastAssessmentAfterDislysis.PatientGose
+
+		tempassessmentAfterDislysis.InpatientDepartment = lastAssessmentAfterDislysis.InpatientDepartment
+		tempassessmentAfterDislysis.ObservationContent = lastAssessmentAfterDislysis.ObservationContent
+		tempassessmentAfterDislysis.ObservationContentOther = lastAssessmentAfterDislysis.ObservationContentOther
+		tempassessmentAfterDislysis.DryWeight = lastAssessmentAfterDislysis.DryWeight
+
+		tempassessmentAfterDislysis.DialysisProcess = lastAssessmentAfterDislysis.DialysisProcess
+		tempassessmentAfterDislysis.InAdvanceMinute = lastAssessmentAfterDislysis.InAdvanceMinute
+		tempassessmentAfterDislysis.InAdvanceReason = lastAssessmentAfterDislysis.InAdvanceReason
+
+		tempassessmentAfterDislysis.HemostasisMinute = lastAssessmentAfterDislysis.HemostasisMinute
+		tempassessmentAfterDislysis.HemostasisOpera = lastAssessmentAfterDislysis.HemostasisOpera
+		tempassessmentAfterDislysis.TremorNoise = lastAssessmentAfterDislysis.TremorNoise
+
+		tempassessmentAfterDislysis.DisequilibriumSyndrome = lastAssessmentAfterDislysis.DisequilibriumSyndrome
+		tempassessmentAfterDislysis.DisequilibriumSyndromeOption = lastAssessmentAfterDislysis.DisequilibriumSyndromeOption
+		tempassessmentAfterDislysis.ArterialTube = lastAssessmentAfterDislysis.ArterialTube
+
+		tempassessmentAfterDislysis.IntravenousTube = lastAssessmentAfterDislysis.IntravenousTube
+		tempassessmentAfterDislysis.Dialyzer = lastAssessmentAfterDislysis.Dialyzer
+		tempassessmentAfterDislysis.InAdvanceReasonOther = lastAssessmentAfterDislysis.InAdvanceReasonOther
+		tempassessmentAfterDislysis.IsEat = lastAssessmentAfterDislysis.IsEat
+
+		tempassessmentAfterDislysis.DialysisIntakesUnit = lastAssessmentAfterDislysis.DialysisIntakesUnit
+		tempassessmentAfterDislysis.CvcA = lastAssessmentAfterDislysis.CvcA
+		tempassessmentAfterDislysis.CvcV = lastAssessmentAfterDislysis.CvcV
+		tempassessmentAfterDislysis.Channel = lastAssessmentAfterDislysis.Channel
+		tempassessmentAfterDislysis.ReturnBlood = lastAssessmentAfterDislysis.ReturnBlood
+		tempassessmentAfterDislysis.RehydrationVolume = lastAssessmentAfterDislysis.RehydrationVolume
+		tempassessmentAfterDislysis.DialysisDuring = lastAssessmentAfterDislysis.DialysisDuring
+		tempassessmentAfterDislysis.StrokeVolume = lastAssessmentAfterDislysis.StrokeVolume
+		tempassessmentAfterDislysis.BloodFlow = lastAssessmentAfterDislysis.BloodFlow
+		tempassessmentAfterDislysis.SealingFluidDispose = lastAssessmentAfterDislysis.SealingFluidDispose
+		tempassessmentAfterDislysis.SealingFluidSpecial = lastAssessmentAfterDislysis.SealingFluidSpecial
+
+	}
+
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2360,6 +2360,8 @@ func (c *DialysisAPIController) Finish() {
 		return
 	}
 
+	lastAssessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.Org.Id, id, recordDate.Unix())
+
 	_, dialysisOrder := service.FindDialysisRecordById(adminUserInfo.Org.Id, id, recordDate.Unix())
 
 	var tempassessmentAfterDislysis models.AssessmentAfterDislysis
@@ -2409,6 +2411,68 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
+	if lastAssessmentAfterDislysis != nil {
+		tempassessmentAfterDislysis.BloodPressureType = lastAssessmentAfterDislysis.BloodPressureType
+
+		tempassessmentAfterDislysis.WeighingWay = lastAssessmentAfterDislysis.WeighingWay
+
+		tempassessmentAfterDislysis.Cruor = lastAssessmentAfterDislysis.Cruor
+		tempassessmentAfterDislysis.SymptomAfterDialysis = lastAssessmentAfterDislysis.SymptomAfterDialysis
+		tempassessmentAfterDislysis.InternalFistula = lastAssessmentAfterDislysis.InternalFistula
+		tempassessmentAfterDislysis.Catheter = lastAssessmentAfterDislysis.Catheter
+		tempassessmentAfterDislysis.Complication = lastAssessmentAfterDislysis.Complication
+		tempassessmentAfterDislysis.Remark = lastAssessmentAfterDislysis.Remark
+		tempassessmentAfterDislysis.DialysisIntakes = lastAssessmentAfterDislysis.DialysisIntakes
+		tempassessmentAfterDislysis.DialysisIntakesFeed = lastAssessmentAfterDislysis.DialysisIntakesFeed
+		tempassessmentAfterDislysis.DialysisIntakesTransfusion = lastAssessmentAfterDislysis.DialysisIntakesTransfusion
+		tempassessmentAfterDislysis.DialysisIntakesBloodTransfusion = lastAssessmentAfterDislysis.DialysisIntakesBloodTransfusion
+
+		tempassessmentAfterDislysis.DialysisIntakesWashpipe = lastAssessmentAfterDislysis.DialysisIntakesWashpipe
+
+		tempassessmentAfterDislysis.BloodAccessPartId = lastAssessmentAfterDislysis.BloodAccessPartId
+		tempassessmentAfterDislysis.BloodAccessPartOperaId = lastAssessmentAfterDislysis.BloodAccessPartOperaId
+
+		tempassessmentAfterDislysis.PuncturePointOozingBlood = lastAssessmentAfterDislysis.PuncturePointOozingBlood
+		tempassessmentAfterDislysis.PuncturePointHaematoma = lastAssessmentAfterDislysis.PuncturePointHaematoma
+		tempassessmentAfterDislysis.InternalFistulaTremorAc = lastAssessmentAfterDislysis.InternalFistulaTremorAc
+		tempassessmentAfterDislysis.PatientGose = lastAssessmentAfterDislysis.PatientGose
+
+		tempassessmentAfterDislysis.InpatientDepartment = lastAssessmentAfterDislysis.InpatientDepartment
+		tempassessmentAfterDislysis.ObservationContent = lastAssessmentAfterDislysis.ObservationContent
+		tempassessmentAfterDislysis.ObservationContentOther = lastAssessmentAfterDislysis.ObservationContentOther
+		tempassessmentAfterDislysis.DryWeight = lastAssessmentAfterDislysis.DryWeight
+
+		tempassessmentAfterDislysis.DialysisProcess = lastAssessmentAfterDislysis.DialysisProcess
+		tempassessmentAfterDislysis.InAdvanceMinute = lastAssessmentAfterDislysis.InAdvanceMinute
+		tempassessmentAfterDislysis.InAdvanceReason = lastAssessmentAfterDislysis.InAdvanceReason
+
+		tempassessmentAfterDislysis.HemostasisMinute = lastAssessmentAfterDislysis.HemostasisMinute
+		tempassessmentAfterDislysis.HemostasisOpera = lastAssessmentAfterDislysis.HemostasisOpera
+		tempassessmentAfterDislysis.TremorNoise = lastAssessmentAfterDislysis.TremorNoise
+
+		tempassessmentAfterDislysis.DisequilibriumSyndrome = lastAssessmentAfterDislysis.DisequilibriumSyndrome
+		tempassessmentAfterDislysis.DisequilibriumSyndromeOption = lastAssessmentAfterDislysis.DisequilibriumSyndromeOption
+		tempassessmentAfterDislysis.ArterialTube = lastAssessmentAfterDislysis.ArterialTube
+
+		tempassessmentAfterDislysis.IntravenousTube = lastAssessmentAfterDislysis.IntravenousTube
+		tempassessmentAfterDislysis.Dialyzer = lastAssessmentAfterDislysis.Dialyzer
+		tempassessmentAfterDislysis.InAdvanceReasonOther = lastAssessmentAfterDislysis.InAdvanceReasonOther
+		tempassessmentAfterDislysis.IsEat = lastAssessmentAfterDislysis.IsEat
+
+		tempassessmentAfterDislysis.DialysisIntakesUnit = lastAssessmentAfterDislysis.DialysisIntakesUnit
+		tempassessmentAfterDislysis.CvcA = lastAssessmentAfterDislysis.CvcA
+		tempassessmentAfterDislysis.CvcV = lastAssessmentAfterDislysis.CvcV
+		tempassessmentAfterDislysis.Channel = lastAssessmentAfterDislysis.Channel
+		tempassessmentAfterDislysis.ReturnBlood = lastAssessmentAfterDislysis.ReturnBlood
+		tempassessmentAfterDislysis.RehydrationVolume = lastAssessmentAfterDislysis.RehydrationVolume
+		tempassessmentAfterDislysis.DialysisDuring = lastAssessmentAfterDislysis.DialysisDuring
+		tempassessmentAfterDislysis.StrokeVolume = lastAssessmentAfterDislysis.StrokeVolume
+		tempassessmentAfterDislysis.BloodFlow = lastAssessmentAfterDislysis.BloodFlow
+		tempassessmentAfterDislysis.SealingFluidDispose = lastAssessmentAfterDislysis.SealingFluidDispose
+		tempassessmentAfterDislysis.SealingFluidSpecial = lastAssessmentAfterDislysis.SealingFluidSpecial
+
+	}
+
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2683,7 +2747,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 { //adminUserInfo.Org.Id == 9538
+			if template.TemplateId == 6 || template.TemplateId == 20 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 			// 只针对方济医院
@@ -5532,7 +5596,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 {
+			if template.TemplateId == 6 || template.TemplateId == 20 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -5553,7 +5617,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -238,21 +238,11 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	//if monitor == nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorNotExist)
-	//	return
-	//} else {
-	//	if monitor.MonitoringNurse != adminInfo.AdminUser.Id {
-	//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminInfo.Org.Id, adminInfo.App.Id, adminInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-	//		if getPermissionErr != nil {
-	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//			return
-	//		} else if headNursePermission == nil {
-	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-	//			return
-	//		}
-	//	}
-	//}
+	if monitor == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeMonitorNotExist)
+		return
+	}
+
 	monitor.Conductivity = conductivity
 	monitor.DialysisOrderId = orderID
 	monitor.MonitoringDate = date
@@ -325,19 +315,6 @@ func (this *DialysisAPIController) DeleteMonitor() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	//if monitor != nil {
-	//	if monitor.MonitoringNurse != adminInfo.AdminUser.Id {
-	//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminInfo.Org.Id, adminInfo.App.Id, adminInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-	//		if getPermissionErr != nil {
-	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//			return
-	//		} else if headNursePermission == nil {
-	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-	//			return
-	//		}
-	//	}
-	//}
-
 	err := service.DisableMonitor(adminInfo.Org.Id, patientID, recordID, adminInfo.AdminUser.Id)
 	if err != nil {
 		this.ErrorLog("删除透析监测记录失败：%v", err)

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -21,7 +21,6 @@ type HomeController struct {
 }
 
 func (this *HomeController) GetHomeData() {
-
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	if adminUserInfo.Org != nil && adminUserInfo.Org.Id != 0 {
 		//获取该管理员所有机构列表

controllers/new_mobile_api_controllers/management_analyse_api_controller.go

@@ -0,0 +1,136 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/service/management_service"
+	service "XT_New/service/print_data_service/schedule_dialysis"
+	"XT_New/utils"
+	"time"
+)
+
+type ManagementAnalyseApiController struct {
+	NewMobileBaseAPIAuthController
+}
+
+func (this *ManagementAnalyseApiController) StockRecordPrintData() {
+	types, _ := this.GetInt("type", 0)
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	adminUserInfo := this.GetMobileAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, err := service.FindPrintStockGoodInfoByType(types, startTime, endTime, adminUserInfo.Org.Id)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+			"type": types,
+		})
+	}
+}
+func (this *ManagementAnalyseApiController) StatisticsPatientChart() {
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	statistics_type, _ := this.GetInt("type", 0)
+
+	adminUserInfo := this.GetMobileAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	data, total_one, _ := management_service.GetPatientChartData(adminUserInfo.Org.Id, startTime, endTime, statistics_type)
+	total, _ := management_service.GetLapsetoPatientTotal(adminUserInfo.Org.Id, statistics_type)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"chart_data": data,
+		"total_one":  total_one,
+		"total":      total,
+	})
+
+}
+func (this *ManagementAnalyseApiController) StatisticsPatientTable() {
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	statistics_type, _ := this.GetInt("type", 0)
+	page, _ := this.GetInt64("page", 0)
+	limit, _ := this.GetInt64("limit", 0)
+
+	if page == 0 {
+		page = 1
+	}
+	if limit == 0 {
+		limit = 20
+	}
+
+	adminUserInfo := this.GetMobileAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	data, total, _ := management_service.GetPatientTableData(adminUserInfo.Org.Id, page, limit, startTime, endTime, statistics_type)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data":  data,
+		"total": total,
+	})
+
+}

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -551,6 +551,15 @@ func (this *NewRoleApiController) EditFunctionPermission() {
 	func_permissions, err := service.GetRoleFuncPurviewIds(role_id)
 	permissions, _ := service.GetRolePurviewIds(role_id)
 
+	redis := service.RedisClient()
+	defer redis.Close()
+
+	users := service.GetAllUserRole(adminUser.Org.Id)
+	for _, item := range users {
+		key := "purviews_" + strconv.FormatInt(adminUser.Org.Id, 10) + strconv.FormatInt(item.AdminUserId, 10)
+		redis.Set(key, "", time.Second)
+	}
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

controllers/new_mobile_api_controllers/patient.json

@@ -78,7 +78,10 @@
       "tell_phone": "21212",
       "first_treatment_date": 1582560000,
       "contact_name": "21221",
-      "is_infectious":1
+      "is_infectious":1,
+      "contagion_ids": ""
+
+
     },
     {
       "avatar": "https://images.shengws.com/201809182128111.png",
@@ -158,7 +161,8 @@
       "tell_phone": "21212",
       "first_treatment_date": 1582560000,
       "contact_name": "21221",
-      "is_infectious":2
+      "is_infectious":2,
+      "contagion_ids": "2"
 
     }
   ]

controllers/new_mobile_api_controllers/statistics_api_controllers.go

@@ -37,4 +37,8 @@ func StatisticsAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/patients/get", &IndexEvaluationApiController{}, "Get:GetAllPatients")
 
+	beego.Router("/m/api/stock/get", &ManagementAnalyseApiController{}, "Get:StockRecordPrintData")
+	beego.Router("/m/api/patientlapseto/chart", &ManagementAnalyseApiController{}, "Get:StatisticsPatientChart")
+	beego.Router("/m/api/patientlapseto/table", &ManagementAnalyseApiController{}, "Get:StatisticsPatientTable")
+
 }

controllers/print_data_api_controller.go

@@ -26,6 +26,7 @@ type PrintDataAPIController struct {
 // @param ids:string 排班 id，以逗号隔开 ("1,2,3")
 func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	schIDStr := this.GetString("ids")
+
 	if len(schIDStr) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

controllers/public_api_controller.go

@@ -165,322 +165,340 @@ func (this *PublicApiController) GetJson() {
 func (c *PublicApiController) HandleData() {
 	//service.HandleData()
 
-	//org_app, _ := service.GetAllAppOrg()
+	org_app, _ := service.GetAllAppOrg()
 	//org_role, _ := service.GetAllRole()
 	//
 	//var org_ids []int64
 
-	//for _, apps := range org_app {
-	//	xt_org_app, _ := service.GetAppByType(int64(apps.OrgId), 3)
-	//	scrm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 1)
-	//	cdm_org_app, _ := service.GetAppByType(int64(apps.OrgId), 4)
-	//	mall_org_app, _ := service.GetAppByType(int64(apps.OrgId), 5)
-	//	org_app_6, _ := service.GetAppByType(int64(apps.OrgId), 6)
-	//	org_app_7, _ := service.GetAppByType(int64(apps.OrgId), 7)
-	//	org_app_8, _ := service.GetAppByType(int64(apps.OrgId), 8)
-	//	org_app_9, _ := service.GetAppByType(int64(apps.OrgId), 9)
-	//	org_app_10, _ := service.GetAppByType(int64(apps.OrgId), 10)
-	//	org_app_11, _ := service.GetAppByType(int64(apps.OrgId), 11)
-	//	org_app_12, _ := service.GetAppByType(int64(apps.OrgId), 12)
-	//	org_app_13, _ := service.GetAppByType(int64(apps.OrgId), 13)
-	//	org_app_14, _ := service.GetAppByType(int64(apps.OrgId), 14)
-	//	org_app_15, _ := service.GetAppByType(int64(apps.OrgId), 15)
-	//
-	//	var xt_temp_org_app *models.OrgApp
-	//	var mall_temp_org_app *models.OrgApp
-	//
-	//	if xt_org_app == nil || xt_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//
-	//		app, _ := service.GetOrgAppA(0, 3)
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//		app.Id = 0
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 0
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//		xt_temp_org_app = app
-	//	} else {
-	//
-	//		xt_temp_org_app = xt_org_app
-	//
-	//	}
-	//
-	//	if scrm_org_app == nil || scrm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//
-	//		app, _ := service.GetOrgAppA(0, 1)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Id = 0
-	//
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 0
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//
-	//	}
-	//
-	//	if cdm_org_app == nil || cdm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 4)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//
-	//	if mall_org_app == nil || mall_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 5)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 0
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//		mall_temp_org_app = app
-	//	} else {
-	//		mall_temp_org_app = mall_org_app
-	//	}
-	//
-	//	if org_app_6 == nil || org_app_6.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 6)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 1
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		app.Pid = xt_temp_org_app.Id
-	//		service.CreateOrgApp(app)
-	//
-	//	}
-	//	if org_app_7 == nil || org_app_7.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 7)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 2
-	//		app.Status = 2
-	//		app.Id = 0
-	//
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		app.Pid = xt_temp_org_app.Id
-	//
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_8 == nil || org_app_8.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 8)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 3
-	//		app.Id = 0
-	//
-	//		app.Pid = mall_temp_org_app.Id
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_9 == nil || org_app_9.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 9)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Pid = xt_temp_org_app.Id
-	//
-	//		app.Creator = int(org.Creator)
-	//		app.Number = 4
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//
-	//	}
-	//	if org_app_10 == nil || org_app_10.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 10)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid = xt_temp_org_app.Id
-	//
-	//		app.Number = 5
-	//		app.Id = 0
-	//
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_11 == nil || org_app_11.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 11)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid = xt_temp_org_app.Id
-	//		app.Id = 0
-	//
-	//		app.Number = 6
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_12 == nil || org_app_12.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 12)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid = xt_temp_org_app.Id
-	//		app.Number = 7
-	//		app.Status = 1
-	//		app.Id = 0
-	//
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_13 == nil || org_app_13.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 13)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid = xt_temp_org_app.Id
-	//		app.Number = 8
-	//		app.Id = 0
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//	if org_app_14 == nil || org_app_14.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 14)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid = xt_temp_org_app.Id
-	//		app.Id = 0
-	//		app.Number = 9
-	//		app.Status = 1
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//
-	//	if org_app_15 == nil || org_app_15.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
-	//		app, _ := service.GetOrgAppA(0, 15)
-	//		//org, _ := service.GetOrgById(int64(12))
-	//		org, _ := service.GetOrgByIdB(int64(apps.OrgId))
-	//		if org == nil || org.Id == 0 {
-	//			continue
-	//		}
-	//
-	//		app.OrgId = apps.OrgId
-	//		app.Creator = int(org.Creator)
-	//		app.Pid = xt_temp_org_app.Id
-	//		app.Number = 10
-	//		app.Status = 1
-	//		app.Id = 0
-	//		app.ModifyTime = time.Now().Unix()
-	//		app.CreateTime = time.Now().Unix()
-	//		service.CreateOrgApp(app)
-	//	}
-	//}
+	for _, apps := range org_app {
+		xt_org_app, _ := service.GetAppByType(int64(apps.OrgId), 3)
+		//org_app_6, _ := service.GetAppByType(int64(apps.OrgId), 6)
+		//org_app_7, _ := service.GetAppByType(int64(apps.OrgId), 7)
+		//org_app_8, _ := service.GetAppByType(int64(apps.OrgId), 8)
+		//org_app_9, _ := service.GetAppByType(int64(apps.OrgId), 9)
+		//org_app_10, _ := service.GetAppByType(int64(apps.OrgId), 10)
+		//org_app_11, _ := service.GetAppByType(int64(apps.OrgId), 11)
+		//org_app_12, _ := service.GetAppByType(int64(apps.OrgId), 12)
+		//org_app_13, _ := service.GetAppByType(int64(apps.OrgId), 13)
+		//org_app_14, _ := service.GetAppByType(int64(apps.OrgId), 14)
+		//org_app_15, _ := service.GetAppByType(int64(apps.OrgId), 15)
+
+		org_app_16, _ := service.GetAppByType(int64(apps.OrgId), 16)
+		org_app_17, _ := service.GetAppByType(int64(apps.OrgId), 17)
+
+		var xt_temp_org_app *models.OrgApp
+		//var mall_temp_org_app *models.OrgApp
+
+		if xt_org_app == nil || xt_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+
+			app, _ := service.GetOrgAppA(0, 3)
+			org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+			if org == nil || org.Id == 0 {
+				continue
+			}
+
+			app.Id = 0
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 0
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			service.CreateOrgApp(app)
+			xt_temp_org_app = app
+		} else {
+
+			xt_temp_org_app = xt_org_app
+
+		}
+
+		//if scrm_org_app == nil || scrm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//
+		//	app, _ := service.GetOrgAppA(0, 1)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Id = 0
+		//
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 0
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//
+		//}
+		//
+		//if cdm_org_app == nil || cdm_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 4)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 0
+		//	app.Id = 0
+		//
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+		//
+		//if mall_org_app == nil || mall_org_app.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 5)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 0
+		//	app.Id = 0
+		//
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//	mall_temp_org_app = app
+		//} else {
+		//	mall_temp_org_app = mall_org_app
+		//}
+		//
+		if org_app_16 == nil || org_app_16.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgAppA(0, 16)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+			if org == nil || org.Id == 0 {
+				continue
+			}
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 11
+			app.Id = 0
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			app.Pid = xt_temp_org_app.Id
+			service.CreateOrgApp(app)
+
+		}
+
+		if org_app_17 == nil || org_app_17.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+			app, _ := service.GetOrgAppA(0, 17)
+			//org, _ := service.GetOrgById(int64(12))
+			org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+			if org == nil || org.Id == 0 {
+				continue
+			}
+
+			app.OrgId = apps.OrgId
+			app.Creator = int(org.Creator)
+			app.Number = 12
+			app.Id = 0
+			app.Status = 1
+			app.ModifyTime = time.Now().Unix()
+			app.CreateTime = time.Now().Unix()
+			app.Pid = xt_temp_org_app.Id
+			service.CreateOrgApp(app)
+
+		}
+		//if org_app_7 == nil || org_app_7.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 7)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 2
+		//	app.Status = 2
+		//	app.Id = 0
+		//
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	app.Pid = xt_temp_org_app.Id
+		//
+		//	service.CreateOrgApp(app)
+		//}
+		//if org_app_8 == nil || org_app_8.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 8)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 3
+		//	app.Id = 0
+		//
+		//	app.Pid = mall_temp_org_app.Id
+		//
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+		//if org_app_9 == nil || org_app_9.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 9)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Pid = xt_temp_org_app.Id
+		//
+		//	app.Creator = int(org.Creator)
+		//	app.Number = 4
+		//	app.Id = 0
+		//
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//
+		//}
+		//if org_app_10 == nil || org_app_10.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 10)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Pid = xt_temp_org_app.Id
+		//
+		//	app.Number = 5
+		//	app.Id = 0
+		//
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+		//if org_app_11 == nil || org_app_11.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 11)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Pid = xt_temp_org_app.Id
+		//	app.Id = 0
+		//
+		//	app.Number = 6
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+		//if org_app_12 == nil || org_app_12.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 12)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Pid = xt_temp_org_app.Id
+		//	app.Number = 7
+		//	app.Status = 1
+		//	app.Id = 0
+		//
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+		//if org_app_13 == nil || org_app_13.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 13)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Pid = xt_temp_org_app.Id
+		//	app.Number = 8
+		//	app.Id = 0
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+		//if org_app_14 == nil || org_app_14.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 14)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Pid = xt_temp_org_app.Id
+		//	app.Id = 0
+		//	app.Number = 9
+		//	app.Status = 1
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+
+		//if org_app_15 == nil || org_app_15.Id == 0 { //判断之前是否有创建该app类型，如果没有则插入数据
+		//	app, _ := service.GetOrgAppA(0, 15)
+		//	//org, _ := service.GetOrgById(int64(12))
+		//	org, _ := service.GetOrgByIdB(int64(apps.OrgId))
+		//	if org == nil || org.Id == 0 {
+		//		continue
+		//	}
+		//
+		//	app.OrgId = apps.OrgId
+		//	app.Creator = int(org.Creator)
+		//	app.Pid = xt_temp_org_app.Id
+		//	app.Number = 10
+		//	app.Status = 1
+		//	app.Id = 0
+		//	app.ModifyTime = time.Now().Unix()
+		//	app.CreateTime = time.Now().Unix()
+		//	service.CreateOrgApp(app)
+		//}
+	}
 
 	//for _, role := range org_role {
 	//	org_ids = append(org_ids, role.OrgId)

controllers/role_controller.go

@@ -302,6 +302,15 @@ func (this *RoleAPIController) EditPurview() {
 		return
 	}
 
+	redis := service.RedisClient()
+	defer redis.Close()
+
+	users := service.GetAllUserRole(adminUserInfo.CurrentOrgId)
+	for _, item := range users {
+		key := "purviews_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + strconv.FormatInt(item.AdminUserId, 10)
+		redis.Set(key, "", time.Second)
+	}
+
 	err := service.SaveRolePurviewIds(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, roleId, purviewIds)
 	err = service.SaveFuncRolePurviewIds(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, roleId, funcPurviewIds)
 

csx的数据变更脚本.sql

@@ -0,0 +1,9 @@
+--2020-07-13  --
+--修改应用的状态和排序--
+UPDATE sgj_user_org_app SET open_status = 1 WHERE name = '质控管理'
+UPDATE sgj_user_org_app SET number = 3 WHERE name = '质控管理'
+UPDATE sgj_user_org_app SET number = 4 WHERE name =  '分销商城'
+UPDATE sgj_user_org_app SET number = 5 WHERE name = '排班管理'
+UPDATE sgj_user_org_app SET status = 0 WHERE name = '签到称重' OR  name = '设备管理' OR name='质控上报' OR name='库存管理' OR name ='院感管理'
+
+

models/vm_models.go

@@ -86,6 +86,8 @@ type VMOrgPatients struct {
 	FirstTreatmentDate       int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
 	ContactName              string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
 	UserSysBeforeCount       int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+
+	ContagionIds string `json:"contagion_ids" gorm:"-"`
 }
 
 func (VMOrgPatients) TableName() string {

service/dialysis_service.go

@@ -638,7 +638,9 @@ func GetDialysisWatch(orgID int64, schedulDate int64, schedulType int64, partiti
 		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND  user_org_id = ?", orgID).
 		Preload("AssessmentAfterDislysis", "status = 1 AND  user_org_id = ?", orgID).
-		Preload("MonitoringRecord", "status = 1 AND  user_org_id = ?", orgID).
+		Preload("MonitoringRecord", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("operate_time desc")
+		}).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
 	db = db.Where("xt_schedule.status = 1 AND user_org_id = ?", orgID)

service/management_service/management_analyse_service.go

@@ -0,0 +1,57 @@
+package management_service
+
+import "XT_New/service"
+
+type ChartDataStruct struct {
+	Date  string `json:"date"`
+	Value int64  `json:"value"`
+}
+
+//患者统计
+func GetPatientChartData(user_org_id int64, start_time int64, end_time int64, statistics_type int) (datas []*ChartDataStruct, total int64, err error) {
+	db := service.XTReadDB()
+	switch statistics_type {
+	case 1:
+		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 1 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+
+		break
+	case 2:
+		//err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+
+		break
+	}
+	for _, item := range datas {
+		total = total + item.Value
+	}
+
+	if err != nil {
+		return nil, 0, err
+	}
+	return datas, total, nil
+}
+
+type PatientTableStruct struct {
+	Date     string `json:"date"`
+	Name     string `json:"name"`
+	IdCardNo string `json:"id_card_no"`
+	Gender   int    `json:"gender"`
+}
+
+func GetPatientTableData(orgID int64, page, limit, start, end int64, statistics_type int) ([]*PatientTableStruct, int64, error) {
+	//offset := (page - 1) * limit
+	var total int64
+	var err error
+	var patients []*PatientTableStruct
+	readDb := service.XTReadDB()
+	db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
+	err = db.Order("lapseto.lapseto_time desc").Scan(&patients).Error
+	//.Offset(offset).Limit(limit)
+	return patients, total, err
+}
+
+func GetLapsetoPatientTotal(orgID int64, statistics_type int) (Total int64, err error) {
+	readDb := service.XTReadDB()
+	err = readDb.Raw("select count(*) as total from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type =?", orgID, statistics_type).Count(&Total).Error
+	return Total, err
+}

service/management_service/management_models.go

@@ -0,0 +1,103 @@
+package management_service
+
+type PatientLapseto struct {
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	LapsetoType int64 `gorm:"column:lapseto_type" json:"lapseto_type" form:"lapseto_type"`
+	LapsetoTime int64 `gorm:"column:lapseto_time" json:"lapseto_time" form:"lapseto_time"`
+	Status      int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+}
+
+func (PatientLapseto) TableName() string {
+	return "xt_patient_lapseto"
+}
+
+type Patients struct {
+	ID                           int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	UserId                       int64   `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Avatar                       string  `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	PatientType                  int64   `gorm:"column:patient_type" json:"patient_type" form:"patient_type"`
+	DialysisNo                   string  `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	AdmissionNumber              string  `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	Source                       int64   `gorm:"column:source" json:"source" form:"source"`
+	Lapseto                      int64   `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	PartitionId                  int64   `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                        int64   `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name                         string  `gorm:"column:name" json:"name" form:"name"`
+	Alias                        string  `gorm:"column:alias" json:"alias" form:"alias"`
+	Gender                       int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	MaritalStatus                int64   `gorm:"column:marital_status" json:"marital_status" form:"marital_status"`
+	IdCardNo                     string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	Birthday                     int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	ReimbursementWayId           int64   `gorm:"column:reimbursement_way_id" json:"reimbursement_way_id" form:"reimbursement_way_id"`
+	HealthCareType               int64   `gorm:"column:health_care_type" json:"health_care_type" form:"health_care_type"`
+	HealthCareNo                 string  `gorm:"column:health_care_no" json:"health_care_no" form:"health_care_no"`
+	HealthCareDueDate            int64   `gorm:"column:health_care_due_date" json:"health_care_due_date" form:"health_care_due_date"`
+	Height                       int64   `gorm:"column:height" json:"height" form:"height"`
+	BloodType                    int64   `gorm:"column:blood_type" json:"blood_type" form:"blood_type"`
+	Rh                           int64   `gorm:"column:rh" json:"rh" form:"rh"`
+	HealthCareDueAlertDate       int64   `gorm:"column:health_care_due_alert_date" json:"health_care_due_alert_date" form:"health_care_due_alert_date"`
+	EducationLevel               int64   `gorm:"column:education_level" json:"education_level" form:"education_level"`
+	Profession                   int64   `gorm:"column:profession" json:"profession" form:"profession"`
+	Phone                        string  `gorm:"column:phone" json:"phone" form:"phone"`
+	HomeTelephone                string  `gorm:"column:home_telephone" json:"home_telephone" form:"home_telephone"`
+	RelativePhone                string  `gorm:"column:relative_phone" json:"relative_phone" form:"relative_phone"`
+	RelativeRelations            string  `gorm:"column:relative_relations" json:"relative_relations" form:"relative_relations"`
+	HomeAddress                  string  `gorm:"column:home_address" json:"home_address" form:"home_address"`
+	WorkUnit                     string  `gorm:"column:work_unit" json:"work_unit" form:"work_unit"`
+	UnitAddress                  string  `gorm:"column:unit_address" json:"unit_address" form:"unit_address"`
+	Children                     int64   `gorm:"column:children" json:"children" form:"children"`
+	ReceivingDate                int64   `gorm:"column:receiving_date" json:"receiving_date" form:"receiving_date"`
+	IsHospitalFirstDialysis      int64   `gorm:"column:is_hospital_first_dialysis" json:"is_hospital_first_dialysis" form:"is_hospital_first_dialysis"`
+	FirstDialysisDate            int64   `gorm:"column:first_dialysis_date" json:"first_dialysis_date" form:"first_dialysis_date"`
+	FirstDialysisHospital        string  `gorm:"column:first_dialysis_hospital" json:"first_dialysis_hospital" form:"first_dialysis_hospital"`
+	PredialysisCondition         string  `gorm:"column:predialysis_condition" json:"predialysis_condition" form:"predialysis_condition"`
+	PreHospitalDialysisFrequency string  `gorm:"column:pre_hospital_dialysis_frequency" json:"pre_hospital_dialysis_frequency" form:"pre_hospital_dialysis_frequency"`
+	PreHospitalDialysisTimes     int64   `gorm:"column:pre_hospital_dialysis_times" json:"pre_hospital_dialysis_times" form:"pre_hospital_dialysis_times"`
+	HospitalFirstDialysisDate    int64   `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	InductionPeriod              int64   `gorm:"column:induction_period" json:"induction_period" form:"induction_period"`
+	InitialDialysis              int64   `gorm:"column:initial_dialysis" json:"initial_dialysis" form:"initial_dialysis"`
+	TotalDialysis                int64   `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	AttendingDoctorId            int64   `gorm:"column:attending_doctor_id" json:"attending_doctor_id" form:"attending_doctor_id"`
+	HeadNurseId                  int64   `gorm:"column:head_nurse_id" json:"head_nurse_id" form:"head_nurse_id"`
+	Evaluate                     string  `gorm:"column:evaluate" json:"evaluate" form:"evaluate"`
+	Diagnose                     string  `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	Remark                       string  `gorm:"column:remark" json:"remark" form:"remark"`
+	RegistrarsId                 int64   `gorm:"column:registrars_id" json:"registrars_id" form:"registrars_id"`
+	Registrars                   string  `gorm:"column:registrars" json:"registrars" form:"registrars"`
+	QrCode                       string  `gorm:"column:qr_code" json:"qr_code" form:"qr_code"`
+	BindingState                 int64   `gorm:"column:binding_state" json:"binding_state" form:"binding_state"`
+	PatientComplains             string  `gorm:"column:patient_complains" json:"patient_complains" form:"patient_complains"`
+	PresentHistory               string  `gorm:"column:present_history" json:"present_history" form:"present_history"`
+	PastHistory                  string  `gorm:"column:past_history" json:"past_history" form:"past_history"`
+	Temperature                  float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	Pulse                        int64   `gorm:"column:pulse" json:"pulse" form:"pulse"`
+	Respiratory                  int64   `gorm:"column:respiratory" json:"respiratory" form:"respiratory"`
+	Sbp                          int64   `gorm:"column:sbp" json:"sbp" form:"sbp"`
+	Dbp                          int64   `gorm:"column:dbp" json:"dbp" form:"dbp"`
+	Status                       int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                  int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                  int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Nation                       string  `gorm:"column:nation" json:"nation" form:"nation"`
+	NativePlace                  string  `gorm:"column:native_place" json:"native_place" form:"native_place"`
+	Age                          int64   `gorm:"column:age" json:"age" form:"age"`
+	InfectiousNextRecordTime     int64   `gorm:"column:infectious_next_record_time" json:"infectious_next_record_time" form:"infectious_next_record_time"`
+	IsInfectious                 int64   `gorm:"column:is_infectious" json:"is_infectious" form:"is_infectious"`
+	IsOpenRemind                 int64   `gorm:"column:is_open_remind" json:"is_open_remind" form:"is_open_remind"`
+	RemindCycle                  int64   `gorm:"column:remind_cycle" json:"remind_cycle" form:"remind_cycle"`
+	ResponseResult               string  `gorm:"column:response_result" json:"response_result" form:"response_result"`
+	FirstTreatmentDate           int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	DialysisAge                  int64   `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	ExpenseKind                  int64   `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone                    string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	ContactName                  string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	UserSysBeforeCount           int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	IsExcelExport                int64   `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
+}
+
+func (Patients) TableName() string {
+	return "xt_patients"
+}

service/mobile_dialysis_service.go

@@ -1239,3 +1239,8 @@ func GetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*models.Sys
 	}
 	return &record, nil
 }
+
+func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date <= ? AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", recordDate, orgID, patient_id).Count(&count).Error
+	return
+}

service/patient_service.go

@@ -81,7 +81,7 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 }
 
 func GetPatientListByUpdateTime(orgID int64, syncTime int64, force int64) (patients []*models.PatientListForFaceList, total int64, err error) {
-	db := readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=? and status=1", orgID)
+	db := readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=?  AND  status=1  AND  avatar <> 'https://images.shengws.com/201809182128222.png' AND avatar <> 'https://images.shengws.com/201809182128111.png' AND avatar <> ''", orgID)
 	if force == 0 {
 		db = db.Where("updated_time >= ?", syncTime)
 	}
@@ -90,7 +90,7 @@ func GetPatientListByUpdateTime(orgID int64, syncTime int64, force int64) (patie
 }
 
 func GetPatientListById(orgID int64, patientId int64) (patients models.PatientListForFace, err error) {
-	err = readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=? and id = ? and status=1", orgID,patientId).First(&patients).Error
+	err = readDb.Model(&models.PatientListForFaceList{}).Where("user_org_id=? and id = ? and status=1", orgID, patientId).First(&patients).Error
 	return
 }
 
@@ -352,8 +352,8 @@ func UpdatePatient(patient *models.Patients, contagions []int64, diseases []int6
 			insertData = append(insertData, patient.ID)
 			insertData = append(insertData, contagion)
 			insertData = append(insertData, 1)
-			insertData = append(insertData, patient.CreatedTime)
-			insertData = append(insertData, patient.UpdatedTime)
+			insertData = append(insertData, time.Now().Unix())
+			insertData = append(insertData, time.Now().Unix())
 		}
 		thisSQL += strings.Join(insertParams, ", ")
 		err = utx.Exec(thisSQL, insertData...).Error
@@ -377,8 +377,8 @@ func UpdatePatient(patient *models.Patients, contagions []int64, diseases []int6
 			insertData = append(insertData, patient.ID)
 			insertData = append(insertData, disease)
 			insertData = append(insertData, 1)
-			insertData = append(insertData, patient.CreatedTime)
-			insertData = append(insertData, patient.UpdatedTime)
+			insertData = append(insertData, time.Now().Unix())
+			insertData = append(insertData, time.Now().Unix())
 		}
 		thisSQL += strings.Join(insertParams, ", ")
 		err = utx.Exec(thisSQL, insertData...).Error
@@ -675,7 +675,7 @@ func DeleteDoctorAdvice(m *models.DoctorAdvice) (err error) {
 			ut.Rollback()
 			return
 		}
-		err = ut.Model(&models.DoctorAdvice{}).Where("parent_id=?", m.ID).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0, "Modifier": m.Modifier}).Error
+		err = ut.Model(&models.DoctorAdvice{}).Where("parent_id=? AND user_org_id = ?", m.ID, m.UserOrgId).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0, "Modifier": m.Modifier}).Error
 		if err != nil {
 			ut.Rollback()
 			return

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -137,27 +137,27 @@ func FindPrintStockGoodInfoByType(types int, startTime int64, end_time int64, or
 	db = db.Model(&models.StockInfo{})
 	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
 	if types == 1 {
-		db = db.Joins("JOIN xt_warehouse_info AS info ON info.good_id=xt_good_information.id AND info.status = 1").Group("xt_good_information.id")
+		db = db.Joins("JOIN xt_warehouse_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
 		db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1", orgId).Joins("JOIN xt_warehouse AS warehouse ON warehouse.id = xt_warehouse_info.warehousing_id AND warehouse.status = 1 AND warehouse.warehousing_time >=? AND warehouse.warehousing_time<= ?", startTime, end_time)
+			return db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1", orgId).Joins("JOIN xt_warehouse AS warehouse ON warehouse.id = xt_warehouse_info.warehousing_id AND warehouse.status = 1 AND warehouse.warehousing_time >=? AND warehouse.warehousing_time<= ? AND warehouse.org_id = ?", startTime, end_time, orgId)
 		})
 	} else if types == 2 {
-		db = db.Joins("JOIN xt_sales_return_info AS info ON info.good_id=xt_good_information.id AND info.status = 1").Group("xt_good_information.id")
+		db = db.Joins("JOIN xt_sales_return_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
 		db = db.Preload("QuerySalesReturnInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("xt_sales_return_info.org_id = ? AND xt_sales_return_info.status = 1", orgId).Joins("JOIN xt_sales_return AS sales ON sales.id = xt_sales_return_info.sales_return_id AND sales.status = 1 AND sales.return_time >=? AND sales.return_time<= ?", startTime, end_time)
+			return db.Where("xt_sales_return_info.org_id = ? AND xt_sales_return_info.status = 1", orgId).Joins("JOIN xt_sales_return AS sales ON sales.id = xt_sales_return_info.sales_return_id AND sales.status = 1 AND sales.return_time >=? AND sales.return_time<= ? AND sales.org_id = ?", startTime, end_time, orgId)
 		})
 
 	} else if types == 3 {
-		db = db.Joins("JOIN xt_warehouse_out_info AS info ON info.good_id=xt_good_information.id AND info.status = 1").Group("xt_good_information.id")
+		db = db.Joins("JOIN xt_warehouse_out_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
 		db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1", orgId).Joins("JOIN xt_warehouse_out ON xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.status = 1 AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ?", startTime, end_time)
+			return db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1", orgId).Joins("JOIN xt_warehouse_out ON xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.status = 1 AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.org_id = ? ", startTime, end_time, orgId)
 		})
 
 	} else if types == 4 {
 
-		db = db.Joins("JOIN xt_cancel_stock_info AS info ON info.good_id=xt_good_information.id AND info.status = 1").Group("xt_good_information.id")
+		db = db.Joins("JOIN xt_cancel_stock_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgId).Group("xt_good_information.id")
 		db = db.Preload("QueryCancelStockInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId).Joins("JOIN xt_cancel_stock AS cancel ON cancel.id = xt_cancel_stock_info.cancel_stock_id AND cancel.status = 1 AND cancel.return_time >=? AND cancel.return_time<= ?", startTime, end_time)
+			return db.Where("xt_cancel_stock_info.org_id = ? AND xt_cancel_stock_info.status = 1", orgId).Joins("JOIN xt_cancel_stock AS cancel ON cancel.id = xt_cancel_stock_info.cancel_stock_id AND cancel.status = 1 AND cancel.return_time >=? AND cancel.return_time<= ? AND cancel.org_id = ?", startTime, end_time, orgId)
 		})
 
 	}

service/statistics_service/index_evaluation_service.go

@@ -104,17 +104,16 @@ func GetDialysisProcessIndexOtherChartData(user_org_id int64, patient_id int64,
 
 		break
 	case 10:
-		config, _ := GetAnticoagulantData(user_org_id)
-		selectContent := "CASE"
-		for _, item := range config {
-			fmt.Println(selectContent)
-			selectContent = selectContent + " WHEN p.anticoagulant =" + strconv.Itoa(item.Value) + " THEN " + "'" + item.Name + "'"
-
-		}
-		fmt.Println("selectContent 是什么=============================================", selectContent)
 		tempErr = db.Table("xt_dialysis_prescription as p").Where("p.user_org_id=? and p.status=1 and  p.record_date >= ? and p.record_date <= ? AND p.patient_id = ? ", user_org_id, start_time, end_time, patient_id).
-			Select(selectContent +
-				" ELSE '未知' END AS name, COUNT(*) AS total").Group("p.anticoagulant").Scan(&items).Error
+			Select("CASE WHEN p.anticoagulant = 1 THEN '无肝素'" +
+				" WHEN p.anticoagulant = 2 THEN '普通肝素'" +
+				" WHEN p.anticoagulant = 3 THEN '低分子肝素'" +
+				" WHEN p.anticoagulant = 4 THEN '阿加曲班'" +
+				" WHEN p.anticoagulant = 5 THEN '枸橼酸钠'" +
+				" WHEN p.anticoagulant = 6 THEN '低分子肝素钙'" +
+				" WHEN p.anticoagulant = 7 THEN '低分子肝素钠'" +
+				" ELSE '未知' END AS name, COUNT(*) AS total",
+			).Group("p.anticoagulant").Scan(&items).Error
 
 		break
 	}
@@ -1121,10 +1120,10 @@ func GetBloodPressureTableData(orgID, patientID int64, page, limit, start, end i
 	db = db.Preload("VMPredialysisEvaluation", "status = 1 AND user_org_id = ?", orgID).
 		Preload("VMAssessmentAfterDislysis", "status = 1 AND user_org_id = ?", orgID).
 		Preload("VMMinMonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("diastolic_blood_pressure ASC")
+			return db.Where("user_org_id = ? AND status = 1", orgID).Order("diastolic_blood_pressure ASC")
 		}).
 		Preload("VMMaxMonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("systolic_blood_pressure DESC")
+			return db.Where("user_org_id = ? AND status = 1 ", orgID).Order("systolic_blood_pressure DESC")
 		}).
 		Preload("VMPatients", "status = 1 AND user_org_id = ?", orgID)
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("sch.schedule_date desc").Select(" sch.schedule_date,sch.patient_id,sch.user_org_id").Find(&orders).Error

service/stock_service.go

@@ -173,6 +173,7 @@ func AddSigleGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 
 func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 	err := writeDb.Model(&models.GoodInfo{}).Where("id = ? AND status = 1", goodInfo.ID).Updates(map[string]interface{}{
+		"good_type_id":               goodInfo.GoodTypeId,
 		"modifier":                   goodInfo.Modifier,
 		"mtime":                      time.Now().Unix(),
 		"remark":                     goodInfo.Remark,

service/vm_service.go

@@ -2,10 +2,32 @@ package service
 
 import (
 	"XT_New/models"
+	"strconv"
 )
 
 func CreateVMOrgPatient(patients *models.VMOrgPatients) {
 	writeDb.Model(&models.VMOrgPatients{}).Create(&patients)
+
+	var lapseto models.PatientLapseto
+	lapseto.PatientId = patients.ID
+	lapseto.LapsetoType = patients.Lapseto
+	lapseto.CreatedTime = patients.CreatedTime
+	lapseto.UpdatedTime = patients.CreatedTime
+	lapseto.Status = 1
+	lapseto.LapsetoTime = patients.CreatedTime
+	writeDb.Create(&lapseto)
+
+	if len(patients.ContagionIds) > 0 {
+		var diseases models.InfectiousDiseases
+		diseases.PatientId = patients.ID
+		diseases.Status = 1
+		diseases.UpdatedTime = patients.UpdatedTime
+		diseases.CreatedTime = patients.CreatedTime
+		id, _ := strconv.ParseInt(patients.ContagionIds, 10, 64)
+		diseases.DiseaseId = id
+		writeDb.Create(&diseases)
+	}
+
 }
 
 func CreateVMOrgNewPatient(patientsNew *models.XtPatientsNew) {