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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #
@@ -51,75 +51,75 @@ sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-readmysqlhost = shengws1.mysql.rds.aliyuncs.com
+readmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh
-readmysqlpass = xhPECP2nFObR8aUK
+readmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmysqlname = sgj_xt
 
 
 
-readmysqlhost2 = rr-kuyicloud.mysql.rds.aliyuncs.com
+readmysqlhost2 = read-kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmysqlport2 = 3306
 readmysqluser2 = syh
-readmysqlpass2 = xhPECP2nFObR8aUK
+readmysqlpass2 = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmysqlname2 = sgj_xt
 
-writemysqlhost = shengws1.mysql.rds.aliyuncs.com
+writemysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = syh
-writemysqlpass = xhPECP2nFObR8aUK
+writemysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writemysqlname = sgj_xt
 
 
-readuserhost = shengws1.mysql.rds.aliyuncs.com
+readuserhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = syh
-readuserpass = xhPECP2nFObR8aUK
+readuserpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readusername = sgj_users
 
-writeuserhost = shengws1.mysql.rds.aliyuncs.com
+writeuserhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = syh
-writeuserpass = xhPECP2nFObR8aUK
+writeuserpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writeusername = sgj_users
 
-readmiddlehost = shengws1.mysql.rds.aliyuncs.com
+readmiddlehost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readmiddleport = 3306
 readmiddleuser = syh
-readmiddlepass = xhPECP2nFObR8aUK
+readmiddlepass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmiddlename = ky_xt_middle
 
-writemiddlehost = shengws1.mysql.rds.aliyuncs.com
+writemiddlehost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writemiddleport = 3306
 writemiddleuser = syh
-writemiddlepass = xhPECP2nFObR8aUK
+writemiddlepass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writemiddlename = ky_xt_middle
 
 
-readsgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
+readsgjpatientmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readsgjpatientmysqlport = 3306
 readsgjpatientmysqluser = syh
-readsgjpatientmysqlpass = xhPECP2nFObR8aUK
+readsgjpatientmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readsgjpatientmysqlname = sgj_patient
 
-writesgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
+writesgjpatientmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writesgjpatientmysqlport = 3306
 writesgjpatientmysqluser = syh
-writesgjpatientmysqlpass = xhPECP2nFObR8aUK
+writesgjpatientmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writesgjpatientmysqlname = sgj_patient
 
 
-readpatienthost = shengws1.mysql.rds.aliyuncs.com
+readpatienthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 readpatientport = 3306
 readpatientuser = syh
-readpatientpass = xhPECP2nFObR8aUK
+readpatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readpatientname = sgj_cdm
 
-writepatienthost = shengws1.mysql.rds.aliyuncs.com
+writepatienthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writepatientport = 3306
 writepatientuser = syh
-writepatientpass = xhPECP2nFObR8aUK
+writepatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writepatientname = sgj_cdm
 
 redishost = kuyicloud.redis.rds.aliyuncs.com

controllers/his_api_controller.go

@@ -1918,6 +1918,17 @@ func (c *HisApiController) CreateHisPrescription() {
 		return
 	}
 
+	// 开始主事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
 
 	//药品发药出库
