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

controllers/base_api_controller.go

@@ -2,10 +2,15 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
-	"fmt"
+	"encoding/json"
+	"os"
+	"path"
+	"runtime"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type BaseAPIController struct {
@@ -69,56 +74,72 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 10215
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 10215
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
 
 	if this.Ctx.Request.Header.Get("Permission") == "2" {
+		err_msgs := LoadErrMsgConfig("./err_msg.json").Msgs
+
 		org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
 		if adminUserInfo.AdminUser.Id != org.Creator { //超级管理员不受此限制
 
 			isPermission := false
 			adminUserInfo := this.GetAdminUserInfo()
-			//该机构下该用户有多少个
-			role, _ := service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
-			var roles []string
-			if len(role.RoleIds) <= 0 { //该用户没有设置角色
 
+			redisClient := service.RedisClient()
+			defer redisClient.Close()
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
+			result, _ := redisClient.Get(key).Result()
+			var role models.App_Role
+			var roles []string
+			if len(result) == 0 {
+				//该机构下该用户有多少个
+				role, _ = service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
+				redisClient.Set(key, role, time.Second*60*60*18)
+				if len(role.RoleIds) > 0 { //该用户没有设置角色
+					roles = strings.Split(role.RoleIds, ",")
+				}
 			} else {
-				roles = strings.Split(role.RoleIds, ",")
+				json.Unmarshal([]byte(result), &role)
+				if len(role.RoleIds) > 0 { //该用户没有设置角色
+					roles = strings.Split(role.RoleIds, ",")
+				}
 			}
-			fmt.Println(roles)
+
+			//key := strconv.FormatInt(role_id, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
+			//result, _ := redisClient.Get(key).Result()
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -134,7 +155,7 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
-			fmt.Println("userRolePurviewsArr", userRolePurviewsArr)
+
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -155,7 +176,13 @@ func (this *BaseAuthAPIController) Prepare() {
 						}
 					}
 					if !isPermission {
-						msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+						var msg string
+						for _, item := range err_msgs {
+							if strings.Index(item.Url, strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode")) != -1 {
+								msg = item.ErrMsg
+							}
+						}
+						//msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 						json := make(map[string]interface{})
 						json["msg"] = msg
 						json["code"] = 0
@@ -171,20 +198,33 @@ func (this *BaseAuthAPIController) Prepare() {
 	}
 
 	if this.Ctx.Request.Header.Get("Permission") == "3" {
+		err_msgs := LoadErrMsgConfig("./err_msg.json").Msgs
+
 		org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
 		if adminUserInfo.AdminUser.Id != org.Creator { //超级管理员不受此限制
 
 			isPermission := false
 			adminUserInfo := this.GetAdminUserInfo()
 			//该机构下该用户有多少个
-			role, _ := service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
+			redisClient := service.RedisClient()
+			defer redisClient.Close()
+			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
+			result, _ := redisClient.Get(key).Result()
+			var role models.App_Role
 			var roles []string
-			if len(role.RoleIds) <= 0 { //该用户没有设置角色
-
+			if len(result) == 0 {
+				//该机构下该用户有多少个
+				role, _ = service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
+				redisClient.Set(key, role, time.Second*60*60*18)
+				if len(role.RoleIds) > 0 { //该用户没有设置角色
+					roles = strings.Split(role.RoleIds, ",")
+				}
 			} else {
-				roles = strings.Split(role.RoleIds, ",")
+				json.Unmarshal([]byte(result), &role)
+				if len(role.RoleIds) > 0 { //该用户没有设置角色
+					roles = strings.Split(role.RoleIds, ",")
+				}
 			}
-			fmt.Println(roles)
 
 			//获取该用户下所有角色的权限总集
 			var userRolePurviews string
@@ -200,7 +240,6 @@ func (this *BaseAuthAPIController) Prepare() {
 			}
 			//该用户所拥有角色的权限的总集
 			userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
-			fmt.Println(userRolePurviewsArr)
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
 
@@ -219,7 +258,13 @@ func (this *BaseAuthAPIController) Prepare() {
 						}
 					}
 					if !isPermission {
-						msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
+						var msg string
+						for _, item := range err_msgs {
+							if strings.Index(item.Url, strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode")) != -1 {
+								msg = item.ErrMsg
+							}
+						}
+						//msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
 						json := make(map[string]interface{})
 						json["msg"] = msg
 						json["code"] = 0
@@ -316,35 +361,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 10215
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 10215
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {
@@ -381,3 +426,33 @@ func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
 	}
 	return
 }
+
+type ErrMsgConfig struct {
+	Msgs []*models.ErrMsg "json:msg"
+}
+
+func LoadErrMsgConfig(dataFile string) *ErrMsgConfig {
+	var config ErrMsgConfig
+	_, filename, _, _ := runtime.Caller(1)
+	datapath := path.Join(path.Dir(filename), dataFile)
+	config_file, err := os.Open(datapath)
+	if err != nil {
+		emit("Failed to open config file '%s': %s\n", datapath, err)
+		return &config
+	}
+	fi, _ := config_file.Stat()
+	buffer := make([]byte, fi.Size())
+	_, err = config_file.Read(buffer)
+	buffer, err = StripComments(buffer) //去掉注释
+	if err != nil {
+		emit("Failed to strip comments from json: %s\n", err)
+		return &config
+	}
+	buffer = []byte(os.ExpandEnv(string(buffer))) //特殊
+	err = json.Unmarshal(buffer, &config)         //解析json格式数据
+	if err != nil {
+		emit("Failed unmarshalling json: %s\n", err)
+		return &config
+	}
+	return &config
+}

controllers/new_mobile_api_controllers/common_api_controller.go → controllers/common_api_controller.go

@@ -1,7 +1,6 @@
-package new_mobile_api_controllers
+package controllers
 
 import (
-	"XT_New/controllers"
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
@@ -14,7 +13,7 @@ import (
 )
 
 type CommonApiController struct {
-	controllers.BaseAuthAPIController
+	BaseAuthAPIController
 }
 
 func (this *CommonApiController) GetInspectionMajor() {
@@ -527,9 +526,15 @@ func (this *CommonApiController) GetDialysisModeType() {
 	orgid := adminUser.CurrentOrgId
 	//统计透析总量
 	total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid, lapsetotype, sourcetype)
-	fmt.Println("total3333333333333", total)
+	//var mode models.PatientPrescriptionCountStruct
+	//mode.Count = total
 	modeType, err := service.GetDialysisCountMode(startimes, endtimeData, orgid, lapsetotype, sourcetype)
-	fmt.Println("modetype555555555555555", modeType)
+
+	//var total models.PatientPrescriptionCountStruct
+	//for _, item := range modeType {
+	//	total.Count = total.Count + item.Count
+	//}
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -645,8 +650,8 @@ func (this *CommonApiController) GetTotalAgeCount() {
 	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计透析总人数
 	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
+
 	agecount, err := service.GetTotalAgeCount(orgid, lapsetotype, sourcetype)
-	fmt.Println("ageCount22222222222", agecount)
 	//two, err := service.GetTotalAgeCountTwo(orgid, startime, endtime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -717,7 +722,6 @@ func (this *CommonApiController) GetDialysislist() {
 	statime := startDate.Unix()
 
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-
 	entime := endDate.Unix()
 
 	page, _ := this.GetInt64("page")

controllers/new_mobile_api_controllers/common_api_router.go → controllers/common_api_router.go

@@ -1,4 +1,4 @@
-package new_mobile_api_controllers
+package controllers
 
 import (
 	"github.com/astaxie/beego"

controllers/doctors_api_controller.go

@@ -91,53 +91,11 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id)
 
 	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
-
+	//project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
 	for _, item := range project {
 		index := 0
 		for _, subItem := range item.HisPrescriptionTeamProject {
 
-			//获取所有的患者
-			patients, _ := service.GetAllPatientListByListTwo(orgID)
-
-			//获取所有床位
-			numberList, _ := service.GetAllDeviceNumberByListOne(orgID)
-
-			//获取透析处方
-			prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
-
-			//获取上机
-			dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
-			for key, item := range project {
-				for _, patient := range patients {
-					if item.PatientId == patient.ID {
-						project[key].SchedualPatient = patient
-						break
-					}
-				}
-				// 获取床位信息
-				for _, it := range numberList {
-					if item.BedId == it.ID {
-						project[key].DeviceNumber = it
-						break
-					}
-				}
-
-				// 获取处方
-				for _, it := range prescriptions {
-					if item.PatientId == it.PatientId {
-						project[key].Prescription = it
-						break
-					}
-				}
-
-				//获取上机
-				for _, it := range dialysisOrders {
-					if item.PatientId == it.PatientId {
-						project[key].DialysisOrder = it
-						break
-					}
-				}
-			}
 			if subItem.HisProject.CostClassify != 3 {
 				subItem.IsCheckTeam = 2
 				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
@@ -152,6 +110,66 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 			}
 		}
 	}
+	//for _, item := range project {
+	//	index := 0
+	//	for _, subItem := range item.HisPrescriptionTeamProject {
+	//
+	//		//获取所有的患者
+	//		patients, _ := service.GetAllPatientListByListTwo(orgID)
+	//
+	//		//获取所有床位
+	//		numberList, _ := service.GetAllDeviceNumberByListOne(orgID)
+	//
+	//		//获取透析处方
+	//		prescriptions, _ := service.GetAllPrescriptionByListOne(orgID, date.Unix())
+	//
+	//		//获取上机
+	//		dialysisOrders, _ := service.GetAllDialysisOrdersByListTwo(orgID, date.Unix())
+	//		for key, item := range project {
+	//			for _, patient := range patients {
+	//				if item.PatientId == patient.ID {
+	//					project[key].SchedualPatient = patient
+	//					break
+	//				}
+	//			}
+	//			// 获取床位信息
+	//			for _, it := range numberList {
+	//				if item.BedId == it.ID {
+	//					project[key].DeviceNumber = it
+	//					break
+	//				}
+	//			}
+	//
+	//			// 获取处方
+	//			for _, it := range prescriptions {
+	//				if item.PatientId == it.PatientId {
+	//					project[key].Prescription = it
+	//					break
+	//				}
+	//			}
+	//
+	//			//获取上机
+	//			for _, it := range dialysisOrders {
+	//				if item.PatientId == it.PatientId {
+	//					project[key].DialysisOrder = it
+	//					break
+	//				}
+	//			}
+	//		}
+	//		if subItem.HisProject.CostClassify != 3 {
+	//			subItem.IsCheckTeam = 2
+	//			item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+	//		}
+	//
+	//		if subItem.HisProject.CostClassify == 3 {
+	//			subItem.IsCheckTeam = 1
+	//			index = index + 1
+	//			if index == 1 {
+	//				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+	//			}
+	//		}
+	//	}
+	//}
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 

controllers/his_api_controller.go

@@ -1063,50 +1063,52 @@ func (c *HisApiController) CreateHisPrescription() {
 							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)
+							if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
+								//新增或者编辑项目，修改对应的标签数据
+								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.IsPrint = 2
 											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.ItemId = p.TeamId
 											label.FeedetlSn = p.FeedetlSn
 											label.PProjectId = p.ID
-											label.ProjectName = team.ProjectTeam
+											label.ItemId = p.TeamId
+											label.ProjectName = project.ProjectName
 											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)
 									}
 								}
 							}

controllers/mobile_api_controllers/err_msg.json

@@ -0,0 +1,158 @@
+{
+  "msg": [
+    {
+      "url": "/m/api/solution?mode=1,/api/dialysis/soulution?mode=1,/api/patients/dialysissolution/create?mode=1",
+      "err_msg": "没有权限新增长期处方"
+    },{
+      "url": ",,/api/patients/dialysissolution/edit?mode=2",
+      "err_msg": "没有权限修改长期处方"
+    },{
+      "url": ",,/api/patients/dialysissolution/edit?mode=3",
+      "err_msg": "没有权限修改别人的长期处方"
+    },{
+      "url": "/m/api/dialysis/dialysisPrescription?mode=1,/api/dialysis/prescription?mode=1,",
+      "err_msg": "没有权限新增临时处方"
+    },{
+      "url": "/m/api/dialysis/dialysisPrescription?mode=3,/api/dialysis/prescription?mode=3,",
+      "err_msg": "没有权限修改他人的临时处方"
+    },{
+      "url": "/m/api/dialysis/acceptsAssessment?mode=1,/api/dialysis/accepts?mode=1,",
+      "err_msg": "没有权限新增接诊评估"
+    },{
+      "url": "/m/api/dialysis/acceptsAssessment?mode=2,/api/dialysis/accepts?mode=2,",
+      "err_msg": "没有权限修改接诊评估"
+    },{
+      "url": "/m/api/dialysis/acceptsAssessment?mode=3,/api/dialysis/accepts?mode=3,",
+      "err_msg": "没有权限修改别人接诊评估"
+    },{
+      "url": "/m/api/assessmentbefore/commit?mode=1,/api/dialysis/assessmentbeforedislysis?mode=1,",
+      "err_msg": "没有权限新增透前评估"
+    },{
+      "url": "/m/api/assessmentbefore/commit?mode=2,/api/dialysis/assessmentbeforedislysis?mode=2,",
+      "err_msg": "没有权限修改透前评估"
+    },{
+      "url": "/m/api/assessmentbefore/commit?mode=3,/api/dialysis/assessmentbeforedislysis?mode=3,",
+      "err_msg": "没有权限修改别人透前评估"
+    },{
+      "url": "/m/api/dialysis/start?mode=1,/api/dialysis/start_record?mode=1,",
+      "err_msg": "没有权限执行上机"
+    },{
+      "url": "/m/api/startOrder/edit?mode=2,/api/start_dialysis/modify?mode=2,",
+      "err_msg": "没有权限修改执行上机"
+    },{
+      "url": "/m/api/startOrder/edit?mode=3,/api/start_dialysis/modify?mode=3,",
+      "err_msg": "没有权限修改他人执行上机"
+    },{
+      "url": "/m/api/monitor/add?mode=1,/api/dislysis/monitor/edit?mode=1,",
+      "err_msg": "没有权限新增透析监测"
+    },{
+      "url": "/m/api/monitor/edit?mode=2,/api/dislysis/monitor/edit?mode=2,",
+      "err_msg": "没有权限修改透析监测"
+    },{
+      "url": "/m/api/monitor/edit?mode=3,/api/dislysis/monitor/edit?mode=3,",
+      "err_msg": "没有权限修改他人透析监测"
+    },{
+      "url": "/m/api/monitor/delete?mode=4,/api/dialysis/monitor/del?mode=4,",
+      "err_msg": "没有权限删除透析监测"
+    },{
+      "url": "/m/api/monitor/delete?mode=5,/api/dialysis/monitor/del?mode=5,",
+      "err_msg": "没有权限删除他人透析监测"
+    },{
+      "url": "/m/api/dialysis/finish?mode=1,/api/dialysis/finish?mode=1,",
+      "err_msg": "没有权限执行下机"
+    },{
+      "url": "/m/api/finishOrder/edit?mode=2,/api/finish_dialysis/modify?mode=2,",
+      "err_msg": "没有权限修改执行下机"
+    },{
+      "url": "/m/api/finishOrder/edit?mode=3,/api/finish_dialysis/modify?mode=3,",
+      "err_msg": "没有权限修改他人执行下机"
+    },{
+      "url": "/m/api/dialysis/assessmentAfterDislysis?mode=1,/api/dialysis/assessmentafterdislysis?mode=1,",
+      "err_msg": "没有权限新增透后评估"
+    },{
+      "url": "/m/api/dialysis/assessmentAfterDislysis?mode=2,/api/dialysis/assessmentafterdislysis?mode=2,",
+      "err_msg": "没有权限修改透后评估"
+    },{
+      "url": "/m/api/dialysis/assessmentAfterDislysis?mode=3,/api/dialysis/assessmentafterdislysis?mode=3,",
+      "err_msg": "没有权限修改他人透后评估"
+    },{
+      "url": "/m/api/dialysis/treatmentSummary?mode=1,/api/dialysis/treatmentsummary?mode=1,",
+      "err_msg": "没有权限新增治疗小结"
+    },{
+      "url": "/m/api/dialysis/treatmentSummary?mode=2,/api/dialysis/treatmentsummary?mode=2,",
+      "err_msg": "没有权限修改治疗小结"
+    },{
+      "url": "/m/api/dialysis/treatmentSummary?mode=3,/api/dialysis/treatmentsummary?mode=3,",
+      "err_msg": "没有权限修改他人治疗小结"
+    },{
+      "url": "/m/api/dryweight/commit?mode=1,/api/dryweight/commit?mode=1,/api/patient/updatedryweightdata?mode=1",
+      "err_msg": "没有权限新增干体重"
+    },{
+      "url": ",/api/patients/advice/create?mode=1-1,/api/patients/advice/creategroup?mode=1-1",
+      "err_msg": "没有权限新增临时医嘱"
+    },{
+      "url": ",/api/patients/advice/edit?mode=2-1,",
+      "err_msg": "没有权限修改临时医嘱"
+    },{
+      "url": ",/api/patients/advice/edit?mode=3-1,",
+      "err_msg": "没有权限修改他人临时医嘱"
+    },{
+      "url": ",/api/patients/advice/delete?mode=4-1,/api/patients/advice/deletegroup?mode=4-1",
+      "err_msg": "没有权限删除临时医嘱"
+    },{
+      "url": ",/api/patients/advice/delete?mode=5-1,/api/patients/advice/deletegroup?mode=5-1",
+      "err_msg": "没有权限删除他人开的临时医嘱"
+    },{
+      "url": ",/api/patients/advice/create?mode=1-2,/api/patients/advice/creategroup?mode=1-2",
+      "err_msg": "没有权限新增长期医嘱"
+    },{
+      "url": ",/api/patients/advice/edit?mode=1-3,",
+      "err_msg": "没有权限修改长期医嘱"
+    },{
+      "url": ",/api/patients/advice/edit?mode=1-4,",
+      "err_msg": "没有权限修改他人长期医嘱"
+    },{
+      "url": ",/api/patients/advice/stop?mode=1-5,",
+      "err_msg": "没有权限停止长期医嘱"
+    },{
+      "url": ",/api/patients/advice/delete?mode=1-6,/api/patients/advice/deletegroup?mode=1-6",
+      "err_msg": "没有权限删除长期医嘱"
+    },{
+      "url": ",/api/patients/advice/delete?mode=1-7,/api/patients/advice/deletegroup?mode=1-7",
+      "err_msg": "没有权限删除他人长期医嘱"
+    },{
+      "url": "/m/api/advice/creategroup?mode=1,/api/patients/advice/creategroup?mode=1,/api/patients/advice/create?mode=1",
+      "err_msg": "没有权限新增透析临时医嘱"
+    },{
+      "url": "/m/api/advice/edit?mode=2,/api/patients/advice/edit?mode=2,",
+      "err_msg": "没有权限修改透析临时医嘱"
+    },{
+      "url": "/m/api/advice/edit?mode=3,/api/patients/advice/edit?mode=3,",
+      "err_msg": "没有权限修改他人透析临时医嘱"
+    },{
+      "url": "/m/api/newadvice/delete?mode=4,/api/patients/advice/delete?mode=4,/api/patients/advice/deletegroup?mode=4",
+      "err_msg": "没有权限删除透析临时医嘱"
+    },{
+      "url": "/m/api/newadvice/delete?mode=5,/api/patients/advice/delete?mode=5,/api/patients/advice/deletegroup?mode=5",
+      "err_msg": "没有权限删除他人透析临时医嘱"
+    },{
+      "url": "/m/api/advice/exec?mode=6,/api/patients/advice/exec?mode=6,",
+      "err_msg": "没有权限执行透析临时医嘱"
+    },{
+      "url": "/m/api/advice/exec/modify?mode=8,,",
+      "err_msg": "没有权限修改已执行医嘱"
+    },{
+      "url": "/m/api/advice/check?mode=7,/api/patients/advice/check?mode=7,",
+      "err_msg": "没有权限核对透析临时医嘱"
+    },{
+      "url": ",/api/patients/advice/stop?mode=1-8,",
+      "err_msg": "没有权限停止他人长期医嘱"
+    },{
+      "url": ",/api/patients/advice/execgroup?mode=6-1,",
+      "err_msg": "没有权限执行医嘱"
+    },{
+      "url": ",/api/patients/advice/checkgroup?mode=7-1,",
+      "err_msg": "没有权限核对医嘱"
+    }
+  ]
+}

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -36,9 +36,13 @@ func (this *NewCommonApiController) GetTotalDialysis() {
 
 	//统计透析总量
 	total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid, lapsetotype, sourcetype)
-
+	//var mode models.PatientPrescriptionCountStruct
+	//mode.Count = total
 	modeType, err := service.GetDialysisCountMode(startimes, endtimeData, orgid, lapsetotype, sourcetype)
-
+	//var total models.PatientPrescriptionCountStruct
+	//for _, item := range modeType {
+	//	total.Count = total.Count + item.Count
+	//}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return

models/err_msg.go

@@ -0,0 +1,6 @@
+package models
+
+type ErrMsg struct {
+	Url    string `gorm:"column:url" json:"url"`
+	ErrMsg string `gorm:"column:err_msg" json:"err_msg"`
+}

service/common_service.go

@@ -213,38 +213,28 @@ func DeleteCheck(id int64) error {
 func GetDialysiTotal(startime int64, endtime int64, orgid int64, lapsetotype int64, sourcetype int64) (models.PatientPrescriptionCountStruct, error) {
 	counts := models.PatientPrescriptionCountStruct{}
 
-	db := XTReadDB().Table("xt_dialysis_order as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_paitents as s").Where("s.status = 1")
-	fmt.Println(table)
+	db := XTReadDB().Table("xt_dialysis_order as x").Select("count(x.id) as count").Joins("Join xt_dialysis_prescription as prescription On x.dialysis_date = prescription.record_date AND x.patient_id = prescription.patient_id  AND prescription.status = 1 AND prescription.mode_id > 0").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? AND x.status = 1", startime, endtime, orgid)
 
 	if lapsetotype > 0 {
-		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? and s.lapseto = ?", startime, endtime, orgid, lapsetotype).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+		err = db.Where("x.user_org_id = ? and s.lapseto = ?", startime, endtime, orgid, lapsetotype).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
 	}
 	if lapsetotype == 0 {
-		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? ", startime, endtime, orgid).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+		err = db.Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
 	}
 
 	if sourcetype > 0 {
-		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ? and s.source = ?", startime, endtime, orgid, sourcetype).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+		err = db.Where("x.user_org_id = ? and s.source = ?", startime, endtime, orgid, sourcetype).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
 	}
 
 	if sourcetype == 0 {
-		err = db.Select("count(x.id) as count").Where("x.dialysis_date >= ? and x.dialysis_date<=? and x.user_org_id = ?", startime, endtime, orgid).Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
+		err = db.Joins("left join xt_patients as s on s.id= x.patient_id").Scan(&counts).Error
 	}
 
 	return counts, err
 }
 
 func GetDialysisCountMode(starttime int64, endtime int64, orgid int64, lapsetotype int64, sourcetype int64) (counts []*models.PatientPrescriptionCountStruct, err error) {
-
-	//err = readDb.Table("xt_dialysis_order as o left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ? and o.status = 1 and s.status = 1", starttime, endtime, orgid).Select("s.mode_id,count(s.mode_id) as count").Group("s.mode_id").Scan(&counts).Error
-	//return counts, err
-
 	db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
-	table := readDb.Table("xt_schedule as s").Where("s.status = 1")
-	fmt.Println(table)
-	p := readDb.Table("xt_patients as p").Where("p.status = 1")
-	fmt.Println(p)
 	if starttime > 0 {
 		db = db.Where("o.dialysis_date >=?", starttime)
 	}
@@ -260,7 +250,7 @@ func GetDialysisCountMode(starttime int64, endtime int64, orgid int64, lapsetoty
 	if sourcetype > 0 {
 		db = db.Where("p.source = ?", sourcetype)
 	}
-	err = db.Select("s.mode_id,count(s.mode_id) as count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id and s.schedule_date = o.dialysis_date and s.status= 1").Joins("left join xt_patients as  p on o.patient_id = p.id").Group("s.mode_id").Scan(&counts).Error
+	err = db.Select("s.mode_id,count(s.mode_id) as count").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id and s.record_date = o.dialysis_date and s.status= 1 AND s.record_date >= ? AND s.record_date <= ? AND AND s.mode_id > 0 ", starttime, endtime).Joins("left join xt_patients as  p on o.patient_id = p.id").Group("s.mode_id").Scan(&counts).Error
 	return counts, err
 }
 
@@ -287,13 +277,14 @@ func GetTotalRollOutPatients(orgid int64, startime int64, endtime int64, lapseto
 }
 
 func GetTotalRollOutPatientsTwo(orgid int64, startime int64, endtime int64, lapsetotype int64, sourcetype int64) (patients []*models.XtPatients, err error) {
-
 	db := XTReadDB().Table("xt_patients as x")
 	if sourcetype == 0 {
+
 		err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1", startime, endtime, orgid).Scan(&patients).Error
 
 	}
 	if sourcetype > 0 {
+
 		err = db.Raw("select x.id,x.`name`,s.lapseto_type,s.lapseto_time from xt_patients as x left join xt_patient_lapseto AS s ON s.patient_id = x.id where s.lapseto_time >=? and s.lapseto_time <=? and x.user_org_id = ? and s.lapseto_type = 2 and x.status = 1 and x.source = ?", startime, endtime, orgid, sourcetype).Scan(&patients).Error
 	}
 	return patients, err
@@ -629,10 +620,6 @@ func GetPrescritionByName(orgid int64, patient_id int64, startime int64, endtime
 func GetTreateInfo(orgID int64, startime int64, endtime int64, lapseto int64, limit int64, page int64) (blood []*models.TreatDialysisOrder, total int64, err error) {
 
 	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status =  1")
-	table := XTReadDB().Table("xt_schedule as s")
-	fmt.Println(table)
-	p := XTReadDB().Table("xt_patients as p")
-	fmt.Println(p)
 	sql := "from_unixtime(o.dialysis_date, '%Y%m%d') AS date"
 
 	if orgID > 0 {
@@ -651,7 +638,7 @@ func GetTreateInfo(orgID int64, startime int64, endtime int64, lapseto int64, li
 		db = db.Where("p.lapseto = ?", lapseto)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("o.dialysis_date").Select(sql).Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1").Count(&total).Offset(offset).Limit(limit).Scan(&blood).Error
+	err = db.Group("o.dialysis_date").Select(sql).Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.record_date = o.dialysis_date and s.status =1").Count(&total).Offset(offset).Limit(limit).Scan(&blood).Error
 	return blood, total, err
 
 }
@@ -676,7 +663,7 @@ func GetTreatList(orgid int64, startime int64, endtime int64, lapseto int64) (tt
 	if lapseto > 0 {
 		db = db.Where("p.lapseto = ?", lapseto)
 	}
-	err = db.Select("s.mode_id, count(s.mode_id) as number").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status = 1").Group("s.mode_id").Order("s.mode_id asc").Find(&ttd).Error
+	err = db.Select("s.mode_id, count(s.mode_id) as number").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.record_date = o.dialysis_date and s.status = 1").Group("s.mode_id").Order("s.mode_id asc").Find(&ttd).Error
 	return ttd, err
 }
 
@@ -685,7 +672,7 @@ func GetStatistics(orgID int64, startime int64, endtime int64, modeID int64) (dt
 	sql := "s.mode_id,from_unixtime(o.dialysis_date, '%Y%m%d') as date, count(o.dialysis_date) as number"
 	datesql := " o.dialysis_date as date"
 	group := "from_unixtime(o.dialysis_date, '%Y%m%d')"
-	db = db.Table(" xt_dialysis_order AS o").Joins("left join xt_schedule as s on o.patient_id = s.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1")
+	db = db.Table(" xt_dialysis_order AS o").Joins("join xt_dialysis_prescription as s on o.patient_id = s.patient_id").Where("s.record_date = o.dialysis_date and s.status =1")
 	if orgID > 0 {
 		db = db.Where("o.user_org_id = ?", orgID)
 	}

service/mobile_dialysis_service.go

@@ -3505,55 +3505,6 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 		}
 		err = db.Find(&vms).Error
 	}
-	//if patientType == 0 {
-	//	db := readDb.
-	//		Table("xt_schedule").
-	//		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-	//		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-	//			return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-	//		}).
-	//		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-	//		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-	//		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-	//		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-	//			return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
-	//		}).Where("status = 1 AND user_org_id = ?", orgID)
-	//	if scheduleDate != 0 {
-	//		db = db.Where("schedule_date = ?", scheduleDate)
-	//	}
-	//	err = db.Find(&vms).Error
-	//}
-	//
-	//if patientType > 0 {
-	//	db := readDb.
-	//		Table("xt_schedule").
-	//		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-	//		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-	//			return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-	//		}).
-	//		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-	//		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-	//		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-	//		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
-	//		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-	//			return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
-	//		}).
-	//		Where("status = 1 AND user_org_id = ?", orgID)
-	//	if scheduleDate != 0 {
-	//		db = db.Where("schedule_date = ?", scheduleDate)
-	//	}
-	//	err = db.Find(&vms).Error
-	//}
-
-	db := readDb.Table("xt_schedule").Where("status = 1")
-	if scheduleDate > 0 {
-		db = db.Where("schedule_date = ?", scheduleDate)
-	}
-	if orgID > 0 {
-		db = db.Where("user_org_id = ?", orgID)
-	}
-
-	err = db.Find(&vms).Error
 
 	return vms, err
 }