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

controllers/data_api_controller.go

@@ -582,6 +582,11 @@ func (c *DataApiController) CreateDrugDic() {
 		return
 	}
 
+	drugways_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_drugways"
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(drugways_keys, "", time.Second*60*60*18)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"drugdic": drugdic,
 	})
@@ -625,12 +630,18 @@ func (c *DataApiController) UpdateDrugDic() {
 	drugdic.FormUnit = drugdicdata.FormUnit
 
 	err = service.UpdateDrugDic(drugdic)
+
 	if err != nil {
 		utils.ErrorLog("%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	}
 
+	drugways_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_drugways"
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(drugways_keys, "", time.Second*60*60*18)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"drugdic": drugdic,
 	})
@@ -659,6 +670,11 @@ func (c *DataApiController) DeleteDrugDic() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
 		return
 	}
+	drugways_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_drugways"
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(drugways_keys, "", time.Second*60*60*18)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})
@@ -696,7 +712,11 @@ func (c *DataApiController) CreateDrugWay() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 		return
 	}
+	drugways_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_drugways"
 
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(drugways_keys, "", time.Second*60*60*18)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"drugway": drugway,
 	})
@@ -741,6 +761,11 @@ func (c *DataApiController) UpdateDrugWay() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	}
+	drugways_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_drugways"
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(drugways_keys, "", time.Second*60*60*18)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"drugway": drugway,
@@ -771,6 +796,11 @@ func (c *DataApiController) DeleteDrugWay() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
 		return
 	}
+	drugways_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_drugways"
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(drugways_keys, "", time.Second*60*60*18)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})
@@ -809,6 +839,11 @@ func (c *DataApiController) CreateExecutionFrequency() {
 		return
 	}
 
+	efs_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_efs"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(efs_keys, "", time.Second*60*60*18)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"ef": ef,
 	})
@@ -853,6 +888,10 @@ func (c *DataApiController) UpdateExecutionFrequency() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	}
+	efs_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_efs"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(efs_keys, "", time.Second*60*60*18)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"ef": ef,
@@ -883,6 +922,11 @@ func (c *DataApiController) DeleteExecutionFrequency() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBDelete)
 		return
 	}
+	efs_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_efs"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(efs_keys, "", time.Second*60*60*18)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})

controllers/his_api_controller.go