@@ -3089,17 +3100,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10164 {
-		// 开始主事务
-		db := service.XTWriteDB()
-		tx := db.Begin()
-
-		// 在函数结束时处理事务回滚
-		defer func() {
-			if r := recover(); r != nil {
-				tx.Rollback()
-			}
-		}()
+	if adminInfo.CurrentOrgId == 10489 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3153,16 +3154,18 @@ func (c *HisApiController) CreateHisPrescription() {
 						utils.ErrorLog("pre_time")
 					}
 					preTime, _ := items["pre_time"].(string)
-
+					fmt.Println("preTime", preTime)
 					timeLayout := "2006-01-02"
 					loc, _ := time.LoadLocation("Local")
 					theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
+					result := strings.Split(preTime, " ")
+					theTime3, _ := time.ParseInLocation(timeLayout, result[0], loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
 					}
 					pTime := theTime2.Unix()
-					fmt.Println("pTime----------------------------------------", pTime)
+
 					ctime := time.Now().Unix()
 
 					if tempPrescription.ID == 0 {
@@ -3245,10 +3248,10 @@ func (c *HisApiController) CreateHisPrescription() {
 								s.AdviceDoctor = doctor_id
 								s.StopState = 2
 								s.ExecutionState = 2
-								s.AdviceDate = recordDateTime
+								s.AdviceDate = theTime3.Unix()
 								s.Status = 1
 								s.UserOrgId = adminInfo.CurrentOrgId
-								s.RecordDate = recordDateTime
+								s.RecordDate = theTime3.Unix()
 								s.StartTime = tempPrescription.PreTime
 								s.Groupno = groupNo
 								s.CreatedTime = ctime
@@ -3484,7 +3487,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								p.Ctime = time.Now().Unix()
 								p.Mtime = time.Now().Unix()
 								p.PatientId = patient_id
-								p.RecordDate = recordDateTime
+								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
 								p.UserOrgId = adminInfo.CurrentOrgId
 								p.HisPatientId = his_patient_id
@@ -3550,9 +3553,6 @@ func (c *HisApiController) CreateHisPrescription() {
 										}
 										parseIntCount, _ := strconv.ParseInt(p.Count, 10, 64)
 
-										fmt.Println("出库数据------------------------------------------", out_count_five)
-										fmt.Println("出库数据------------------------------------------2", parseIntCount)
-
 										//如果当前处方的出库数量和已经出库的数量不一致,需要进行退库或者出库
 										if out_count_five != parseIntCount {
 											//查询耗材最后一次出库记录
@@ -4164,6 +4164,9 @@ func (c *HisApiController) CreateHisPrescription() {
 					timeLayout := "2006-01-02"
 					loc, _ := time.LoadLocation("Local")
 					theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
+					result := strings.Split(preTime, " ")
+					theTime3, _ := time.ParseInLocation(timeLayout, result[0], loc)
+					fmt.Println("theTime30000000000000000000000", theTime3.Unix())
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -4243,10 +4246,10 @@ func (c *HisApiController) CreateHisPrescription() {
 								s.AdviceDoctor = doctor_id
 								s.StopState = 2
 								s.ExecutionState = 2
-								s.AdviceDate = recordDateTime
+								s.AdviceDate = theTime3.Unix()
 								s.Status = 1
 								s.UserOrgId = adminInfo.CurrentOrgId
-								s.RecordDate = recordDateTime
+								s.RecordDate = theTime3.Unix()
 								s.StartTime = tempPrescription.PreTime
 								s.Groupno = groupNo
 								s.CreatedTime = ctime
@@ -4347,7 +4350,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								p.Ctime = time.Now().Unix()
 								p.Mtime = time.Now().Unix()
 								p.PatientId = patient_id
-								p.RecordDate = recordDateTime
+								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
 								p.UserOrgId = adminInfo.CurrentOrgId
 								p.HisPatientId = his_patient_id
@@ -4772,6 +4775,7 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 		}
+		tx.Commit()
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "保存成功",

controllers/his_project_api_controller.go

@@ -1,14 +1,17 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"github.com/mozillazg/go-pinyin"
+
 	"reflect"
 	"strconv"
 	"strings"
@@ -94,7 +97,6 @@ func (this *HisProjectApiController) SaveProject() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	project_name := this.GetString("project_name")
-	pinyin := this.GetString("pinyin")
 	wubi := this.GetString("wubi")
 	price := this.GetString("price")
 	price_float, err := strconv.ParseFloat(price, 64)
@@ -133,9 +135,23 @@ func (this *HisProjectApiController) SaveProject() {
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+
+	// 创建一个拼音转换器
+	p := pinyin.NewArgs()
+
+	// 将汉字转为拼音
+	pinyinSlice := pinyin.Pinyin(project_name, p)
+
+	// 获取首字母
+	firstLetter := ""
+	for _, py := range pinyinSlice {
+		if len(py) > 0 {
+			firstLetter += string(py[0][0])
+		}
+	}
 	hisProject := models.XtHisProject{
 		ProjectName:                 project_name,
-		Pinyin:                      pinyin,
+		Pinyin:                      firstLetter,
 		Wubi:                        wubi,
 		Price:                       price_float,
 		Unit:                        unit,
@@ -173,6 +189,7 @@ func (this *HisProjectApiController) SaveProject() {
 		Bbx01:                       bbx01,
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
+		FirstLetter:                 firstLetter,
 	}
 	//查询项目名称是否存在
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
@@ -235,7 +252,7 @@ func (this *HisProjectApiController) UpdatedProject() {
 	loc, _ := time.LoadLocation("Local")
 	id, _ := this.GetInt64("id")
 	project_name := this.GetString("project_name")
-	pinyin := this.GetString("pinyin")
+
 	wubi := this.GetString("wubi")
 	price := this.GetString("price")
 	price_float, _ := strconv.ParseFloat(price, 64)
@@ -270,11 +287,25 @@ func (this *HisProjectApiController) UpdatedProject() {
 	is_print, _ := this.GetInt64("is_print")
 	bbx01 := this.GetString("bbx01")
 	bby01 := this.GetString("bby01")
+	// 创建一个拼音转换器
+	p := pinyin.NewArgs()
+
+	// 将汉字转为拼音
+	pinyinSlice := pinyin.Pinyin(project_name, p)
 
+	// 获取首字母
+	firstLetter := ""
+	for _, py := range pinyinSlice {
+		if len(py) > 0 {
+			firstLetter += string(py[0][0])
+		}
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	hisProject := models.XtHisProject{
 		ProjectName:                 project_name,
-		Pinyin:                      pinyin,
+		Pinyin:                      firstLetter,
+		FirstLetter:                 firstLetter,
 		Wubi:                        wubi,
 		Price:                       price_float,
 		Unit:                        unit,
@@ -310,9 +341,15 @@ func (this *HisProjectApiController) UpdatedProject() {
 		Bbx01:                       bbx01,
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
+		UserOrgId:                   orgId,
 	}
 
 	err := service.UpdatedProject(id, &hisProject)
+
+	list, _ := service.GetHisPrescripionProjectListOne(id, orgId)
+	for _, item := range list {
+		service.UpdateHisPrescriptionProjectList(item.ID, price_float)
+	}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return

controllers/manager_center_api_controller.go

@@ -1,17 +1,19 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"strconv"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"reflect"
-	"strconv"
-	"time"
+	"github.com/mozillazg/go-pinyin"
 )
 
 type ManagerCenterApiController struct {
@@ -93,7 +95,6 @@ func ManagerCenterRegistRouters() {
 
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	drug_name := c.GetString("drug_name")
-	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 	drug_alias := c.GetString("drug_alias")
 	drug_alias_pinyin := c.GetString("drug_alias_pinyin")
@@ -162,9 +163,28 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	bby01 := c.GetString("bby01")
 	is_project, _ := c.GetInt64("is_project")
 	adminInfo := c.GetAdminUserInfo()
+
+	hans := drug_name // 要转换的汉字字符串
+
+	// 创建一个拼音转换器
+	p := pinyin.NewArgs()
+
+	// 将汉字转为拼音
+	pinyinSlice := pinyin.Pinyin(hans, p)
+
+	// 输出拼音
+	fmt.Println("Pinyin:", pinyinSlice)
+
+	// 获取首字母
+	firstLetter := ""
+	for _, py := range pinyinSlice {
+		if len(py) > 0 {
+			firstLetter += string(py[0][0])
+		}
+	}
+
 	drugLib := &models.BaseDrugLib{
 		DrugName:                    drug_name,
-		Pinyin:                      pinyin,
 		Wubi:                        wubi,
 		DrugAlias:                   drug_alias,
 		DrugAliasPinyin:             drug_alias_pinyin,
@@ -233,6 +253,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Bck01b:                      "10",
 		IsProject:                   is_project,
 	}
+	drugLib.FirstLetter = firstLetter
+	drugLib.Pinyin = firstLetter
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
 	drug_code := strconv.FormatInt(total+1, 10)
@@ -267,7 +289,6 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	id, _ := c.GetInt64("id")
 	drug_name := c.GetString("drug_name")
-	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 	drug_alias := c.GetString("drug_alias")
 	drug_alias_pinyin := c.GetString("drug_alias_pinyin")
@@ -344,10 +365,26 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_project, _ := c.GetInt64("is_project")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
+
+	hans := drug_name // 要转换的汉字字符串
+
+	// 创建一个拼音转换器
+	p := pinyin.NewArgs()
+
+	// 将汉字转为拼音
+	pinyinSlice := pinyin.Pinyin(hans, p)
+
+	// 获取首字母
+	firstLetter := ""
+	for _, py := range pinyinSlice {
+		if len(py) > 0 {
+			firstLetter += string(py[0][0])
+		}
+	}
 	drugLib := &models.BaseDrugLib{
 		ID:                          id,
 		DrugName:                    drug_name,
-		Pinyin:                      pinyin,
+		Pinyin:                      firstLetter,
 		Wubi:                        wubi,
 		DrugAlias:                   drug_alias,
 		DrugAliasPinyin:             drug_alias_pinyin,
@@ -419,6 +456,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		Bbx01:                       bbx01,
 		Bck01b:                      "10",
 		IsProject:                   is_project,
+		FirstLetter:                 firstLetter,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 
@@ -427,6 +465,16 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 
 	err := service.UpdateBaseDrugLib(drugLib)
 
+	//查下医嘱模板
+	adviceList, _ := service.GetHisAdvicelistTemplate(id, adminInfo.CurrentOrgId)
+
+	if len(adviceList) > 0 {
+		for _, item := range adviceList {
+			service.UpdateHisAdviceListTemplate(item.ID, retail_price)
+		}
+
+	}
+
 	//查询是否存在
 	_, errOne := service.GetDrugNameIsExist(id, adminInfo.CurrentOrgId)
 	if errOne == gorm.ErrRecordNotFound {
@@ -710,7 +758,6 @@ func (c *ManagerCenterApiController) GetConfigList() {
 func (c *ManagerCenterApiController) GetManageConfigList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	configList, _ := service.GetConfigList(adminUserInfo.CurrentOrgId)
-	fmt.Println("configListwowowowowowowowowowowowo", configList)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"configlist": configList,
 	})
@@ -1515,9 +1562,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	expiry_date_warn_day_count, _ := c.GetInt64("expiry_date_warn_day_count", 0)
 	stock_warn_count, _ := c.GetInt64("stock_warn_count", 0)
 	is_reuse, _ := c.GetInt64("is_reuse", 0)
-
 	good_name := c.GetString("good_name")
-	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 	good_kind, _ := c.GetInt64("good_kind", 0)
 	medical_insurance_level, _ := c.GetInt64("medical_insurance_level", 0)
@@ -1568,6 +1613,20 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	code := strconv.FormatInt(total+1, 10)
 	code = "24000000" + code
 
+	// 创建一个拼音转换器
+	p := pinyin.NewArgs()
+
+	// 将汉字转为拼音
+	pinyinSlice := pinyin.Pinyin(good_name, p)
+
+	// 获取首字母
+	firstLetter := ""
+	for _, py := range pinyinSlice {
+		if len(py) > 0 {
+			firstLetter += string(py[0][0])
+		}
+	}
+
 	goodInfo := models.GoodInfo{
 		GoodCode:                    code,
 		SpecificationName:           specification_name,
@@ -1586,7 +1645,8 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		OrgId:                       adminUserInfo.CurrentOrgId,
 		Creater:                     adminUserInfo.AdminUser.Id,
 		GoodName:                    good_name,
-		Pinyin:                      pinyin,
+		Pinyin:                      firstLetter,
+		FirstLetter:                 firstLetter,
 		Wubi:                        wubi,
 		GoodKind:                    good_kind,
 		MedicalInsuranceNumber:      medical_insurance_number,
@@ -1651,7 +1711,6 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	provinces_code := c.GetString("provinces_code")
 
 	good_name := c.GetString("good_name")
-	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 	good_kind, _ := c.GetInt64("good_kind", 0)
 	medical_insurance_level, _ := c.GetInt64("medical_insurance_level", 0)
@@ -1693,6 +1752,20 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
 
+	// 创建一个拼音转换器
+	p := pinyin.NewArgs()
+
+	// 将汉字转为拼音
+	pinyinSlice := pinyin.Pinyin(good_name, p)
+
+	// 获取首字母
+	firstLetter := ""
+	for _, py := range pinyinSlice {
+		if len(py) > 0 {
+			firstLetter += string(py[0][0])
+		}
+	}
+
 	adminUserInfo := c.GetAdminUserInfo()
 
 	goodInfo := models.GoodInfo{
@@ -1714,7 +1787,8 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		OrgId:                       adminUserInfo.CurrentOrgId,
 		Modifier:                    adminUserInfo.AdminUser.Id,
 		GoodName:                    good_name,
-		Pinyin:                      pinyin,
+		Pinyin:                      firstLetter,
+		FirstLetter:                 firstLetter,
 		Wubi:                        wubi,
 		GoodKind:                    good_kind,
 		MedicalInsuranceNumber:      medical_insurance_number,
@@ -1759,6 +1833,11 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		return
 	}
 	err, goodInfos := service.ModifyGoodInfo(&goodInfo)
+
+	list, _ := service.GetHisPrescripionProjectList(good_id, adminUserInfo.CurrentOrgId)
+	for _, item := range list {
+		service.UpdateHisPrescriptionProjectList(item.ID, sell_price)
+	}
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"goodInfo": goodInfos,

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -409,6 +409,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Sodium = 138
 				newprescribe.Bicarbonate = 31.1
 				newprescribe.DialysateFlow = 500
+				newprescribe.TargetUltrafiltration = 0
 			}
 			// 针对新化博翔
 			if adminUserInfo.Org.Id == 10447 {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1665,22 +1665,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//
-				if config.IsOpen == 1 && item.UserOrgId == 10210 {
-
-					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-					//更新字典里面的库存
-					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-					var sum_count int64
-					for _, its := range stockInfo {
-						if its.MaxUnit == medical.MaxUnit {
-							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-						}
-						sum_count += its.StockMaxNumber + its.StockMinNumber
-					}
-					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-					//剩余库存
-					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				}
+				//if config.IsOpen == 1 && item.UserOrgId == 10210 {
+				//
+				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				//	//更新字典里面的库存
+				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				//	var sum_count int64
+				//	for _, its := range stockInfo {
+				//		if its.MaxUnit == medical.MaxUnit {
+				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				//		}
+				//		sum_count += its.StockMaxNumber + its.StockMinNumber
+				//	}
+				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+				//	//剩余库存
+				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				//}
 
 			}
 		}

controllers/patient_api_controller.go

@@ -8,8 +8,6 @@ import (
 	"encoding/json"
 	"github.com/jinzhu/gorm"
 	"github.com/mozillazg/go-pinyin"
-
-	//"github.com/jinzhu/gorm"
 	"math"
 	"math/rand"
 	"reflect"
@@ -143,6 +141,8 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/getpatientcriticalonelist", &PatientApiController{}, "Get:GetPatientCriticalOneList")
 
+	beego.Router("/api/patient/deletesolution", &PatientApiController{}, "Get:DeleteSolution")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -330,8 +330,6 @@ func (c *PatientApiController) CreatePatient() {
 
 	var patient models.Patients
 	contagions, diseases, code, formItems := patientFormData(&patient, c.Ctx.Input.RequestBody, "create")
-	fmt.Println(code)
-	fmt.Println(patient)
 
 	if code > 0 {
 		c.ServeFailJSONWithSGJErrorCode(code)
@@ -1130,7 +1128,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 	loc, _ := time.LoadLocation("Local")
 	todayTime, err := time.ParseInLocation(timeLayout, today, loc)
 
-	if adminUserInfo.CurrentOrgId == 9538 || adminUserInfo.CurrentOrgId == 10375 || adminUserInfo.CurrentOrgId == 10164 {
+	if adminUserInfo.CurrentOrgId == 9538 || adminUserInfo.CurrentOrgId == 10164 {
 		prescription := models.DialysisPrescription{
 			Dialyzer:                   solution.Dialyzer,
 			Anticoagulant:              solution.Anticoagulant,
@@ -6776,3 +6774,12 @@ func (c *PatientApiController) GetPatientCriticalOneList() {
 		"list": list,
 	})
 }
+
+func (c *PatientApiController) DeleteSolution() {
+
+	id, _ := c.GetInt64("id")
+	solution, _ := service.DeleteSolutionById(id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"solution": solution,
+	})
+}

controllers/stock_in_api_controller.go

@@ -4557,7 +4557,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 	if len(drugList) > 0 {
 		for _, item := range drugList {
-			fmt.Println("retial2332332233232323223322323", item.DoseUnit)
 			goodInfo := models.BaseDrugLib{
 				DrugName:                    item.DrugName,
 				DrugAlias:                   item.DrugAlias,
@@ -7970,13 +7969,13 @@ func (this *StockManagerApiController) GetStockFlowOrderList() {
 			var count int64
 
 			if index == 0 {
-				count = list[index].OverCount - list[index].Count
+				count = list[index].FlushOverCount - list[index].Count
 				service.UpdateOverCount(list[index+1].ID, count)
 			}
 
 			if index >= 1 {
 				lastStockFlow, _ := service.GetLastOverCount(list[index-1].ID)
-				count = lastStockFlow.OverCount - list[index].Count
+				count = lastStockFlow.FlushOverCount - list[index].Count
 				service.UpdateOverCount(list[index].ID, count)
 			}
 
@@ -7984,14 +7983,14 @@ func (this *StockManagerApiController) GetStockFlowOrderList() {
 		if list[index].ConsumableType == 7 || list[index].ConsumableType == 4 || list[index].ConsumableType == 1 || list[index].ConsumableType == 10 || list[index].ConsumableType == 13 {
 			if index == 0 {
 				var count int64
-				count = list[index].OverCount + list[index].Count
+				count = list[index].FlushOverCount + list[index].Count
 				service.UpdateOverCount(list[index+1].ID, count)
 			}
 
 			if index >= 1 {
 				var count int64
 				lastStockFlow, _ := service.GetLastOverCount(list[index-1].ID)
-				count = lastStockFlow.OverCount + list[index].Count
+				count = lastStockFlow.FlushOverCount + list[index].Count
 				service.UpdateOverCount(list[index].ID, count)
 			}
 

go.mod

@@ -1,40 +0,0 @@
-module XT_New
-
-go 1.19
-
-require (
-	github.com/astaxie/beego v1.12.3
-	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/jinzhu/gorm v1.9.16
-	github.com/robfig/cron v1.2.0
-	github.com/shopspring/decimal v1.3.1
-	golang.org/x/sync v0.1.0
-)
-
-require (
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/go-sql-driver/mysql v1.7.0 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/golang/protobuf v1.5.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jung-kurt/gofpdf v1.16.2 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/mozillazg/go-pinyin v0.20.0 // indirect
-	github.com/prometheus/client_golang v1.7.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.10.0 // indirect
-	github.com/prometheus/procfs v0.1.3 // indirect
-	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
-	github.com/stretchr/testify v1.8.2 // indirect
-	github.com/wcharczuk/go-chart v2.0.1+incompatible // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
-)

go.sum

@@ -1,249 +0,0 @@
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
-github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
-github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
-github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ=
-github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
-github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
-github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
-github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
-github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
-github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
-github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM=
-github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
-github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
-github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
-github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
-github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
-github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
-github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
-github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc=
-github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6/go.mod h1:n931TsDuKuq+uX4v1fulaMbA/7ZLLhjc85h7chZGBCQ=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
-github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mozillazg/go-pinyin v0.20.0 h1:BtR3DsxpApHfKReaPO1fCqF4pThRwH9uwvXzm+GnMFQ=
-github.com/mozillazg/go-pinyin v0.20.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
-github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
-github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
-github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U=
-github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
-github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
-github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
-github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo=
-github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
-github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s=
-github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
-github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
-github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
-github.com/wcharczuk/go-chart v2.0.1+incompatible h1:0pz39ZAycJFF7ju/1mepnk26RLVLBCWz1STcD3doU0A=
-github.com/wcharczuk/go-chart v2.0.1+incompatible/go.mod h1:PF5tmL4EIx/7Wf+hEkpCqYi5He4u90sw+0+6FhrryuE=
-github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
-github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a h1:gHevYm0pO4QUbwy8Dmdr01R5r1BuKtfYqRqF0h/Cbh0=
-golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,15 +1,19 @@
 package main
 
 import (
+	"encoding/xml"
+	"net/http"
+
 	_ "XT_New/routers"
 	"XT_New/service"
-	"encoding/xml"
 	"github.com/astaxie/beego"
-	"net/http"
 )
 
 func init() {
 	service.ConnectDB()
+	go func() {
+		http.ListenAndServe("localhost:6060", nil)
+	}()
 }
 
 func main() {
@@ -25,9 +29,6 @@ func main() {
 	//beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 6000
 	//beego.BConfig.WebConfig.AutoRender = false
 	//
-	go func() {
-		http.ListenAndServe("localhost:6060", nil)
-	}()
 
 	beego.Run()
 

models/patient_models.go

@@ -1840,6 +1840,7 @@ type NewDialysisPrescription struct {
 	DialysateFlow              float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
 	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
 	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
 }
 
 func (NewDialysisPrescription) TableName() string {

models/stock_models.go

@@ -693,6 +693,7 @@ type VmStockFlow struct {
 	OverCount                 int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	OrderId                   int64           `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	Remark                    string          `gorm:"column:remark" json:"remark" form:"remark"`
+	FlushOverCount            int64           `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
 }
 
 func (VmStockFlow) TableName() string {

service/manage_center_service.go

@@ -1,11 +1,12 @@
 package service
 
 import (
-	"XT_New/models"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetDictionaryConfigList(orgID int64) (dataconfig interface{}, err error) {
@@ -1088,3 +1089,16 @@ func GetPatientGoodStockCount(patient_id int64, record_time int64, user_org_id i
 	err = XTReadDB().Where("patient_id = ? and record_time =? and org_id = ? and status=1", patient_id, record_time, user_org_id).Find(&auto).Error
 	return auto, err
 }
+
+func GetHisAdvicelistTemplate(drug_id int64, user_org_id int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and org_id =? and status=1", drug_id, user_org_id).Find(&advice).Error
+
+	return advice, err
+}
+
+func UpdateHisAdviceListTemplate(id int64, price float64) error {
+
+	err := XTWriteDB().Model(&models.HisPrescriptionAdviceTemplate{}).Where("id =? and status=1", id).Updates(map[string]interface{}{"price": price}).Error
+	return err
+}

service/new_warehouse_service.go

@@ -2752,11 +2752,13 @@ func FindNewDrugCancelStock(return_date int64, org_id int64, tx *gorm.DB) (*mode
 	stock := models.DrugCancelStock{}
 	var err error
 	err = tx.Where("return_time = ? and org_id = ? and status = 1", return_date, org_id).Find(&stock).Error
-
-	if err != nil {
-		tx.Rollback()
-		return &stock, nil
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return &stock, nil
+		}
 	}
+
 	return &stock, nil
 }
 
@@ -2771,10 +2773,13 @@ func FindNewLastDrugCancelStock(advice_date int64, org_id int64, tx *gorm.DB) (m
 
 	cancelStock := models.DrugCancelStock{}
 	err := tx.Where("return_time = ? and org_id = ? and status = 1", advice_date, org_id).Find(&cancelStock).Error
-	if err != nil {
-		tx.Rollback()
-		return cancelStock, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return cancelStock, err
+		}
 	}
+
 	return cancelStock, err
 }
 

service/patient_service.go

@@ -4015,3 +4015,12 @@ func GetInspectionByPatientId(patient_id int64, item_id int64) (models.XtInspect
 	err := XTReadDB().Where("patient_id =? and status =1 and inspect_date>=1704038400 and inspect_date<=1711814400 and item_id =?", patient_id, item_id).Order("id asc").Last(&inspection).Limit(1).Error
 	return inspection, err
 }
+
+func DeleteSolutionById(id int64) (models.DialysisSolution, error) {
+
+	solution := models.DialysisSolution{}
+
+	err := XTWriteDB().Model(&solution).Where("id=? and status=1", id).Updates(map[string]interface{}{"status": 12}).Error
+
+	return solution, err
+}

service/pharmacy_service.go

@@ -1,19 +1,20 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego/config"
-	"github.com/astaxie/beego/context"
-	"github.com/jinzhu/gorm"
-	"golang.org/x/sync/errgroup"
 	"math"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	"XT_New/models"
+	"XT_New/utils"
+	"github.com/astaxie/beego/config"
+	"github.com/astaxie/beego/context"
+	"github.com/jinzhu/gorm"
+	"golang.org/x/sync/errgroup"
 )
 
 func SaveErrs(org_id int64, input *context.BeegoInput, err error) {
@@ -897,7 +898,7 @@ func DispensingMedicineOne(orgid, patient_id, stime, etime, creater int64) (err
 
 	advice, err := GetDocAdviceList(orgid, patient_id, stime, etime)
 	//响水不走这里
-	if orgid != 10188 {
+	if orgid != 10188 && orgid != 10480 && orgid != 10217 {
 		if len(advice) > 0 {
 			for _, item := range advice {
 				err = DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
@@ -1024,7 +1025,7 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	}
 
 	//针对阜阳经沃
-	if orgid != 10480 {
+	if orgid != 104801 {
 		for _, v := range advice_info {
 
 			//扣减库存

service/secondary_service.go

@@ -1152,13 +1152,13 @@ func DeleteSecondOrderInfo(id int64) error {
 
 func GetStockFlowOrderList(good_id int64, user_org_id int64) (list []*models.VmStockFlow, err error) {
 
-	err = XTReadDB().Where("good_id = ? and user_org_id =? and ctime>=1706630400 and ctime<=1709222399 and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
+	err = XTReadDB().Where("good_id = ? and user_org_id =?  and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
 	return list, err
 }
 
 func UpdateOverCount(id int64, count int64) (err error) {
 
-	err = XTWriteDB().Model(models.VmStockFlow{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"over_count": count}).Error
+	err = XTWriteDB().Model(models.VmStockFlow{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"flush_over_count": count}).Error
 	return err
 }
 

service/stock_service.go

@@ -1,13 +1,14 @@
 package service
 
 import (
-	"XT_New/models"
 	"errors"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func AddSigleDealer(dealer *models.Dealer) (error, *models.Dealer) {
@@ -276,6 +277,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"bbx01":                          goodInfo.Bbx01,
 		"bby01":                          goodInfo.Bby01,
 		"zuobiao_id":                     goodInfo.Bbx01,
+		"first_letter":                   goodInfo.FirstLetter,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
@@ -2002,10 +2004,13 @@ func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
 func GetNewLastDrugCancelStockById(orgid int64, tx *gorm.DB) (models.DrugCancelStock, error) {
 	stock := models.DrugCancelStock{}
 	err := tx.Where("org_id = ? and status = 1", orgid).Last(&stock).Error
-	if err != nil {
-		tx.Rollback()
-		return stock, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return stock, err
+		}
 	}
+
 	return stock, err
 }
 
@@ -5802,10 +5807,13 @@ func GetHisAdviceListByDrugIdTwo(patient_id int64, advice_date int64, orgid int6
 func GetNewHisAdviceListByDrugIdTwo(patient_id int64, advice_date int64, orgid int64, tx *gorm.DB) (info []*models.HisDoctorAdviceInfo, err error) {
 
 	err = tx.Where("patient_id = ? and advice_date = ? and status = 1 and user_org_id = ?", patient_id, advice_date, orgid).Find(&info).Error
-	if err != nil {
-		tx.Rollback()
-		return info, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
 	}
+
 	return info, err
 }
 
@@ -5845,11 +5853,13 @@ func GetLastDrugWarehouseOutByDrugIdTwenty(drugid int64, patient_id int64, advic
 func GetLastNewDrugWarehouseOutByDrugIdTwenty(drugid int64, patient_id int64, advice_date int64, advice_id int64, tx *gorm.DB) (out []*models.DrugWarehouseOutInfo, err error) {
 
 	err = tx.Where("advice_id = ?  and drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and is_check = 1", advice_id, drugid, patient_id, advice_date).Find(&out).Error
-
-	if err != nil {
-		tx.Rollback()
-		return out, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return out, err
+		}
 	}
+
 	return out, err
 }
 
@@ -9118,3 +9128,24 @@ func UpdateWarehouseInfoByProject(good_id int64, id int64, user_org_id int64, co
 
 	return info, err
 }
+
+func GetHisPrescripionProjectList(good_id int64, user_org_id int64) (list []*models.HisPrescriptionProjectTemplate, err error) {
+
+	err = XTReadDB().Where("project_id=? and status=1 and type =3 and user_org_id=?", good_id, user_org_id).Find(&list).Error
+
+	return list, err
+}
+
+func GetHisPrescripionProjectListOne(good_id int64, user_org_id int64) (list []*models.HisPrescriptionProjectTemplate, err error) {
+
+	err = XTReadDB().Where("project_id=? and status=1 and type =2 and user_org_id=?", good_id, user_org_id).Find(&list).Error
+
+	return list, err
+}
+
+func UpdateHisPrescriptionProjectList(id int64, price float64) (models.HisPrescriptionProjectTemplateL, error) {
+
+	templateL := models.HisPrescriptionProjectTemplateL{}
+	err := XTWriteDB().Model(&templateL).Where("id =? and status=1", id).Updates(map[string]interface{}{"price": price}).Error
+	return templateL, err
+}