@@ -562,33 +562,186 @@ func (c *HisApiController) GetHisPatientInfo() {
 func (c *HisApiController) GetHisPrescriptionConfig() {
 	adminInfo := c.GetAdminUserInfo()
 	//获取医嘱模版
-	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
+	//advices, _ := service.FindAllHisAdviceTemplate(adminInfo.CurrentOrgId)
 	//获取所有基础药
-	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
-	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
-	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
-	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
-	//获取所有科室信息
-	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
 
-	//获取诊断信息
+	drugways_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_drugways"
+	efs_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_efs"
+	//doctors_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_doctors"
+	department_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_department"
+	sick_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_sick"
+	diagnose_keys := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + "_diagnose"
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	drugways_str, _ := redis.Get(drugways_keys).Result()
+	efs_str, _ := redis.Get(efs_keys).Result()
+	//doctors_str, _ := redis.Get(doctors_keys).Result()
+	department_str, _ := redis.Get(department_keys).Result()
+	sick_str, _ := redis.Get(sick_keys).Result()
+	diagnose_str, _ := redis.Get(diagnose_keys).Result()
+
+	var drugways []*models.DrugwayDic
+	var efs []*models.ExecutionFrequencyDic
+	var roles []*models.UserAdminRole
+	var departments []*models.XtHisDepartment
+	var sicks []*models.OutpatientServiceSick
+	var diagnose []*models.HisXtDiagnoseConfig
+
+	if len(drugways_str) == 0 {
+		drugways, _, _ = service.GetDrugWayDics(adminInfo.CurrentOrgId)
+		drugways_str, err := json.Marshal(drugways)
+		if err == nil {
+			redis.Set(drugways_keys, string(drugways_str), time.Second*60*60*18)
+
+		} else {
+			redis.Set(drugways_keys, "", time.Second*60*60*18)
+
+		}
+
+	} else {
+		err := json.Unmarshal([]byte(drugways_str), &drugways)
+		if err != nil {
+			drugways, _, _ = service.GetDrugWayDics(adminInfo.CurrentOrgId)
+			drugways_str, err := json.Marshal(drugways)
+			if err == nil {
+				redis.Set(drugways_keys, string(drugways_str), time.Second*60*60*18)
+
+			} else {
+				redis.Set(drugways_keys, "", time.Second*60*60*18)
+
+			}
+
+		}
+
+	}
+	if len(efs_str) == 0 {
+		efs, _, _ = service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
+		efs_str, err := json.Marshal(efs)
+		if err == nil {
+
+			redis.Set(efs_keys, string(efs_str), time.Second*60*60*18)
+
+		} else {
+
+			redis.Set(efs_keys, "", time.Second*60*60*18)
+
+		}
+	} else {
+		err := json.Unmarshal([]byte(efs_str), &efs)
+		if err != nil {
+			efs, _, _ = service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
+			efs_str, err := json.Marshal(efs)
+			if err == nil {
+
+				redis.Set(efs_keys, string(efs_str), time.Second*60*60*18)
+
+			} else {
+
+				redis.Set(efs_keys, "", time.Second*60*60*18)
+
+			}
+		}
+	}
 
-	sick, _ := service.FindAllSick(adminInfo.CurrentOrgId)
+	//if len(doctors_str) == 0 {
+	//	roles, _ = service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+	//	doctors_str, err := json.Marshal(roles)
+	//	if err == nil {
+	//		redis.Set(doctors_keys, string(doctors_str), time.Second*60*60*18)
+	//	} else {
+	//		redis.Set(doctors_keys, "", time.Second*60*60*18)
+	//	}
+	//
+	//} else {
+	//	err := json.Unmarshal([]byte(doctors_str), &efs)
+	//	if err != nil {
+	//		roles, _ = service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+	//		doctors_str, err := json.Marshal(roles)
+	//		if err == nil {
+	//			redis.Set(doctors_keys, string(doctors_str), time.Second*60*60*18)
+	//		} else {
+	//			redis.Set(doctors_keys, "", time.Second*60*60*18)
+	//		}
+	//
+	//	}
+	//}
+
+	if len(department_str) == 0 {
+		departments, _ = service.GetAllDepartMent(adminInfo.CurrentOrgId)
+		department_str, err := json.Marshal(departments)
+		if err == nil {
+			redis.Set(department_keys, string(department_str), time.Second*60*60*18)
+		} else {
+			redis.Set(department_keys, "", time.Second*60*60*18)
+		}
+	} else {
+		err := json.Unmarshal([]byte(department_str), &departments)
+		if err != nil {
+			departments, _ = service.GetAllDepartMent(adminInfo.CurrentOrgId)
+			department_str, _ := json.Marshal(departments)
+			redis.Set(department_keys, string(department_str), time.Second*60*60*18)
+		}
+	}
+
+	if len(sick_str) == 0 {
+		sicks, _ = service.FindAllSick(adminInfo.CurrentOrgId)
+		sick_str, err := json.Marshal(sicks)
+		if err == nil {
+			redis.Set(sick_keys, string(sick_str), time.Second*60*60*18)
+		} else {
+			redis.Set(sick_keys, "", time.Second*60*60*18)
+		}
+
+	} else {
+		err := json.Unmarshal([]byte(sick_str), &sicks)
+		if err != nil {
+			sicks, _ = service.FindAllSick(adminInfo.CurrentOrgId)
+			sick_str, _ := json.Marshal(sicks)
+			redis.Set(sick_keys, string(sick_str), time.Second*60*60*18)
+
+		}
+
+	}
+
+	if len(diagnose_str) == 0 {
+		diagnose, _ = service.FindAllDiagnose(adminInfo.CurrentOrgId)
+		diagnose_str, err := json.Marshal(diagnose)
+		if err == nil {
+			redis.Set(diagnose_keys, string(diagnose_str), time.Second*60*60*18)
+		} else {
+			redis.Set(diagnose_keys, "", time.Second*60*60*18)
+		}
+	} else {
+		err := json.Unmarshal([]byte(diagnose_str), &sicks)
+		if err != nil {
+			diagnose, _ = service.FindAllDiagnose(adminInfo.CurrentOrgId)
+			diagnose_str, err := json.Marshal(diagnose)
+			if err == nil {
+				redis.Set(diagnose_keys, string(diagnose_str), time.Second*60*60*18)
+			} else {
+				redis.Set(diagnose_keys, "", time.Second*60*60*18)
+			}
+		}
+	}
 
-	diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
+	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
+	roles, _ = service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
+	//获取所有科室信息
+	//获取诊断信息
 
 	additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"drugs":            drugs,
-		"advices_template": advices,
-		"drugways":         drugways,
-		"efs":              efs,
-		"doctors":          doctors,
-		"department":       department,
-		"sick":             sick,
-		"additions":        additions,
-		"diagnose":         diagnose,
+		"drugs": drugs,
+		//"advices_template": advices,
+		"drugways":   drugways,
+		"efs":        efs,
+		"doctors":    roles,
+		"department": departments,
+		"sick":       sicks,
+		"additions":  additions,
+		"diagnose":   diagnose,
 	})
 }
 func (c *HisApiController) CreateHisPrescription() {

controllers/his_project_api_controller.go

@@ -595,6 +595,11 @@ func (this *HisProjectApiController) SaveDePartment() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
+	department_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_department"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(department_keys, "", time.Second*60*60*18)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"department": department,
 	})
@@ -647,6 +652,11 @@ func (this *HisProjectApiController) UpdatedDeparment() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
+	department_keys := strconv.FormatInt(this.GetAdminUserInfo().CurrentOrgId, 10) + "_department"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(department_keys, "", time.Second*60*60*18)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"department": department,
 	})
@@ -661,6 +671,12 @@ func (this *HisProjectApiController) DeleteDepartment() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
+
+	department_keys := strconv.FormatInt(this.GetAdminUserInfo().CurrentOrgId, 10) + "_department"
+	redis := service.RedisClient()
+	defer redis.Close()
+	redis.Set(department_keys, "", time.Second*60*60*18)
+
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)

controllers/manager_center_api_controller.go

@@ -1796,6 +1796,12 @@ func (c *ManagerCenterApiController) CreateMZSick() {
 
 	err, dealers := service.AddSigleMZSick(&dealer)
 	if err == nil {
+
+		redis := service.RedisClient()
+		defer redis.Close()
+		sick_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_sick"
+		redis.Set(sick_keys, "", time.Second*60*60*18)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"sick": dealers,
 		})
@@ -1854,6 +1860,12 @@ func (c *ManagerCenterApiController) ModifyMZSick() {
 	err := service.ModifyMZSick(&dealer)
 
 	if err == nil {
+
+		redis := service.RedisClient()
+		defer redis.Close()
+		sick_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_sick"
+		redis.Set(sick_keys, "", time.Second*60*60*18)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"sick": dealer,
 		})
@@ -1879,6 +1891,12 @@ func (c *ManagerCenterApiController) DeleteMZSick() {
 	id, _ := c.GetInt64("id", 0)
 	err := service.DeleteMZSickById(id)
 	if err == nil {
+
+		redis := service.RedisClient()
+		defer redis.Close()
+		sick_keys := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + "_sick"
+		redis.Set(sick_keys, "", time.Second*60*60*18)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})
@@ -2092,6 +2110,11 @@ func (c *ManagerCenterApiController) CreateDiagnose() {
 
 	err, dealers := service.AddSigleDiagnose(&dealer)
 	if err == nil {
+		redis := service.RedisClient()
+		defer redis.Close()
+		diagnose_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_diagnose"
+		redis.Set(diagnose_keys, "", time.Second*60*60*18)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"sick": dealers,
 		})
@@ -2150,6 +2173,11 @@ func (c *ManagerCenterApiController) ModifyDiagnose() {
 	err := service.ModifyDiagnose(&dealer)
 
 	if err == nil {
+		redis := service.RedisClient()
+		defer redis.Close()
+		diagnose_keys := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + "_diagnose"
+		redis.Set(diagnose_keys, "", time.Second*60*60*18)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"sick": dealer,
 		})
@@ -2163,6 +2191,7 @@ func (c *ManagerCenterApiController) GetDiagnoseList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	mzSick, total, err := service.FindAllDiagnoseList(adminUserInfo.CurrentOrgId, page, limit)
 	if err == nil {
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"sick":  mzSick,
 			"total": total,
@@ -2175,6 +2204,10 @@ func (c *ManagerCenterApiController) DeleteDiagnose() {
 	id, _ := c.GetInt64("id", 0)
 	err := service.DeleteDiagnoseById(id)
 	if err == nil {
+		redis := service.RedisClient()
+		defer redis.Close()
+		diagnose_keys := strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + "_diagnose"
+		redis.Set(diagnose_keys, "", time.Second*60*60*18)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "删除成功",
 		})