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

conf/app.conf

@@ -7,7 +7,7 @@ copyrequestbody = true
 sessionon = true
 #sessiongcmaxlifetime = 64800
 
-tokencookiemaxlifetime = 7200
+tokencookiemaxlifetime = 604800
 enablexsrf = false
 xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o
 xsrfexpire = 3600
@@ -220,6 +220,19 @@ writesgjpatientmysqlname = sgj_patient
 
 
 redishost = kuyi6666.redis.rds.aliyuncs.com
+readmysqlhost2 = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
+readmysqlport2 = 3306
+readmysqluser2 = root
+readmysqlpass2 = 1Q2W3e4r!@#$
+readmysqlname2 = sgj_xt
+
+
+
+
+
+#redishost = 120.77.235.13
+#redishost = 112.74.16.180
+redishost = localhost
 redisport = 6379
 redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
 redisdb = 7

controllers/base_api_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/enums"
-	"XT_New/models"
 	"XT_New/service"
 	_ "fmt"
 	"strconv"
@@ -73,7 +72,36 @@ func (this *BaseAuthAPIController) Prepare() {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
 		userAdmin.Mobile = "13416402574"
-
+		//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()
 		userAdmin.Id = 597
 		userAdmin.Mobile = "13416402574"
 		userAdmin.IsSuperAdmin = false
@@ -345,6 +373,35 @@ func (this *BaseServeAPIController) Prepare() {
 		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 = 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()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/dialysis_api_controller.go

@@ -1376,6 +1376,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	remark := c.GetString("remark")
 	puncture_method := c.GetString("puncture_method")
 
+	dialysis_count := c.GetString("dialysis_count")
+	//dialysis_count, _ := c.GetInt64("dialysis_count", 0)
 	dialysis_count := c.GetString("dialysis_count")
 	emergency_treatment, _ := c.GetInt64("emergency_treatment", 0)
 	emergency_treatment_other := c.GetString("emergency_treatment_other")
@@ -1393,13 +1395,15 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 	is_infect, _ := c.GetInt64("is_infect", 0)
 	exposed, _ := c.GetFloat("exposed", 0)
-	//skin, _ := c.GetInt64("skin", 0)
 	skin := c.GetString("skin")
 	skin_other := c.GetString("skin_other")
 	infect_other := c.GetString("infect_other")
 	ductus_arantii_other := c.GetString("ductus_arantii_other")
 	machine_type := c.GetString("machine_type")
 	puncture_needle := c.GetString("puncture_needle")
+	//humor_excessive_symptom, _ := c.GetInt64("humor_excessive_symptom", 0)
+
+	humor_excessive_symptom := c.GetString("humor_excessive_symptom")
 	humor_excessive_symptom := c.GetString("humor_excessive_symptom")
 	phinholing := c.GetString("pinholing")
 

controllers/doctors_api_controller.go

@@ -62,6 +62,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	delivery_way := c.GetString("delivery_way")
 	schedule_type, _ := c.GetInt64("schedule_type")
 	partition_type, _ := c.GetInt64("partition_type")
+	patient_id, _ := c.GetInt64("patient_id")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -80,11 +81,17 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
+	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id)
+	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)
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
 
 	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
 
-	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type)
+	for _, item := range project {
+		index := 0
+		for _, subItem := range item.HisPrescriptionTeamProject {
 
 	//获取所有的患者
 	patients, _ := service.GetAllPatientListByListTwo(orgID)
@@ -127,6 +134,20 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 				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/drug_stock_api_contorller.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"strings"
@@ -567,6 +568,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
 				} else {
+
 					warehouseInfo := &models.DrugWarehouseInfo{
 						ID:               id,
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -626,10 +628,38 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 		errs = service.CreateDrugWarehousingInfo(warehousingInfo)
 		if errs == nil {
-			service.CreateDrugFlow(drugFlow)
 			//更改库存
 			service.UpdateDrugInfo(warehousingInfo)
+			for _, it := range warehousingInfo {
+				info, _ := service.GetLastDrugWarehouseInfSix(it.DrugId)
+				flows := models.DrugFlow{
+					WarehousingOrder: info.WarehousingOrder,
+					WarehousingId:    info.WarehousingId,
+					DrugId:           info.DrugId,
+					Number:           info.Number,
+					ProductDate:      info.ProductDate,
+					ExpireDate:       info.ExpiryDate,
+					Count:            info.WarehousingCount,
+					Price:            info.Price,
+					Status:           1,
+					Ctime:            ctime,
+					UserOrgId:        adminUserInfo.CurrentOrgId,
+					Manufacturer:     info.Manufacturer,
+					Dealer:           info.Dealer,
+					BatchNumber:      info.BatchNumber,
+					MaxUnit:          info.MaxUnit,
+					MinUnit:          "",
+					ConsumableType:   1,
+					IsEdit:           1,
+					Creator:          adminUserInfo.AdminUser.Id,
+					IsSys:            0,
+				}
+				_, existerrcodes := service.GetDrugFlowIsExist(info.ID, info.DrugId)
 
+				if existerrcodes == gorm.ErrRecordNotFound {
+					service.CreateDrugFlowOne(flows)
+				}
+			}
 		}
 
 	}
@@ -638,53 +668,107 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 		var total int64
 		var minNumber float64
 		var allTotal int64
+		var chaTotal int64
 		for _, item := range upDateWarehousingInfo {
 			//查询修改的记录
 			orderInfo, _ := service.GetDrugWarehouseOrderOne(id, item.DrugId)
 
+			fmt.Println("hh23323232323232332233232", orderInfo)
+
 			info, _ := service.FindeDrugInfo(item.DrugId)
 
+			//历史入库总数
 			total = orderInfo.StockMaxNumber * info.MinNumber
 
-			allTotal = item.WarehousingCount*info.MinNumber - total
+			//当前入库总数
+			allTotal = item.WarehousingCount * info.MinNumber
 
-			str := strconv.FormatInt(allTotal, 10)
-			minFloat, _ := strconv.ParseFloat(str, 64)
+			//如果历史的入库总数 大于当前入库总数 则需要扣减
+			if total > allTotal {
+				chaTotal = total - allTotal
+				str := strconv.FormatInt(chaTotal, 10)
+				minFloat, _ := strconv.ParseFloat(str, 64)
 
-			minNumber = info.Total + minFloat
+				minNumber = info.Total - minFloat
 
-			lib := models.BaseDrugLib{
-				Total: minNumber,
+				lib := models.BaseDrugLib{
+					Total: minNumber,
+				}
+				service.UpdateBaseDrug(&lib, item.DrugId)
 			}
-			service.UpdateBaseDrug(&lib, item.DrugId)
+			//如果历史的入库总数 小于当前入库总数 则需增加库存
+			if total < allTotal {
+				chaTotal = allTotal - total
+				str := strconv.FormatInt(chaTotal, 10)
+				minFloat, _ := strconv.ParseFloat(str, 64)
+
+				minNumber = info.Total + minFloat
+
+				lib := models.BaseDrugLib{
+					Total: minNumber,
+				}
+				service.UpdateBaseDrug(&lib, item.DrugId)
+			}
+
 			warehouseInfo, _ := service.FindeLastWarehouseInfo(item.ID)
 			fmt.Println("hhhhh23hh32h232332323223", warehouseInfo)
 			var total int64
+
 			//比较大小(加)
+			// 如果当前的入库数量 大于 历史入库数量
 			if item.WarehousingCount > warehouseInfo.WarehousingCount {
 				total = item.WarehousingCount - warehouseInfo.WarehousingCount
+				item.StockMaxNumber = warehouseInfo.StockMaxNumber + total
+
+				errs = service.UpDateDrugWarehousingInfo(item)
+				if len(drugFlow) > 0 {
+					for _, it := range drugFlow {
+						fmt.Println(it)
+						flow := models.DrugFlow{
+							Count: item.StockMaxNumber,
+						}
+						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
+						fmt.Println(parseDateErr)
+
+					}
+				}
+				break
 			}
-			item.StockMaxNumber = warehouseInfo.StockMaxNumber + total
+
+			// 如果当前的入库数量 小于 历史入库数量
 			if item.WarehousingCount < warehouseInfo.WarehousingCount {
 				total = warehouseInfo.WarehousingCount - item.WarehousingCount
+				item.StockMaxNumber = warehouseInfo.StockMaxNumber - total
+
+				errs = service.UpDateDrugWarehousingInfo(item)
+				if len(drugFlow) > 0 {
+					for _, it := range drugFlow {
+						fmt.Println(it)
+						flow := models.DrugFlow{
+							Count: item.StockMaxNumber,
+						}
+						parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, warehouseInfo.WarehousingId)
+						fmt.Println(parseDateErr)
+					}
+				}
+				break
 			}
-			item.StockMaxNumber = warehouseInfo.StockMaxNumber - total
-			if item.WarehousingCount == warehouseInfo.StockMaxNumber {
-
-				item.StockMaxNumber = item.WarehousingCount
-			}
-			errs = service.UpDateDrugWarehousingInfo(item)
-
-		}
-	}
 
-	if len(drugFlow) > 0 {
-		for _, item := range drugFlow {
-			flow := models.DrugFlow{
-				Count: item.Count,
+			if item.WarehousingCount == warehouseInfo.WarehousingCount {
+				item.OrgId = item.OrgId
+				warehouseinfo := &models.DrugWarehouseInfo{
+					Number:       item.Number,
+					ProductDate:  item.ProductDate,
+					ExpiryDate:   item.ExpiryDate,
+					Price:        item.Price,
+					TotalPrice:   item.TotalPrice,
+					Dealer:       item.Dealer,
+					Manufacturer: item.Manufacturer,
+					Remark:       item.Remark,
+					BatchNumber:  item.BatchNumber,
+				}
+				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, warehouseinfo)
 			}
-			parseDateErr := service.UpdateDrugFlow(flow, item.DrugId, item.WarehousingId)
-			fmt.Println(parseDateErr)
 		}
 	}
 
@@ -1153,7 +1237,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
 
-	var drugFlow []*models.DrugFlow
+	//var drugFlow []*models.DrugFlow
 
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
@@ -1226,7 +1310,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					}
 
 				}
-				fmt.Println("孟子", warehouseOut.ID)
+
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1253,52 +1337,46 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					WarehouseInfoId:         warehouse_info_id,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
-				fmt.Println("hhhhhhhhhhhhhhhh", warehouseOut.ID)
 
-				drugflow := &models.DrugFlow{
-					WarehouseOutId:          warehouseOut.ID,
-					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-					DrugId:                  drug_id,
-					Number:                  number,
-					ProductDate:             productDates,
-					ExpireDate:              expiryDates,
-					Count:                   count,
-					Price:                   price,
-					Status:                  1,
-					Ctime:                   ctime,
-					UserOrgId:               adminUserInfo.CurrentOrgId,
-					Manufacturer:            manufacturer,
-					Dealer:                  dealer,
-					BatchNumber:             batch_number,
-					MaxUnit:                 max_unit,
-					ConsumableType:          2,
-					IsEdit:                  1,
-					Creator:                 adminUserInfo.AdminUser.Id,
-					IsSys:                   0,
-				}
-				drugFlow = append(drugFlow, drugflow)
+				//drugflow := &models.DrugFlow{
+				//	WarehouseOutId:          warehouseOut.ID,
+				//	WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				//	DrugId:                  drug_id,
+				//	Number:                  number,
+				//	ProductDate:             productDates,
+				//	ExpireDate:              expiryDates,
+				//	Count:                   count,
+				//	Price:                   price,
+				//	Status:                  1,
+				//	Ctime:                   ctime,
+				//	UserOrgId:               adminUserInfo.CurrentOrgId,
+				//	Manufacturer:            manufacturer,
+				//	Dealer:                  dealer,
+				//	BatchNumber:             batch_number,
+				//	MaxUnit:                 max_unit,
+				//	ConsumableType:          2,
+				//	IsEdit:                  1,
+				//	Creator:                 adminUserInfo.AdminUser.Id,
+				//	IsSys:                   0,
+				//}
+				//drugFlow = append(drugFlow, drugflow)
 			}
 		}
 	}
-	var total_count int64
-	var prescribing_number_total int64
+
+	var total_count int64              //总库存
+	var prescribing_number_total int64 //出库数据
 	//调用出库逻辑
 	for _, item := range warehousingOutInfo {
 		//获取药品库存
-		info, _ := service.GetDrugTotalCountOne(item.DrugId, item.OrgId, item.WarehouseInfoId)
+		info, _ := service.GetDrugTotalCountTwo(item.DrugId)
+
+		for _, it := range info {
+			total_count += it.StockMaxNumber*it.MinNumber + it.StockMinNumber
+		}
 		//查询改药品信息
 		medical, _ := service.GetBaseDrugMedical(item.DrugId)
-		total_count = info.StockMaxNumber*medical.MinNumber + info.StockMinNumber
-		//for _, it := range info{
-		//  if medical.MaxUnit == it.MaxUnit{
-		//    it.Count = it.StockMaxNumber * medical.MinNumber
-		//  }
-		//  if medical.MinUnit == it.MinUnit{
-		//    it.Count = it.StockMinNumber
-		//  }
-		//  total_count += it.Count
-		//}
-		fmt.Println("总库存23232323232232332232332223", total_count)
+
 		//判断单位是否相等
 		if medical.MaxUnit == item.CountUnit {
 			//转化为最小单位
@@ -1308,8 +1386,10 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			prescribing_number_total = item.Count
 		}
 
+		fmt.Println("药品ID", item.DrugId)
 		fmt.Println("数量一", prescribing_number_total)
 		fmt.Println("数量二", total_count)
+
 		//判断单位
 		if total_count == 0 {
 			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
@@ -1339,11 +1419,11 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			return
 		} else {
 			service.AddSigleDrugWarehouseOut(&warehouseOut)
-			list, _ := service.GetLastWarehouseOut(adminUserInfo.CurrentOrgId)
-			for _, item := range drugFlow {
-				item.WarehouseOutId = list.ID
-			}
-			service.CreateDrugFlow(drugFlow)
+			//list, _ := service.GetLastWarehouseOut(adminUserInfo.CurrentOrgId)
+			//for _, item := range drugFlow {
+			//	item.WarehouseOutId = list.ID
+			//}
+			//service.CreateDrugFlow(drugFlow)
 			// 出库流程
 			// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 			drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
@@ -1351,6 +1431,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				prescribingNumber := item.Count
 				service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
 			}
+			prescribing_number_total = 0
+			total_count = 0
 		}
 
 	}
@@ -1364,7 +1446,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 		"min_unit":   "",
 		"max_unit":   "",
 	})
-
+	return
 }
 func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 	page, _ := c.GetInt64("page", -1)
@@ -1503,9 +1585,10 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 	warehouseOut, _ := service.FindDrugWareHouseOutById(id, adminUserInfo.CurrentOrgId)
 
 	tempWarehouseOut := models.DrugWarehouseOut{
-		ID:               warehouseOut.ID,
-		Mtime:            mtime,
-		WarehouseOutTime: warehouseOutDate.Unix(),
+		ID:                      warehouseOut.ID,
+		Mtime:                   mtime,
+		WarehouseOutTime:        warehouseOutDate.Unix(),
+		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 	}
 
 	service.EditDrugWarehouseOut(tempWarehouseOut)
@@ -1787,8 +1870,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				})
 				return
 			} else {
-				errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-				service.CreateDrugFlow(drugFlow)
+				//errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+				//service.CreateDrugFlow(drugFlow)
 				// 出库流程
 				// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 				drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
@@ -1836,14 +1919,12 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 			}
 
 			all_number = info.Count*medical.MinNumber + info.StockMinNumber
-			fmt.Println("总库存223232", all_number)
-			fmt.Println("当前库存00000000000000000000000000000000000000000", max_number)
+
 			////比较当前出库数量 和 最后一次出库数量,正常出库
 			if max_number <= min_number {
 				errs = service.UpDateDrugWarehouseOutInfo(item)
 				cha_number = min_number - max_number
-				fmt.Println("差库存", cha_number)
-				fmt.Println("最后一次库存0000000000000000000000000000000000000000", min_number)
+
 				if item.CountUnit == medical.MaxUnit {
 					maxNumber = cha_number / medical.MinNumber
 					parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
@@ -1900,23 +1981,20 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				}
 
 			}
-
-			fmt.Println("当前出库", max_number)
-			fmt.Println("最后一次232233", min_number)
 			//退库操作
 			if max_number > min_number {
 
 				cha_number = min_number - max_number
 				//如果总库存大于差,正常出库
-				if all_number >= cha_number {
+				if all_number > cha_number {
 
 					errs = service.UpDateDrugWarehouseOutInfo(item)
-					fmt.Println("232322332233232", item.CountUnit, medical.MaxUnit)
+
 					if item.CountUnit == medical.MaxUnit {
 						maxNumber = cha_number / medical.MinNumber
-						fmt.Println("maxNumber232323232323232232", maxNumber)
+
 						parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
-						fmt.Println("parseDateErr9999999999999999999999", parseDateErr)
+						fmt.Println("parseDateErr", parseDateErr)
 						if parseDateErr != nil {
 							utils.ErrorLog(errs.Error())
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
@@ -1969,7 +2047,36 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						})
 					}
 				}
+				if all_number == cha_number {
+					warehouseInfo := models.XtDrugWarehouseInfo{
+						Number:       item.Number,
+						ProductDate:  item.ProductDate,
+						ExpiryDate:   item.ExpiryDate,
+						Price:        item.Price,
+						TotalPrice:   item.TotalPrice,
+						Dealer:       item.Dealer,
+						Manufacturer: item.Manufacturer,
+						Remark:       item.Remark,
+						BatchNumber:  item.BatchNumber,
+						MaxUnit:      item.CountUnit,
+					}
+					parseDateErr := service.UpdateDrugWarehouseingInfoSix(item.ID, warehouseInfo)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
 
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+				}
 				if all_number < cha_number {
 					goodObj, _ := service.GetDrugByGoodId(item.DrugId)
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -2018,8 +2125,6 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fmt.Println("cancelStockDate232323223233223", cancelStockDate.Unix())
-
 	adminUserInfo := c.GetAdminUserInfo()
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
@@ -2044,7 +2149,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		Type:         types,
 	}
 	service.AddSigleDrugCancelStock(&cancelStock)
-	fmt.Println("hh232323232323232323232323232322332", parseDateErr)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -2151,10 +2256,10 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 						dealer_id = item.ID
 					}
 				}
-				fmt.Println("99999999999999999999", batch_number_id)
+				cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
 				cancelStockInfo := &models.DrugCancelStockInfo{
-					OrderNumber:      cancelStock.OrderNumber,
-					CancelStockId:    cancelStock.ID,
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
 					DrugId:           drug_id,
 					Count:            count,
 					Status:           1,
@@ -2216,6 +2321,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 	}
 	//扣减库存逻辑
 	for _, item := range cancelStockInfos {
+
 		var total_number int64
 		var out_number int64
 		var can_number int64
@@ -2227,78 +2333,117 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		if item.MaxUnit == medical.MinUnit {
 			total_number = item.Count
 		}
-		fmt.Println("当前库存", total_number)
 		//查询当前药品退库的批次号的总入库数
 		infoWareInfo, _ := service.GetDrugWarehouseInfo(item.BatchNumberId)
-		fmt.Println("hhh2h3h2hh3233", item.MaxUnit, medical.MaxUnit, infoWareInfo.StockMaxNumber, infoWareInfo.StockMinNumber)
 		var total_count int64
-		total_count = infoWareInfo.StockMaxNumber*medical.MinNumber + infoWareInfo.StockMinNumber
+		total_count = infoWareInfo.WarehousingCount * medical.MinNumber
 		fmt.Println("当前批次总库存", total_count)
 
 		//查询该批次的出库数量
 		outInfo, _ := service.GetDrugWarehouseOutInfo(item.BatchNumberId, item.DrugId)
-		//查询该批次总的退库数量
 
+		//查询该批次总的退库数量
 		canInfo, _ := service.GetCancelDrugStockOutInfo(item.BatchNumberId, item.DrugId)
-		for _, item := range canInfo {
-			if item.MaxUnit == medical.MaxUnit {
-				item.Count = item.Count * medical.MinNumber
+
+		for _, it := range canInfo {
+			if it.MaxUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
 			}
-			if item.MaxUnit == medical.MinUnit {
-				item.Count = item.Count
+			if it.MaxUnit == medical.MinUnit {
+				it.Count = it.Count
 			}
 		}
-		for _, item := range canInfo {
-			can_number += item.Count
+
+		for _, it := range canInfo {
+			can_number += it.Count
 		}
 
-		for _, item := range outInfo {
-			if item.CountUnit == medical.MaxUnit {
-				item.Count = item.Count * medical.MinNumber
+		for _, it := range outInfo {
+			if it.CountUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
 			}
-			if item.CountUnit == medical.MinUnit {
-				item.Count = item.Count
+			if it.CountUnit == medical.MinUnit {
+				it.Count = it.Count
 			}
 		}
-		for _, item := range outInfo {
-			out_number += item.Count
+		for _, it := range outInfo {
+			out_number += it.Count
 		}
-		fmt.Println("出库数量23232232323222332", out_number)
+
 		if out_number == 0 {
+			service.UpdateDrugCancel(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "2",
 			})
 			return
 		}
+
+		fmt.Println("时间任命323332233232", total_number, total_count)
+
 		//判断退库数量是否大于总入库数量
-		if total_number > out_number {
+		if total_number > total_count {
 			service.UpdateDrugCancel(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "4",
+				"msg": "2",
 			})
 			return
 		}
 
 		//判断总退库数量是否大于出库数量
-		fmt.Println("hhhhhhhhhhh", can_number+total_number)
+		fmt.Println("该批次总退库数量", can_number+total_number)
+		fmt.Println("总出库数量", out_number)
+		fmt.Println("当前退库数量", total_number)
 		if can_number+total_number > out_number {
+			//清空退库单
 			service.UpdateDrugCancel(item.CancelStockId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "2",
 			})
 			return
 		}
-
+		fmt.Println("当前退库数量", total_number)
+		fmt.Println("总出口数量", out_number)
 		//正常退库
 		if total_number <= out_number {
 			//创建退库详情
-			errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
+			errs := service.CreateCancelStockInfoTwo(item)
 			//创建库存明细
-			errs = service.CreateDrugFlow(drugFlow)
+			flows := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  item.DrugId,
+				Number:                  "",
+				BatchNumber:             item.BatchNumber,
+				Count:                   item.Count,
+				UserOrgId:               adminUserInfo.CurrentOrgId,
+				PatientId:               0,
+				SystemTime:              ctime,
+				ConsumableType:          4,
+				IsSys:                   0,
+				WarehousingOrder:        infoWareInfo.WarehousingOrder,
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            manufacturer_id,
+				Dealer:                  dealer_id,
+				Creator:                 adminUserInfo.AdminUser.Id,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   item.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              item.ExpiryDate,
+				ProductDate:             item.ProductDate,
+				MaxUnit:                 item.MaxUnit,
+				MinUnit:                 "",
+			}
+			errs = service.CreateDrugFlowOne(flows)
 
 			var total int64
-			////退库到当前批次,获取当前退库批次的库存
-			//info, _ := service.GetDrugWarehouseInfoById(item.BatchNumberId)
 
 			if medical.MaxUnit == item.MaxUnit {
 				total = item.Count
@@ -2318,7 +2463,6 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 				})
 			}
 			if medical.MinUnit == item.MaxUnit {
-				fmt.Println("hhhhhh2323323232322332232332999999999进来", item.Count)
 				total = item.Count
 				warehouseInfo := models.XtDrugWarehouseInfo{
 					StockMinNumber: total,
@@ -2335,16 +2479,8 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 					"msg": "1",
 				})
 			}
-			if errs != nil {
-				utils.ErrorLog(errs.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
-				return
-			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "1",
-			})
 		}
+
 	}
 }
 func (c *StockDrugApiController) GetDrugCancelStockInfoList() {
@@ -2664,8 +2800,6 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 			}
 		}
 	}
-	fmt.Println("cancelStockInfos232323223323223322323223", cancelStockInfos)
-	fmt.Println("cancelStockInfos232323223323223322323223", upDateCancelStockInfos)
 
 	var errs error
 	if len(cancelStockInfos) > 0 {
@@ -2741,7 +2875,13 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 				//创建退库详情
 				errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
 				//创建库存明细
-				errs = service.CreateDrugFlow(drugFlow)
+				//查询这个药品这个订单是否已存在流水
+				for _, items := range drugFlow {
+					_, errsId := service.GetCancelStockId(items.CancelStockId, items.DrugId)
+					if errsId == gorm.ErrRecordNotFound {
+						errs = service.CreateDrugFlowTwo(items)
+					}
+				}
 
 				//获取该批次最后一条退库详情
 				lastCancel, _ := service.GetLastCancelStockInfo(id)
@@ -2753,7 +2893,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 				if lastCancel.MaxUnit == medical.MinUnit {
 					cancel_number = lastCancel.Count
 				}
-				fmt.Println("999999232323232232232323232323", lastCancel)
+				fmt.Println("999999232323232232232323232323", item.Count, cancel_number)
 				var total int64
 
 				if medical.MaxUnit == item.MaxUnit {
@@ -2803,21 +2943,31 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 		}
 	}
 	if len(drugFlow) > 0 {
-		parseDateErr := service.CreateDrugFlow(drugFlow)
-		fmt.Println(parseDateErr)
+		for _, items := range drugFlow {
+			_, errsId := service.GetCancelStockId(items.CancelStockId, items.DrugId)
+			if errsId == gorm.ErrRecordNotFound {
+				errs = service.CreateDrugFlowTwo(items)
+			}
+		}
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
 		var total int64
 		var out_count int64
+		var cancel_count int64
+		var now_count int64
+		var all_count int64
 		for _, item := range upDateCancelStockInfos {
+			//查询最后一条退库记录
+			info, _ := service.GetLastCancelStockInfoOne(id, item.DrugId)
 			errs = service.UpDateDrugCancelStockInfo(item)
-			//查询该批次最后一条退库记录
-			info, _ := service.GetLastCancelStockInfo(id)
+			fmt.Println("hh23232oooooooo2o3o2o32o23oo23o23o23", info)
 			//查询该药品的信息
 			medical, _ := service.GetBaseDrugMedical(item.DrugId)
 			//统计该批次的总出库数
 			outInfo, _ := service.GetDrugWarehouseOutInfo(item.BatchNumberId, item.DrugId)
+			//查询该批次的总退库数量
+			cancelInfo, _ := service.GetTotalDrugCancelInfo(item.BatchNumberId, item.DrugId, item.ID)
 			for _, item := range outInfo {
 				if item.CountUnit == medical.MaxUnit {
 					item.Count = item.Count * medical.MinNumber
@@ -2831,21 +2981,61 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 				out_count += item.Count
 			}
 
+			for _, item := range cancelInfo {
+				if item.MaxUnit == medical.MaxUnit {
+					item.Count = item.Count * medical.MinNumber
+				}
+				if item.MaxUnit == medical.MinUnit {
+					item.Count = item.Count
+				}
+			}
+
+			for _, item := range cancelInfo {
+				cancel_count += item.Count
+			}
+
 			fmt.Println("out_count232233332232323223", out_count)
 
 			if item.MaxUnit == medical.MaxUnit {
-				item.Count = item.Count * medical.MinNumber
+				now_count = item.Count * medical.MinNumber
+			}
+			if item.MaxUnit == medical.MinUnit {
+				now_count = item.Count
+			}
+			fmt.Println("hhhhhh2323322323", now_count+cancel_count)
+			//总退库批次
+			all_count = now_count + cancel_count
+
+			//该批次的总出库数小与退库数报错返回
+			if all_count > out_count {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "4",
+				})
+				return
+			}
+
+			if item.MaxUnit == medical.MaxUnit {
 				//更新库存
 				total = item.Count - info.Count
-				fmt.Println("total232323232323232232323", total)
-				service.UpdatedDrugInfo(item.BatchNumberId, total)
+				parseDateErr := service.UpdatedDrugInfo(item.BatchNumberId, total)
+				fmt.Println("parseDateErr", parseDateErr)
+
+				flow := models.DrugFlow{
+					Count: item.Count,
+				}
+				service.UpdatedDrugFlow(info.CancelStockId, item.DrugId, flow)
 				break
+
 			}
 
 			if item.MaxUnit == medical.MinUnit {
 				item.Count = item.Count
 				total = item.Count - info.Count
 				service.UpdatedDrugInfoOne(item.BatchNumberId, total)
+				flow := models.DrugFlow{
+					Count: item.Count,
+				}
+				service.UpdatedDrugFlow(info.CancelStockId, item.DrugId, flow)
 				break
 			}
 		}

controllers/gobal_config_api_controller.go

@@ -67,6 +67,12 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/xtconfig/get", &GobalConfigApiController{}, "get:GetXTHisConfig")
 	beego.Router("/api/xtconfig/isopen", &GobalConfigApiController{}, "post:PostXTHisConfig")
 
+	beego.Router("/api/hisstockpriceconfig/get", &GobalConfigApiController{}, "get:GetHisStockPriceConfig")
+	beego.Router("/api/hisstockpriceconfig/isopen", &GobalConfigApiController{}, "post:PostHisStockPriceConfig")
+
+	beego.Router("/api/xtconfig/get", &GobalConfigApiController{}, "get:GetXTHisConfig")
+	beego.Router("/api/xtconfig/isopen", &GobalConfigApiController{}, "post:PostXTHisConfig")
+
 	beego.Router("/api/xtconfigproject/isopen", &GobalConfigApiController{}, "post:PostXTHisProjectConfig")
 
 	beego.Router("/api/isopen/init", &GobalConfigApiController{}, "get:GetAllIsOpenConfig")
@@ -1040,6 +1046,10 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	idsInters := dataBody["ids"].([]interface{})
+	advice_type, _ := c.GetInt64("advice_type")
+	stop_type, _ := c.GetInt64("stop_type")
+	fmt.Println("advcie_type23323232322332", advice_type)
+	fmt.Println("stop_type33332323223232323", stop_type)
 	if len(idsInters) == 0 {
 		if err != nil {
 			c.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除会员失败:（没有选择会员）")
@@ -1405,6 +1415,60 @@ func (c *GobalConfigApiController) PostXTHisConfig() {
 	return
 }
 
+func (c *GobalConfigApiController) PostHisStockPriceConfig() {
+	is_open, _ := c.GetBool("is_open", false)
+	adminUserInfo := c.GetAdminUserInfo()
+	org_id := adminUserInfo.CurrentOrgId
+	isOpen := 0
+
+	if is_open {
+		isOpen = 1
+	} else {
+		isOpen = 2
+	}
+
+	config := models.HisStockPriceConfig{
+		UserOrgId: org_id,
+		IsOpen:    int64(isOpen),
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	errs, configs := service.FindHisStockPriceRecordByOrgId(org_id)
+
+	if errs == gorm.ErrRecordNotFound {
+		err := service.CreateHisStockPriceRecord(&config)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	} else if errs == nil {
+		modifyConfig := models.HisStockPriceConfig{
+			ID:        configs.ID,
+			UserOrgId: org_id,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+			IsOpen:    int64(isOpen),
+		}
+
+		err := service.UpdateHisStockPriceRecord(&modifyConfig)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"is_open": is_open,
+	})
+
+	return
+}
+
 func (c *GobalConfigApiController) PostXTHisProjectConfig() {
 	is_open, _ := c.GetBool("is_open", false)
 	adminUserInfo := c.GetAdminUserInfo()
@@ -1474,6 +1538,15 @@ func (c *GobalConfigApiController) GetXTHisConfig() {
 	})
 }
 
+func (c *GobalConfigApiController) GetHisStockPriceConfig() {
+	adminUserInfo := c.GetAdminUserInfo()
+	_, config := service.FindHisStockPriceRecordByOrgId(adminUserInfo.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
 func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
@@ -1908,7 +1981,7 @@ func (c *GobalConfigApiController) GetDrugStockFllow() {
 	}
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
-
+	medical, _ := service.GetBaseDrugMedical(drug_id)
 	//查询入库数据
 	if stock_type == 3 || stock_type == 0 {
 		list, total, err := service.GetDrugStockFlow(drug_id, startTime, endTime, page, limit, orgId)
@@ -1920,6 +1993,7 @@ func (c *GobalConfigApiController) GetDrugStockFllow() {
 			"list":             list,
 			"total":            total,
 			"manufacturerList": manufacturerList,
+			"drug":             medical,
 		})
 	}
 
@@ -2196,11 +2270,13 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 	list, total, _ := service.GetDrugFlow(drug_id, orgId, limit, page, startTime, endTime, stock_type)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
+	medical, _ := service.GetBaseDrugMedical(drug_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
 		"dealerList":       dealerList,
+		"drug":             medical,
 	})
 }
 

controllers/his_api_controller.go

@@ -529,7 +529,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 	//prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
 	//monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
@@ -582,6 +582,24 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		}
 	}
 
+
+	manufacturers, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
+
+	_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
+	if config.ID > 0 && config.IsOpen == 1 {
+		for _, item := range drugs {
+			var index = 0
+			for _, subItem := range item.OtherDrugWarehouseInfo {
+				if index == 0 {
+					if subItem.StockMaxNumber*item.MinNumber+subItem.StockMinNumber > 0 {
+						index = index + 1
+						item.MinPrice = subItem.Price
+					}
+				}
+			}
+		}
+	}
+
 	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
 	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
@@ -606,6 +624,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		"sick":             sick,
 		"additions":        additions,
 		"diagnose":         diagnose,
+		"manufacturers":    manufacturers,
 	})
 }
 func (c *HisApiController) CreateHisPrescription() {
@@ -1158,7 +1177,7 @@ func (c *HisApiController) EditHisPrescription() {
 
 	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor_id)
 
-	info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type)
+	info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 	var hpInfo models.HisPrescriptionInfo
 	if info.ID == 0 {
 		var randNum int
@@ -2602,8 +2621,8 @@ func (c *HisApiController) setProjectTemplateWithJSON(project *models.HisPrescri
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
@@ -3846,7 +3865,7 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 	//}
 
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
@@ -5440,7 +5459,7 @@ func (c *HisApiController) GetHisMonthChargePatientInfo() {
 	}
 
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
@@ -5497,7 +5516,7 @@ func (c *HisApiController) GetHisMonthPatientInfo() {
 
 	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)

controllers/his_charge_api_controller.go

@@ -2,7 +2,9 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
 	"github.com/astaxie/beego"
 	"time"
 )
@@ -15,6 +17,171 @@ func HisChargeApiRegistRouters() {
 	beego.Router("/api/his/chargestatistics/detail", &HisChargeApiController{}, "get:GetChargeStatisticsDetail")
 	beego.Router("/api/his/chargestatistics/settle", &HisChargeApiController{}, "get:GetChargeStatisticsSettle")
 
+	beego.Router("/api/his/inspectionlist/get", &HisChargeApiController{}, "get:GetHisInspectionList")
+	beego.Router("/api/his/inspectioninfo/get", &HisChargeApiController{}, "get:GetHisInspectionInfo")
+
+	//发票
+	beego.Router("/api/fapiao/create", &HisChargeApiController{}, "post:CreateFaPiaoRecord")
+	beego.Router("/api/fapiao/modify", &HisChargeApiController{}, "post:ModifyFaPiaoRecord")
+	beego.Router("/api/fapiao/list", &HisChargeApiController{}, "get:GetFaPiaoRecordList")
+	beego.Router("/api/fapiao/delete", &HisChargeApiController{}, "post:DeleteFaPiaoRecord")
+	beego.Router("/api/fapiao", &HisChargeApiController{}, "get:GetFaPiaoRecord")
+	beego.Router("/api/fapiao/is_use", &HisChargeApiController{}, "post:UpdateFaPiaoRecordIsUse")
+
+}
+
+func (c *HisChargeApiController) UpdateFaPiaoRecordIsUse() {
+	id, _ := c.GetInt64("id", 0)
+	is_use, _ := c.GetInt64("is_use")
+	if id <= 0 {
+		utils.ErrorLog("id == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	record, _ := service.FindFapiaoById(id)
+	adminUserInfo := c.GetAdminUserInfo()
+	service.UpdateFapiaoIsUse(adminUserInfo.CurrentOrgId)
+	records := models.HisFapiaoRecord{
+		ID:           id,
+		FapiaoCode:   record.FapiaoCode,
+		FapiaoNumber: record.FapiaoNumber,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+		UserOrgId:    adminUserInfo.CurrentOrgId,
+		Status:       1,
+		IsUse:        is_use,
+	}
+	err := service.ModifyFapiao(&records)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": records,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) CreateFaPiaoRecord() {
+	fapiao_code := c.GetString("fapiao_code")
+	fapiao_number := c.GetString("fapiao_number")
+	if len(fapiao_code) <= 0 {
+		utils.ErrorLog("len(fapiao_code) == 0")
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(fapiao_number) <= 0 {
+		utils.ErrorLog("len(fapiao_number) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+
+	record := models.HisFapiaoRecord{
+		FapiaoCode:   fapiao_code,
+		FapiaoNumber: fapiao_number,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+		UserOrgId:    adminUserInfo.CurrentOrgId,
+		Status:       1,
+		IsUse:        0,
+	}
+
+	err, records := service.AddSigleFapiaoRecord(&record)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": records,
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+
+	}
+
+}
+func (c *HisChargeApiController) ModifyFaPiaoRecord() {
+	id, _ := c.GetInt64("id", 0)
+	fapiao_code := c.GetString("fapiao_code")
+	fapiao_number := c.GetString("fapiao_number")
+
+	if id <= 0 {
+		utils.ErrorLog("id == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(fapiao_code) <= 0 {
+		utils.ErrorLog("len(fapiao_code) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if len(fapiao_number) <= 0 {
+		utils.ErrorLog("len(fapiao_number) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	record, _ := service.FindFapiaoById(id)
+	adminUserInfo := c.GetAdminUserInfo()
+	records := models.HisFapiaoRecord{
+		ID:           id,
+		FapiaoCode:   fapiao_code,
+		FapiaoNumber: fapiao_number,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+		UserOrgId:    adminUserInfo.CurrentOrgId,
+		Status:       1,
+		IsUse:        record.IsUse,
+	}
+
+	err := service.ModifyFapiao(&records)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": records,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) GetFaPiaoRecordList() {
+	page, _ := c.GetInt64("page", 1)
+	limit, _ := c.GetInt64("limit", 7)
+	adminUserInfo := c.GetAdminUserInfo()
+	fapiaoRecord, total, err := service.FindAllFapiaoList(adminUserInfo.CurrentOrgId, page, limit)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": fapiaoRecord,
+			"total":         total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) DeleteFaPiaoRecord() {
+	id, _ := c.GetInt64("id", 0)
+	err := service.DeleteFapiaoById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+func (c *HisChargeApiController) GetFaPiaoRecord() {
+	id, _ := c.GetInt64("id", 0)
+	fapiaoRecord, err := service.FindFapiaoById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"fapiao_record": fapiaoRecord,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
 }
 
 func (c *HisChargeApiController) GetChargeStatisticsDetail() {
@@ -87,3 +254,50 @@ func (c *HisChargeApiController) GetChargeStatisticsSettle() {
 	}
 
 }
+
+func (c *HisChargeApiController) GetHisInspectionList() {
+	record_date := c.GetString("record_date")
+	keyword := c.GetString("keyword")
+	is_print, _ := c.GetInt64("is_print")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	adminUser := c.GetAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	record_time := startTime.Unix()
+	labels, total, err := service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword)
+	if err == nil {
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"labels": labels,
+			"total":  total,
+		})
+		return
+
+	} else {
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+
+}
+func (c *HisChargeApiController) GetHisInspectionInfo() {
+	id, _ := c.GetInt64("id")
+	label, err := service.GetLabelPrintInfo(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"label": label,
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/his_config_api_controller.go

@@ -413,8 +413,8 @@ func (c *HisConfigApiController) setProjectTemplateWithJSON(project *models.HisP
 
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
-		totals, _ := strconv.ParseInt(total, 10, 64)
-		project.Count = totals
+		//totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = total
 	}
 
 	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {

controllers/his_hospital_api_controller.go

@@ -198,7 +198,7 @@ func (c *HisHospitalApiController) GetHisHospitalChargePatientInfo() {
 		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFour(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
 	}
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 	order, _ := service.GetNewHisOrder(admin.CurrentOrgId, his_patient_info.Number, patient_id)
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息

controllers/his_project_api_controller.go

@@ -825,12 +825,19 @@ func (this *HisProjectApiController) DeleteProject() {
 }
 
 func (this *HisProjectApiController) GetHisProject() {
-
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	project, err := service.GetHisProject(orgId)
 	good_info, err := service.GetGoodInfoMation(orgId)
-
+	_, config := service.FindHisStockPriceRecordByOrgId(orgId)
+	if config.ID > 0 && config.IsOpen == 1 {
+		//处理耗材不同批号价格问题
+		for _, item := range good_info {
+			if len(item.GoodSotckInfo) > 0 {
+				item.PackingPrice = item.GoodSotckInfo[0].Price
+			}
+		}
+	}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return

controllers/manage_api_controller.go

@@ -2300,15 +2300,12 @@ func (this *MachineApiController) EditUser() {
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
 	patientid, _ := this.GetInt64("patientid")
-	device, err := service.GetUserInformation(id)
+	device, _ := service.GetUserInformation(id)
 	//获取初次使用记录
-	macher, err := service.GetUserTotalByMacher(device.EquimentId)
-	count, err := service.GetUserTotalCount(orgId, device.BedNumber)
-	patients, err := service.GetPatientInfoMation(patientid)
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
-		return
-	}
+	macher, _ := service.GetUserTotalByMacher(device.EquimentId)
+	count, _ := service.GetUserTotalCount(orgId, device.BedNumber)
+	patients, _ := service.GetPatientInfoMation(patientid)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"device":   device,
 		"patients": patients,

controllers/manager_center_api_controller.go

@@ -303,7 +303,6 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
-
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 	drugLib := &models.BaseDrugLib{
@@ -1440,6 +1439,8 @@ func (c *ManagerCenterApiController) GetAllManufacturer() {
 func (c *ManagerCenterApiController) CreateGoodInfo() {
 	good_id, _ := c.GetInt64("good_id", 0)
 	specification_name := c.GetString("specification_name")
+	register_number := c.GetString("register_number")
+
 	good_unit, _ := c.GetInt64("good_unit", -1)
 	buy_price, _ := c.GetFloat("buy_price", 0)
 	sell_price, _ := c.GetFloat("sell_price", 0)
@@ -1540,6 +1541,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		PackingPrice:                packing_price,
 		DefaultCountUnit:            default_count_unit,
 		MinUnit:                     min_unit,
+		RegisterNumber:              register_number,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1601,6 +1603,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	default_count_unit := c.GetString("default_count_unit")
 	min_unit := c.GetString("min_unit")
 	total, _ := c.GetFloat("total")
+	register_number := c.GetString("register_number")
 
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -1652,6 +1655,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		DefaultCountUnit:            default_count_unit,
 		MinUnit:                     min_unit,
 		Total:                       total,
+		RegisterNumber:              register_number,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -502,6 +502,36 @@ func (this *DialysisAPIController) DialysisRecord() {
 		}
 	}
 	_, is_open_config := service.FindXTHisRecordByOrgId(adminInfo.Org.Id)
+
+	_, is_project_open_config := service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
+
+	projects, _ := service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
+
+	var team_projects []*models.HisPrescriptionProject
+	var index int64 = 0
+	for _, item := range temp_team_projects {
+		//组套里面非检验项目的
+		if item.HisProject.CostClassify != 3 {
+			projects = append(projects, item)
+		}
+		//组套里面检验项目的
+		if item.HisProject.CostClassify == 3 {
+			index = index + 1
+			if index == 1 {
+				team_projects = append(team_projects, item)
+			}
+		}
+	}
+
+	stockType, _ := service.GetStockType(adminInfo.Org.Id)
+
+	prepare, _ := service.GetDialyStockOut(adminInfo.Org.Id, date.Unix(), patientID)
+
+	//获取最后一次血管通路
+	lastAssessment, parseDateErr := service.GetLastPassWayAssessment(adminInfo.Org.Id, patientID)
+
+	prescribeOne, parseDateErr := service.MobileGetDialysisPrescribeByModeIdOne(adminInfo.Org.Id, patientID, date.Unix())
 	var his_advices []*models.HisDoctorAdviceInfo
 	if is_open_config.IsOpen == 1 {
 		// 先走redis，没有走数据库
@@ -537,6 +567,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"prescribeOne":                   prescribeOne,
 		"is_project_open_config":         is_project_open_config,
 		"project":                        projects,
+		"team_projects":                  team_projects,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -1145,7 +1176,9 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
+
 		if err == nil {
+			fmt.Println("hhhhhhhhhhh0000000000", err)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
 			})
@@ -1695,6 +1728,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 {
 		evaluation, _ := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -3188,11 +3222,10 @@ func (c *DialysisAPIController) GetLongAdvice() {
 		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"status":          "2",
-				"advices":         advices,
-				"advices_two":     RemoveRepeatedElement(advice_three),
-				"is_open_remind":  config.IsOpenRemind,
-				"his_config_open": hisConfig.IsOpen,
+				"status":         "2",
+				"advices":        advices,
+				"advices_two":    RemoveRepeatedElement(advice_three),
+				"is_open_remind": config.IsOpenRemind,
 			})
 		}
 	}
@@ -3834,7 +3867,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
-		fmt.Println("dialysisBefor9999999999999999999", dialysisBefor, active)
+		//fmt.Println("dialysisBefor9999999999999999999", dialysisBefor, active)
 
 		//新增
 		if active == 1 && len(goods) > 0 {
@@ -3995,34 +4028,6 @@ func (c *DialysisAPIController) CreateConsumables() {
 				}
 			}
 
-			//出库
-			//err = service.ConsumablesDeliveryTotal(adminUser.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminUser.AdminUser.Id)
-			//fmt.Println("err", err)
-			////查询今日出库数据
-			//list, _ := service.GetAutoReduceRecordInfoByPatientId(adminUser.Org.Id, patient_id, record_time)
-			//
-			//if len(list) == 0 {
-			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-			//	return
-			//}
-			//
-			//for _, item := range list {
-			//	prepare := models.DialysisBeforePrepare{
-			//		UserOrgId:  item.OrgId,
-			//		PatientId:  patient_id,
-			//		RecordDate: item.RecordTime,
-			//		GoodId:     item.GoodId,
-			//		GoodTypeId: item.GoodTypeId,
-			//		Count:      item.Count,
-			//		Ctime:      time.Now().Unix(),
-			//		Creater:    adminUser.AdminUser.Id,
-			//		Status:     1,
-			//	}
-			//	//删除准备表数据
-			//	service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
-			//	service.CreateDialysisBeforePrepareOne(&prepare)
-			//}
-
 		}
 	}
 
@@ -4268,7 +4273,6 @@ func (c *DialysisAPIController) EditConsumables() {
 				}
 
 				for _, item := range beforePrepares {
-					fmt.Println("23232323232323为什么99999999999999999999999999999999", item.GoodId)
 
 					//1.查看该患者该耗材型号最后一次出库数量
 					goodInfo, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
@@ -4283,6 +4287,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
 						break
 					}
+
 					var last_total int64
 
 					//如果当前出库数量大于 最后一次出库数量，那么则需要去查询当前批次耗材的库存是否足够
@@ -4293,6 +4298,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 						//查询该批次剩余库存
 						lastInfo, _ := service.GetLastStockOut(goodInfo.WarehouseInfotId)
+						fmt.Println("剩余库存333333333333333", lastInfo)
 						if lastInfo.StockCount == 0 {
 							//查询该耗材的总库存
 							wareinfo, _ := service.GetStockGoodCount(item.GoodId)
@@ -4307,17 +4313,22 @@ func (c *DialysisAPIController) EditConsumables() {
 							}
 
 						}
+
 						//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
 						fmt.Println("剩余库存", lastInfo.StockCount)
 						fmt.Println("差", last_total)
-						if lastInfo.StockCount >= last_total {
-							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-							break
-						}
-
-						//如果库存不够，则出库到下一个批次
-						if lastInfo.StockCount < last_total {
-
+						//查询该耗材的总库存
+						wareinfo, _ := service.GetStockGoodCount(item.GoodId)
+						// 如果库存差大于剩余库存则提示库存不足
+						if last_total > wareinfo.StockCount {
+							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"message":            "1",
+								"good_name":          goodObj.GoodName,
+								"specification_name": goodObj.SpecificationName,
+							})
+							return
+						} else {
 							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
 							break
 						}
@@ -4955,7 +4966,6 @@ func (c *DialysisAPIController) UpdateStockGoods() {
 //当前数据比上一次出库数据少
 func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, creater int64, count int64) (err error) {
 
-	fmt.Println("w我的中国馆公共区发电房阿道夫安抚安抚安抚安抚安抚安抚阿道夫阿道夫阿凡达阿道夫a", count)
 	//查询该患者当天已经出库的耗材信息
 	goods_yc, _ := service.FindConsumablesByDateThree(orgID, patient_id, record_time)
 	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
@@ -4994,7 +5004,6 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-	fmt.Println("goodsy999999999999", goods_yc)
 
 	//退库
 	if len(goods_yc) > 0 {
@@ -5010,10 +5019,8 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 //耗材出库删除
 func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
-	fmt.Println("count2323223884584854854854u5454785487547845785478758487545475475487,count", count)
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockTwo(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, good_yc.PatientId)
-	fmt.Println("errr232323232323232323232323232", err)
 
 	if err != nil {
 		return err
@@ -5115,7 +5122,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				PatientId:               patient_id,
 			}
 
-			service.UpdatedStockFlow(stockFlow)
+			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
 		}
 
 		if errOne != nil {
@@ -5182,7 +5189,8 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				PatientId:               patient_id,
 				ReturnCount:             delete_count,
 			}
-			service.UpdatedStockFlow(stockFlow)
+			//service.UpdatedStockFlow(stockFlow)
+			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
 		}
 
 	}
@@ -5216,7 +5224,8 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	// 删除出库完成后，要增加对应批次的库存数量
 	fmt.Println("deletecount2323232323232323232323232323", delete_count)
 	errThree := service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count)
-
+	errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
+	fmt.Println("erron2332323232323232232323", errOne)
 	if errThree != nil {
 		return errThree
 	}
@@ -5268,6 +5277,7 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
 	fmt.Println("goods222222222222", goods)
 	fmt.Println("goodsy999999999999", goods_yc)
+
 	if len(goods) > 0 {
 		out, err := service.FindStockOutByIsSys(orgID, 1, record_time)
 		if err == gorm.ErrRecordNotFound {
@@ -5368,14 +5378,17 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		stockInInfo, _ := service.FindLastStockInInfoRecord(good_yc.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+
 		if errOne != nil {
 			return errOne
 		}
 
-		//更改自动出库的表格
-
 		// 删除出库完成后，要增加对应批次的库存数量
-		fmt.Println("deletecount2323232323232323232323232323", delete_count)
+		fmt.Println("时间人秘股呢换药2232323223323223322323232323232323232323232323", delete_count)
+
+		// 删除出库完成后，要改变流水库存
+		errOne = service.UpDateWarehouStockFlowByStockDelete(ware.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
+		fmt.Println("erron2332323232323232232323", errOne)
 		errThree := service.UpDateWarehouseInfoByStockDelete(ware.WarehouseInfotId, delete_count)
 
 		if errThree != nil {

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -75,6 +75,26 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
 		//获取his医嘱数据
 		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		//team_project, _ := service.GetMobileHisPrescriptionTeamProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		for _, item := range project {
+			index := 0
+			for _, subItem := range item.HisPrescriptionTeamProject {
+
+				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)
+					}
+				}
+			}
+		}
+
 
 		//获取所有的患者
 		patients, _ := service.GetAllPatientListByListTwo(orgID)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -679,7 +679,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
-		fmt.Println("2323232323232323232开关", drugStockConfig.IsOpen)
+
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
@@ -695,9 +695,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					var prescribing_number_total int64
 					for _, item := range advices {
 						if item.Way == 1 {
-							//查询该药品是否有库存
+							//查询该药品的剩余库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-							fmt.Println("list23232323232232323232323232", list)
+
 							//查询改药品信息
 							medical, _ := service.GetBaseDrugMedical(item.DrugId)
 							//判断单位是否相等
@@ -715,8 +715,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								prescribing_number_total = count
 							}
 
-							fmt.Println("数量一", prescribing_number_total)
-							fmt.Println("数量二", total)
+							fmt.Println("开医嘱数量", prescribing_number_total)
+							fmt.Println("剩余库存", total)
 
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
@@ -757,26 +757,29 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						isHasWay = true
 					}
 				}
-				fmt.Println("hh2h32323232323232323", isHasWay)
+
 				if isHasWay {
 					var total int64
 					var prescribing_number_total int64
 					for _, item := range advices {
-						fmt.Println("hhh23h2h3h232323", item.Way)
+
 						if item.Way == 1 {
-							//查询该药品是否有库存
+							//查询该药品的剩余库存
 							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
 
 							//查询改药品信息
 							medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
 							//判断单位是否相等
 							if medical.MaxUnit == item.PrescribingNumberUnit {
 								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 								//转化为最小单位
-								total = list.Count * medical.MinNumber
+								total = list.Count*medical.MinNumber + list.StockMinNumber
+								fmt.Println("美国疫情2332323233232323232332323232233232323232", total)
 								prescribing_number_total = count * medical.MinNumber
 							}
+
 							if medical.MinUnit == item.PrescribingNumberUnit {
 								prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 								count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
@@ -784,8 +787,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								prescribing_number_total = count
 							}
 
-							fmt.Println("数量一", prescribing_number_total)
-							fmt.Println("数量二", total)
+							fmt.Println("开医嘱数量", prescribing_number_total)
+							fmt.Println("剩余库存", total)
 
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 								c.ServeSuccessJSON(map[string]interface{}{
@@ -803,6 +806,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								})
 								return
 							}
+
 							if prescribing_number_total <= total {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 								c.ServeSuccessJSON(map[string]interface{}{
@@ -982,26 +986,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				for _, item := range advices {
 
 					advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
-					//查询该药品是否有库存
-					//  list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
-					//  prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					//  if list.Count == 0 {
-					//    c.ServeSuccessJSON(map[string]interface{}{
-					//      "msg":    "1",
-					//      "advice": advice,
-					//      "ids":    ids,
-					//    })
-					//    return
-					//  }
-					//  if count > list.Count {
-					//    c.ServeSuccessJSON(map[string]interface{}{
-					//      "msg":    "2",
-					//      "advice": advice,
-					//      "ids":    ids,
-					//    })
-					//    return
-					//}
+
 					var total int64
 					var prescribing_number_total int64
 					//查询该药品是否有库存
@@ -1014,9 +999,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
 						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 						//转化为最小单位
-						total = list.Count * medical.MinNumber
+						total = list.Count*medical.MinNumber + list.StockMinNumber
 						prescribing_number_total = count * medical.MinNumber
 					}
+					fmt.Println("医嘱开的数量", total)
 					if medical.MinUnit == advice.PrescribingNumberUnit {
 						prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
 						count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
@@ -1071,6 +1057,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
+	fmt.Println("execution_time", execution_time)
 	groupno, _ := c.GetInt64("groupno", -1)
 
 	var ids []string
@@ -1156,8 +1143,15 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			ExecutionTime: theTime.Unix(),
 			UpdatedTime:   time.Now().Unix(),
 		}
+		fmt.Println("ids2323232232323", ids)
 		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
 
+		project := models.HisPrescriptionProject{
+			ExecutionTime: theTime.Unix(),
+			Mtime:         time.Now().Unix(),
+		}
+		service.ModifyHisPrescriptionProject(&project, ids)
+
 	}
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
@@ -2053,10 +2047,7 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		blood_access_part_id := dataBody["blood_access_part_id"].(string)
 		evaluation.BloodAccessPartId = blood_access_part_id
 	}
-	//if dataBody["blood_access_part_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_id"]).String() == "float64" {
-	//	blood_access_part_id := int64(dataBody["blood_access_part_id"].(float64))
-	//	evaluation.BloodAccessPartId = blood_access_part_id
-	//}
+
 	if dataBody["blood_access_part_opera_id"] != nil && reflect.TypeOf(dataBody["blood_access_part_opera_id"]).String() == "float64" {
 		blood_access_part_opera_id := int64(dataBody["blood_access_part_opera_id"].(float64))
 		evaluation.BloodAccessPartOperaId = blood_access_part_opera_id
@@ -2075,9 +2066,6 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		is_hemorrhage, _ := strconv.ParseInt(ishemorrhage, 10, 64)
 		evaluation.IsHemorrhage = is_hemorrhage
 
-		//if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
-		//	is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
-		//	fmt.Println("is_hemorrhage2222222222222222",is_hemorrhage)
 		if is_hemorrhage != 1 && is_hemorrhage != 2 {
 			is_hemorrhage = 0
 		}
@@ -2193,6 +2181,8 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		humor_excessive_symptom, _ := dataBody["humor_excessive_symptom"].(string)
 
+	if dataBody["humor_excessive_symptom"] != nil && reflect.TypeOf(dataBody["humor_excessive_symptom"]).String() == "string" {
+		humor_excessive_symptom := dataBody["humor_excessive_symptom"].(string)
 		evaluation.HumorExcessiveSymptom = humor_excessive_symptom
 	}
 
@@ -2902,6 +2892,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 		for _, item := range projects {
+			cnt, _ := strconv.ParseFloat(item.Count, 64)
 			var advice models.HisDoctorAdviceInfo
 			advice.ID = item.ID
 			advice.Checker = item.Checker
@@ -2910,6 +2901,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			advice.ExecutionState = item.ExecutionState
 			advice.ExecutionStaff = item.ExecutionStaff
 			//advice.PrescribingNumber = float64(item.Count)
+			advice.PrescribingNumber = cnt
 			advice.PrescribingNumberUnit = item.Unit
 			advice.AdviceDoctor = item.Doctor
 			if item.Type == 3 {
@@ -3578,6 +3570,8 @@ func (this *PatientApiController) GetSearchPatient() {
 func (c *PatientApiController) ExecProject() {
 	execution_time := c.GetString("execution_time")
 	project_id, _ := c.GetInt64("project_id")
+	team_id, _ := c.GetInt64("team_id")
+	is_check_team, _ := c.GetInt64("is_check_team")
 
 	if len(execution_time) <= 0 {
 		utils.ErrorLog("execution_time")
@@ -3593,6 +3587,7 @@ func (c *PatientApiController) ExecProject() {
 		return
 	}
 	adminInfo := c.GetMobileAdminUserInfo()
+
 	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
 	if project.ExecutionState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
@@ -3602,29 +3597,63 @@ func (c *PatientApiController) ExecProject() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 		return
 	}
-
 	project.ExecutionState = 1
 	project.ExecutionStaff = adminInfo.AdminUser.Id
 	project.ExecutionTime = theTime.Unix()
-	err := service.SaveHisProject(&project)
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"project": project,
-		})
+	if team_id == 0 {
+
+		err := service.SaveHisProject(&project)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"project": project,
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+
+		}
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
 
-	}
+			err := service.SaveHisProject(&project)
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
 
+			}
+		} else {
+			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			var ids []int64
+			for _, items := range ps {
+				ids = append(ids, items.ID)
+			}
+			err := service.UpdateTeamProjectExceStatus(ids, adminInfo.AdminUser.Id, theTime.Unix())
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+		}
+
+	}
 }
 
 func (c *PatientApiController) CheckProject() {
 
 	adminInfo := c.GetMobileAdminUserInfo()
 	project_id, _ := c.GetInt64("project_id")
-	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
+	team_id, _ := c.GetInt64("team_id")
+	is_check_team, _ := c.GetInt64("is_check_team")
 
+	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
 	if project.CheckState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
 		return
@@ -3637,18 +3666,52 @@ func (c *PatientApiController) CheckProject() {
 	project.Checker = adminInfo.AdminUser.Id
 	project.CheckTime = time.Now().Unix()
 	project.CheckState = 1
+	if team_id == 0 {
+		err := service.SaveHisProject(&project)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":     "ok",
+				"project": project,
+			})
 
-	err := service.SaveHisProject(&project)
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
 
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":     "ok",
-			"project": project,
-		})
+		}
 
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
+			err := service.SaveHisProject(&project)
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "ok",
+					"project": project,
+				})
+
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+
+		} else {
+			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			var ids []int64
+			for _, items := range ps {
+				ids = append(ids, items.ID)
+			}
+			err := service.UpdateTeamProjectCheckStatus(ids, project.PatientId, project.RecordDate, project.UserOrgId, adminInfo.AdminUser.Id, time.Now().Unix())
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+		}
 
 	}
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -100,7 +100,7 @@ func (c *MobileHisApiController) GetHisPatientInfo() {
 	prescriptions, _ := service.GetHisPrescription(admin.Org.Id, patient_id, recordDateTime, 2)
 	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.Org.Id, patient_id, startRecordDateTime, endRecordDateTime, 2)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.Org.Id, patient_id, recordDateTime)
-	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.Org.Id, patient_id, recordDateTime, 2)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfoTwo(admin.Org.Id, patient_id, recordDateTime, 2)
 	order, _ := service.GetHisOrder(admin.Org.Id, number, patient_id)
 	all_prescriptions, _ := service.GetCallHisPrescriptions(startRecordDateTime, endRecordDateTime, admin.Org.Id, patient_id, 2)
 	adminUserInfo, _ := service.GetAdminUserInfoByID(admin.Org.Id, admin.AdminUser.Id)
@@ -527,7 +527,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 	}
 
-	info, _ := service.FindPatientPrescriptionInfo(adminInfo.Org.Id, patient_id, recordDateTime, 2)
+	info, _ := service.FindPatientPrescriptionInfoTwo(adminInfo.Org.Id, patient_id, recordDateTime, 2)
 	var hpInfo models.HisPrescriptionInfo
 	if info.ID == 0 {
 		var randNum int

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -5,7 +5,12 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
 	"fmt"
+	"github.com/jinzhu/gorm"
+	"reflect"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -268,22 +273,37 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 		}
 		startTime = theTime.Unix()
 	}
-	fmt.Println("时间搓", startTime)
 	zoneid, _ := this.GetInt64("zoneid")
 	fmt.Println(zoneid)
 	classtype, _ := this.GetInt64("classtype")
-	fmt.Println("classtype", classtype)
 
-	//获取当天排班的病人情况
-	schedule, err := service.GetPatientSchedule(startTime, zoneid, classtype, orgid)
+	is_open, _ := this.GetInt64("is_open")
 
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
-		return
+	if is_open == 0 {
+		//获取当天排班的病人情况
+		schedule, err := service.GetPatientSchedule(startTime, zoneid, classtype, orgid)
+
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule": schedule,
+		})
+	}
+	if is_open == 1 {
+		//获取空床位的排班数据
+		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid, classtype)
+		stockType, _ := service.GetStockType(orgid)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule":  list,
+			"stockType": stockType,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"schedule": schedule,
-	})
 }
 
 func (this *StaffScheduleApiController) DeleteSchedule() {
@@ -352,3 +372,308 @@ func (this *StaffScheduleApiController) UpdatePatientScheduleById() {
 		"msg": "切换成功",
 	})
 }
+func (this *StaffScheduleApiController) UpdateDialysisPrescription() {
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time, _ := this.GetInt64("start_time")
+	mode_id, _ := this.GetInt64("mode_id")
+	dialyzer_perfusion_apparatus := this.GetString("dialyzer_perfusion_apparatus")
+	dialysis_irrigation := this.GetString("dialysis_irrigation")
+	//更改透析模式
+	_, errcode := service.GetDialyisSolution(patient_id, start_time)
+	if errcode == gorm.ErrRecordNotFound {
+		orgId := this.GetMobileAdminUserInfo().Org.Id
+		prescription := models.DialysisPrescription{
+			DialysisDialyszers: dialyzer_perfusion_apparatus,
+			DialysisIrrigation: dialysis_irrigation,
+			PatientId:          patient_id,
+			UserOrgId:          orgId,
+			Status:             1,
+			RecordDate:         start_time,
+			CreatedTime:        time.Now().Unix(),
+			ModeId:             mode_id,
+		}
+		err := service.CreateDialysisPrescription(&prescription)
+
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+	} else if errcode == nil {
+		prescription := models.DialysisPrescription{
+			DialysisDialyszers: dialyzer_perfusion_apparatus,
+			DialysisIrrigation: dialysis_irrigation,
+			ModeId:             mode_id,
+		}
+		err := service.UpdateDialysisPrescriptionOne(prescription, patient_id, start_time, mode_id)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+	}
+}
+
+func (this *StaffScheduleApiController) UpdateBloodScheduleMode() {
+	id, _ := this.GetInt64("id")
+	mode_id, _ := this.GetInt64("mode_id")
+	schedule := models.XtSchedule{
+		ModeId: mode_id,
+	}
+	service.UpdatedScheduleMode(schedule, id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功",
+	})
+}
+
+func (this *StaffScheduleApiController) UpdateBloodSchedule() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	fmt.Println(patient_id)
+	mode_id, _ := this.GetInt64("mode_id")
+	schedule_type, _ := this.GetInt64("schedule_type")
+	start_time, _ := this.GetInt64("start_time")
+	bed_id, _ := this.GetInt64("bed_id")
+	//更改排班
+	schedule := models.XtSchedule{
+		ScheduleType: schedule_type,
+		ModeId:       mode_id,
+	}
+
+	//查询该床位该班次是否存在排班
+	_, errschedulecode := service.GetPatientScheduleIsExist(start_time, schedule_type, bed_id)
+	if errschedulecode == gorm.ErrRecordNotFound {
+		service.UpdatedSchedule(schedule, patient_id, start_time, schedule_type, bed_id)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msgerr": "保存成功",
+		})
+	} else if errschedulecode == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg":    "1",
+			"msgerr": "排班已存在",
+		})
+	}
+
+}
+
+func (this *StaffScheduleApiController) GetSchedulePatient() {
+
+	schedule, _ := this.GetInt64("schedule", 0) //1已2未
+	contagion, _ := this.GetInt64("contagion", 0)
+	keywords := this.GetString("keywords", "")
+	adminInfo := this.GetMobileAdminUserInfo()
+	thisTime := time.Now()
+	weekDay := int(thisTime.Weekday())
+	if weekDay == 0 {
+		weekDay = 7
+	}
+	thisWeekEnd := 7 - weekDay
+	weekStartPoint := thisWeekEnd - 6
+	weekStartDay := thisTime.AddDate(0, 0, weekStartPoint)
+	weekEndPoint := thisWeekEnd + 7
+	weekEndDay := thisTime.AddDate(0, 0, weekEndPoint)
+	fmt.Println(weekStartPoint, weekStartDay, weekEndPoint, weekEndDay)
+
+	weekStartTime := weekStartDay.Format("2006-01-02") + " 00:00:00"
+	weekEndTime := weekEndDay.Format("2006-01-02") + " 23:59:59"
+	fmt.Println(weekStartTime, weekEndTime)
+
+	timeLayout := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+	theStarTime, _ := time.ParseInLocation(timeLayout, weekStartTime, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
+	weekStart := theStarTime.Unix()
+	weekEnd := theEndTime.Unix()
+
+	patients, _ := service.GetPatientWithScheduleAndSolution(adminInfo.Org.Id, keywords, weekStart, weekEnd, schedule, contagion)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patients": patients,
+	})
+	return
+}
+
+func (c *StaffScheduleApiController) CreateMobileSchedulePatient() {
+
+	patientID, _ := c.GetInt64("patient_id", 0)
+	if patientID <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := c.GetMobileAdminUserInfo()
+	patientInfo, _ := service.FindPatientById(adminUserInfo.Org.Id, patientID)
+	if patientInfo.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+
+	var schedule models.Schedule
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if dataBody["schedule_date"] == nil || reflect.TypeOf(dataBody["schedule_date"]).String() != "string" {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	scheduleDate, _ := dataBody["schedule_date"].(string)
+	if len(scheduleDate) == 0 {
+		utils.ErrorLog("len(schedule_date) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", scheduleDate+" 00:00:00", loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ScheduleDate = theTime.Unix()
+
+	timeNow := time.Now().Format("2006-01-02")
+	if timeNow > scheduleDate {
+		utils.ErrorLog(timeNow)
+		utils.ErrorLog(scheduleDate)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleBeforeNow)
+		return
+	}
+
+	if dataBody["schedule_type"] == nil || reflect.TypeOf(dataBody["schedule_type"]).String() != "float64" {
+		utils.ErrorLog("schedule_type")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	scheduleType := int64(dataBody["schedule_type"].(float64))
+	if scheduleType < 1 || scheduleType > 3 {
+		utils.ErrorLog("scheduleType < 3")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ScheduleType = scheduleType
+
+	if dataBody["bed_id"] == nil || reflect.TypeOf(dataBody["bed_id"]).String() != "float64" {
+		utils.ErrorLog("bed_id")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	bedId := int64(dataBody["bed_id"].(float64))
+	if bedId < 1 {
+		utils.ErrorLog("bedId < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.BedId = bedId
+
+	if dataBody["partition_id"] == nil || reflect.TypeOf(dataBody["partition_id"]).String() != "float64" {
+		utils.ErrorLog("partition_id")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	partitionId := int64(dataBody["partition_id"].(float64))
+	if partitionId < 1 {
+		utils.ErrorLog("partitionId < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.PartitionId = partitionId
+
+	if dataBody["schedule_week"] == nil || reflect.TypeOf(dataBody["schedule_week"]).String() != "float64" {
+		utils.ErrorLog("schedule_week")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	scheduleWeek := int64(dataBody["schedule_week"].(float64))
+	if scheduleWeek < 1 || scheduleWeek > 7 {
+		utils.ErrorLog("scheduleWeek < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ScheduleWeek = scheduleWeek
+
+	if dataBody["mode_id"] == nil || reflect.TypeOf(dataBody["mode_id"]).String() != "float64" {
+		utils.ErrorLog("mode_id")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	modeId := int64(dataBody["mode_id"].(float64))
+	if modeId < 1 && modeId > 14 {
+		utils.ErrorLog("modeId < 1")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	schedule.ModeId = modeId
+
+	schedule.PatientId = patientID
+	schedule.CreatedTime = time.Now().Unix()
+	schedule.UpdatedTime = time.Now().Unix()
+	schedule.Status = 1
+	schedule.UserOrgId = adminUserInfo.Org.Id
+
+	bed, _ := service.GetDeviceNumberByID(adminUserInfo.Org.Id, schedule.BedId)
+	if bed == nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeviceNumberNotExist)
+		return
+	}
+	if bed.ZoneID != schedule.PartitionId {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeviceNumberNotTheZone)
+		return
+	}
+
+	scheduleDateStart := scheduleDate + " 00:00:00"
+	scheduleDateEnd := scheduleDate + " 23:59:59"
+	timeLayout = "2006-01-02 15:04:05"
+	theStartTime, _ := time.ParseInLocation(timeLayout, scheduleDateStart, loc)
+	theEndTime, _ := time.ParseInLocation(timeLayout, scheduleDateEnd, loc)
+	startTime := theStartTime.Unix()
+	endTime := theEndTime.Unix()
+
+	//一天只有排班一次
+	daySchedule, err := service.GetDaySchedule(adminUserInfo.Org.Id, startTime, endTime, patientID)
+	if daySchedule.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCantSetScheduleAgainOneDay)
+		return
+	}
+
+	//同天同位置只能排一个
+	pointSchedule, err := service.GetPointSchedule(adminUserInfo.Org.Id, schedule.ScheduleDate, schedule.ScheduleWeek, schedule.ScheduleType, schedule.BedId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if pointSchedule.ID > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePointScheduleExist)
+		return
+	}
+
+	redis := service.RedisClient()
+	defer redis.Close()
+	err = service.CreateSchedule(&schedule)
+
+	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+	redis.Set(key, "", time.Second)
+
+	fmt.Println(err)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateScheduleFail)
+		return
+	}
+	schedule.Patient = patientInfo.Name
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":      "ok",
+		"schedule": schedule,
+	})
+	return
+
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -20,4 +20,9 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/deleteSchedule", &StaffScheduleApiController{}, "Get:DeleteSchedule")
 	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")
 	beego.Router("/m/api/updatepatientschedule", &StaffScheduleApiController{}, "Get:UpdatePatientScheduleById")
+	beego.Router("/m/api/updateschedulemode", &StaffScheduleApiController{}, "Get:UpdateBloodScheduleMode")
+	beego.Router("/m/api/updatedialysisprescription", &StaffScheduleApiController{}, "Get:UpdateDialysisPrescription")
+	beego.Router("/m/api/updateschedule", &StaffScheduleApiController{}, "Get:UpdateBloodSchedule")
+	beego.Router("m/api/schedule/patients", &StaffScheduleApiController{}, "Get:GetSchedulePatient")
+	beego.Router("/m/api/schedule/create", &StaffScheduleApiController{}, "Post:CreateMobileSchedulePatient")
 }

controllers/patient_api_controller.go

@@ -1689,7 +1689,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 					//转化为最小单位
-					total = list.Count * medical.MinNumber
+					total = list.Count*medical.MinNumber + list.StockMinNumber
 					prescribing_number_total = count * medical.MinNumber
 				}
 				if medical.MinUnit == item.PrescribingNumberUnit {
@@ -1726,27 +1726,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					return
 				}
 
-				////查询该药品是否有库存
-				//list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-				//prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-				//if list.Count == 0 {
-				//	c.ServeSuccessJSON(map[string]interface{}{
-				//		"msg":    "1",
-				//		"advice": advice,
-				//	})
-				//	return
-				//}
-				//if count > list.Count {
-				//	c.ServeSuccessJSON(map[string]interface{}{
-				//		"msg":    "2",
-				//		"advice": advice,
-				//	})
-				//	return
-				//}
-				////调用药品出库接口
-				//service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-
 			}
 		}
 
@@ -1830,7 +1809,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 
 		executionStaff := adminUserInfo.AdminUser.Id
-		// checker := adminUserInfo.AdminUser.Id
 
 		timeLayout := "2006-01-02 15:04:05"
 		loc, _ := time.LoadLocation("Local")
@@ -1890,7 +1868,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 					//转化为最小单位
-					total = list.Count * medical.MinNumber
+					total = list.Count*medical.MinNumber + list.StockMinNumber
 					prescribing_number_total = count * medical.MinNumber
 				}
 				fmt.Println("单位1", medical.MinUnit)
@@ -1900,9 +1878,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 					total = list.Count*medical.MinNumber + list.StockMinNumber
-					fmt.Println("23232322323322323233223", total)
+
 					prescribing_number_total = count
-					fmt.Println("7777777777777777", prescribing_number_total)
+
 				}
 
 				fmt.Println("数量一", prescribing_number_total)
@@ -1932,26 +1910,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					return
 				}
 			}
-			//	//查询该药品是否有库存
-			//	list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
-			//	prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-			//	if list.Count == 0 {
-			//		c.ServeSuccessJSON(map[string]interface{}{
-			//			"msg":    "1",
-			//			"advice": advice,
-			//		})
-			//		return
-			//	}
-			//	if count > list.Count {
-			//		c.ServeSuccessJSON(map[string]interface{}{
-			//			"msg":    "2",
-			//			"advice": advice,
-			//		})
-			//		return
-			//	}
-			//	service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-			//}
+
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":    "1",
@@ -2508,36 +2467,71 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		theEndtTIme = theTime.Unix()
 	}
 
-	advices, total, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
-	advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+	hisconfig, _ := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
 
-	if len(advices) > 0 {
-		for _, item := range advices {
-			if item.AdviceDoctor > 0 {
-				operatorIDs = append(operatorIDs, item.AdviceDoctor)
-			}
-			if item.ExecutionStaff > 0 {
-				operatorIDs = append(operatorIDs, item.ExecutionStaff)
-			}
-			if item.Checker > 0 {
-				operatorIDs = append(operatorIDs, item.Checker)
+	if hisconfig.IsOpen == 1 {
+		advices, total, _ := service.GetDoctorAdviceListThree(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
+		advicestwo, _, _ := service.GetDoctorAdviceListFour(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+
+		if len(advices) > 0 {
+			for _, item := range advices {
+				if item.AdviceDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.AdviceDoctor)
+				}
+				if item.ExecutionStaff > 0 {
+					operatorIDs = append(operatorIDs, item.ExecutionStaff)
+				}
+				if item.Checker > 0 {
+					operatorIDs = append(operatorIDs, item.Checker)
+				}
+				if item.StopDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.StopDoctor)
+				}
 			}
-			if item.StopDoctor > 0 {
-				operatorIDs = append(operatorIDs, item.StopDoctor)
+		}
+
+		//相关操作对应的操作人
+		operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"advices":   advices,
+			"operators": operators,
+			"total":     total,
+			"advicetwo": advicestwo,
+		})
+		return
+	} else {
+		advices, total, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
+		advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+
+		if len(advices) > 0 {
+			for _, item := range advices {
+				if item.AdviceDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.AdviceDoctor)
+				}
+				if item.ExecutionStaff > 0 {
+					operatorIDs = append(operatorIDs, item.ExecutionStaff)
+				}
+				if item.Checker > 0 {
+					operatorIDs = append(operatorIDs, item.Checker)
+				}
+				if item.StopDoctor > 0 {
+					operatorIDs = append(operatorIDs, item.StopDoctor)
+				}
 			}
 		}
-	}
 
-	//相关操作对应的操作人
-	operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
+		//相关操作对应的操作人
+		operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"advices":   advices,
-		"operators": operators,
-		"total":     total,
-		"advicetwo": advicestwo,
-	})
-	return
+		c.ServeSuccessJSON(map[string]interface{}{
+			"advices":   advices,
+			"operators": operators,
+			"total":     total,
+			"advicetwo": advicestwo,
+		})
+		return
+	}
 
 }
 

controllers/public_api_controller.go

@@ -69,7 +69,7 @@ func PublicApiRegistRouters() {
 
 	beego.Router("/handle10215", &PublicApiController{}, "get:Handle10215")
 
-	//beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
+	beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
 
 }
 
@@ -1700,35 +1700,34 @@ func (c *PublicApiController) HandleHIS() {
 
 }
 
-//func (c *PublicApiController)HandleOrder(){
-//	//orders, _ := service.GetAllHisOrder()
-//
-//
-//	order, _ := service.GetLastHisOrder()
-//
-//	fpNumber, _ := strconv.Atoi(order.FaPiaoNumber)
-//
-//
-//	//fmt.Println(fpNumber)
-//
-//	//for index, item := range orders {
-//	//	item.FaPiaoCode ="144072080589"
-//	//	var zero string
-//	//	if 1520 + int64(index) >= 1000{
-//	//		zero = "0000" + strconv.FormatInt(1520 + int64(index),10)
-//	//	}else if 1520 + int64(index) >= 10000{
-//	//		zero = "000" + strconv.FormatInt(1520 + int64(index),10)
-//	//	} else if 1520 + int64(index) >= 100000{
-//	//		zero = "00" +strconv.FormatInt(1520 + int64(index),10)
-//	//	} else if 1520 + int64(index) >= 1000000{
-//	//		zero = "0" +strconv.FormatInt(1520 + int64(index),10)
-//	//	}else {
-//	//		zero = strconv.FormatInt(1520 + int64(index),10)
-//	//	}
-//	//	item.FaPiaoNumber = zero
-//	//	service.SaveOrder(item)
-//	//}
-//}
+func (c *PublicApiController) HandleOrder() {
+	orders, _ := service.GetAllHisOrder(10138)
+	record, _ := service.FindFapiaoByIsUse(10138)
+	last_order, _ := service.GetAllHisOrderTwo(10138)
+	if record.ID > 0 {
+		for index, item := range orders {
+			item.FaPiaoCode = record.FapiaoCode
+			var zero string
+			max_number, _ := strconv.ParseInt(last_order.FaPiaoNumber, 10, 64)
+			number, _ := strconv.ParseInt(record.FapiaoNumber, 10, 64)
+			number = number + max_number
+			if number+int64(index) >= 1000 {
+				zero = "0000" + strconv.FormatInt(number+int64(index), 10)
+			} else if number+int64(index) >= 10000 {
+				zero = "000" + strconv.FormatInt(number+int64(index), 10)
+			} else if number+int64(index) >= 100000 {
+				zero = "00" + strconv.FormatInt(number+int64(index), 10)
+			} else if number+int64(index) >= 1000000 {
+				zero = "0" + strconv.FormatInt(number+int64(index), 10)
+			} else {
+				zero = strconv.FormatInt(number+int64(index), 10)
+			}
+			item.FaPiaoNumber = zero
+			item.FaPiaoBatchnumberId = record.ID
+			service.SaveOrder(item)
+		}
+	}
+}
 
 func Mkdir(dir string) {
 	// 创建文件夹
@@ -1896,7 +1895,7 @@ func (c *PublicApiController) Handle10215() {
 							Mtime:              time.Now().Unix(),
 							PatientId:          ssubItem.PatientId,
 							RecordDate:         ssubItem.AdviceDate,
-							Count:              1,
+							Count:              "1",
 							FeedetlSn:          "",
 							MedListCodg:        "",
 							SingleDose:         "1",

controllers/self_drug_api_congtroller.go

@@ -83,6 +83,8 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/saveinentorylist", &SelfDrugApiController{}, "Post:SaveInventoryList")
 
 	beego.Router("/api/drug/getdamagebydrugid", &SelfDrugApiController{}, "Get:GetDamageByDrugId")
+
+	beego.Router("/api/drug/getinventorymodelist", &SelfDrugApiController{}, "Get:GetInventoryModeList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -1453,6 +1455,7 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
+
 	list, total, err := service.GetDrugDamageList(startTime, endTime, orgId, keyword, limit, page)
 
 	damagelist, _ := service.GetDrugDamageByOrgId(orgId)
@@ -2403,7 +2406,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 	fmt.Println(err)
 
 	tableData, _ := dataBody["tableData"].([]interface{})
-	fmt.Println("999939433443", tableData)
+
 	if len(tableData) > 0 {
 		for _, item := range tableData {
 			items := item.(map[string]interface{})
@@ -2488,6 +2491,9 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				consumable_type = 10
 				consumable_count = new_total - ord_total
 			}
+			fmt.Println("ord_total", ord_total)
+			fmt.Println("new_total23323232323223", new_total)
+			fmt.Println("consumable_count", consumable_count)
 
 			//改变库存
 			info := models.DrugWarehouseInfo{
@@ -2570,12 +2576,12 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				CancelOutDetailId:       0,
 				ExpireDate:              expiry_date,
 				ProductDate:             0,
-				MaxUnit:                 max_unit,
+				MaxUnit:                 min_unit,
 				MinUnit:                 min_unit,
 			}
-
-			service.CreateDrugFlowOne(flow)
-
+			if ord_total != new_total {
+				service.CreateDrugFlowOne(flow)
+			}
 			if err != nil {
 				this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 				return
@@ -2603,3 +2609,20 @@ func (this *SelfDrugApiController) GetDamageByDrugId() {
 		"list": list,
 	})
 }
+
+func (this *SelfDrugApiController) GetInventoryModeList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetInventoryModeList(orgId)
+	manufacturerList, err := service.GetAllManufacturerList(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -128,7 +128,10 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/getgoodwarehouselist", &StockManagerApiController{}, "Get:GetGoodWarehouseList")
 	beego.Router("/api/stock/proofinventory", &StockManagerApiController{}, "Get:ProofInventory")
 	beego.Router("/api/stock/getwarehousetotal", &StockManagerApiController{}, "Get:GetWarehouseTotal")
-
+	beego.Router("/api/stock/getgoodinventorywarehouselist", &StockManagerApiController{}, "Get:GetGoodInventoryWarehouseList")
+	beego.Router("/api/stock/savestockinentorylist", &StockManagerApiController{}, "Post:SaveStockInventoryList")
+	beego.Router("/api/sotck/getdamagedetailbygoodid", &StockManagerApiController{}, "Get:GetDamageDetailByGoodId")
+	beego.Router("/api/stock/getinventoryexportlist", &StockManagerApiController{}, "Get:GetInventoryExportList")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -573,32 +576,8 @@ func (c *StockManagerApiController) EditWarehouse() {
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
-					flow := &models.VmStockFlow{
-						WarehousingOrder:    warehousing.WarehousingOrder,
-						WarehousingId:       warehousing.ID,
-						GoodId:              good_id,
-						Number:              number,
-						ProductDate:         productDates,
-						ExpireDate:          expiryDates,
-						Count:               warehousing_count,
-						Price:               price,
-						Status:              1,
-						Ctime:               ctime,
-						UserOrgId:           adminUserInfo.CurrentOrgId,
-						Manufacturer:        manufacturer,
-						Dealer:              dealer,
-						LicenseNumber:       license_number,
-						IsEdit:              1,
-						Creator:             adminUserInfo.AdminUser.Id,
-						SystemTime:          ctime,
-						ConsumableType:      1,
-						WarehousingDetailId: warehouseInfo.ID,
-					}
-
-					stockFlow = append(stockFlow, flow)
-
 				} else {
-					fmt.Println("id23233232323232323232323223", id)
+
 					warehouseInfo := &models.WarehousingInfo{
 						ID:               id,
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -652,27 +631,116 @@ func (c *StockManagerApiController) EditWarehouse() {
 	var errs error
 	if len(warehousingInfo) > 0 {
 		errs = service.CreateWarehousingInfo(warehousingInfo)
-		service.CreateStockFlow(stockFlow)
+
+		for _, its := range warehousingInfo {
+			//查询
+			info, _ := service.GetLastGoodWarehouseInfo(its.GoodId)
+			flows := models.VmStockFlow{
+				WarehousingOrder:    info.WarehousingOrder,
+				WarehousingId:       info.ID,
+				GoodId:              info.GoodId,
+				Number:              info.Number,
+				ProductDate:         info.ProductDate,
+				ExpireDate:          info.ExpiryDate,
+				Count:               info.WarehousingCount,
+				Price:               info.Price,
+				Status:              1,
+				Ctime:               ctime,
+				UserOrgId:           adminUserInfo.CurrentOrgId,
+				Manufacturer:        info.Manufacturer,
+				Dealer:              info.Dealer,
+				LicenseNumber:       info.LicenseNumber,
+				IsEdit:              1,
+				Creator:             adminUserInfo.AdminUser.Id,
+				SystemTime:          ctime,
+				ConsumableType:      1,
+				WarehousingDetailId: info.ID,
+			}
+			_, errcodescode := service.GetGoodStockFlowInfo(info.ID, info.GoodId)
+
+			if errcodescode == gorm.ErrRecordNotFound {
+				service.CreateStockFlowOne(flows)
+			}
+
+			//改变库存
+			good, _ := service.GetLastInfoMationById(info.GoodId)
+			warhouseCount := strconv.FormatInt(info.WarehousingCount, 10)
+			total, _ := strconv.ParseFloat(warhouseCount, 64)
+			goodInfo := models.GoodInfo{
+				Total: good.Total + total,
+			}
+			errcodescode = service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+			fmt.Println(errcodescode)
+		}
 	}
 
 	if len(upDateWarehousingInfo) > 0 {
 
 		for _, item := range upDateWarehousingInfo {
-
 			var total int64
-			var all_total int64
 			//获取该批次该型号的库存
 			info, _ := service.GetLastWarehousingByIdOne(item.ID, item.GoodId)
-			fmt.Println("oooooooooo", info.WarehousingCount)
-			//判断 该批次的入库数量
-			total = item.WarehousingCount - info.WarehousingCount
-			fmt.Println("total232323322332232332", total)
-			all_total = info.StockCount + total
 
-			item.StockCount = all_total
-			fmt.Println("hhhhhhhhhhhhh", item.StockCount)
+			//增加库存
+			if item.WarehousingCount > info.WarehousingCount {
+
+				total = item.WarehousingCount - info.WarehousingCount
+				goodinfo := models.WarehousingInfo{
+					WarehousingCount: item.WarehousingCount,
+					StockCount:       info.StockCount + total,
+				}
+
+				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
+				flowStock := models.VmStockFlow{
+					Count: item.WarehousingCount,
+				}
+				service.UpdatedStockFlowByGoodId(item.WarehousingId, item.GoodId, flowStock)
+				//改变库存
+				good, _ := service.GetLastInfoMationById(info.GoodId)
+				warhouseCount := strconv.FormatInt(total, 10)
+				all_total, _ := strconv.ParseFloat(warhouseCount, 64)
+				goodInfo := models.GoodInfo{
+					Total: good.Total + all_total,
+				}
+				service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+
+			}
+
+			if item.WarehousingCount < info.WarehousingCount {
+
+				total = info.WarehousingCount - item.WarehousingCount
+				goodinfo := models.WarehousingInfo{
+					WarehousingCount: item.WarehousingCount,
+					StockCount:       info.StockCount - total,
+				}
+				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
+				//改变库存
+				good, _ := service.GetLastInfoMationById(info.GoodId)
+				warhouseCount := strconv.FormatInt(total, 10)
+				all_total, _ := strconv.ParseFloat(warhouseCount, 64)
+				goodInfo := models.GoodInfo{
+					Total: good.Total - all_total,
+				}
+				service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+
+			}
+
+			if item.WarehousingCount == info.WarehousingCount {
+				goodinfo := models.WarehousingInfo{
+					WarehousingCount: item.WarehousingCount,
+					StockCount:       info.StockCount,
+					Price:            item.Price,
+					Manufacturer:     item.Manufacturer,
+					Number:           item.Number,
+					ProductDate:      item.ProductDate,
+					ExpiryDate:       item.ExpiryDate,
+					LicenseNumber:    item.LicenseNumber,
+					Dealer:           item.Dealer,
+					Remark:           item.Remark,
+				}
+				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
+			}
 
-			errs = service.UpDateWarehousingInfo(item)
 		}
 	}
 
@@ -1190,7 +1258,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 				var productDate int64
 				if len(product_date) > 0 {
-					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -1241,14 +1309,13 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 
 	//出库逻辑
 	for _, item := range warehousingOutInfo {
-		//查询库存
-		//warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
-		//查询该批次的库存
 
-		warehouseOne, _ := service.FindWarehousingInfoByIdSeven(item.WarehouseInfotId)
-		fmt.Println("数据232323232323232323323232", warehouseOne)
-		fmt.Println("库存查询23322332233232233232322323232323", warehouseOne.StockCount)
+		// 查询该耗材是否有库存
+		warehouseOne, _ := service.FindWarehousingInfoTen(item.GoodId)
+		fmt.Println("hhh2333223223", item.GoodId, item.Count, warehouseOne.StockCount)
+		// 如果出库数量大于该批次剩余库存数量
 		if item.Count > warehouseOne.StockCount {
+
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":                "1",
@@ -1257,31 +1324,30 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			})
 			return
 
-		} else {
-
-			_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
-			if errcodes == gorm.ErrRecordNotFound {
-				service.AddSigleWarehouseOut(&warehouseOut)
-			}
-			parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count, creater)
-			if parseDateErr != nil {
-				utils.ErrorLog(parseDateErr.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-				return
-			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":                "2",
-				"good_name":          "",
-				"specification_name": "",
-			})
 		}
-
 	}
 
-	//errs := service.CreateWarehousingOutInfo(warehousingOutInfo)
-	//info, _ := service.FindLastWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
+	for _, it := range warehousingOutInfo {
+		//查询是否生成出库单
+		_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
+		if errcodes == gorm.ErrRecordNotFound {
+			service.AddSigleWarehouseOut(&warehouseOut)
+		}
+		//出库逻辑
+		parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), it, &warehouseOut, it.Count, creater)
+		if parseDateErr != nil {
+			utils.ErrorLog(parseDateErr.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+			return
+		}
 
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":                "2",
+			"good_name":          "",
+			"specification_name": "",
+		})
+		return
+	}
 }
 func (c *StockManagerApiController) GetWarehouseOutList() {
 	page, _ := c.GetInt64("page", -1)
@@ -1395,7 +1461,6 @@ func (c *StockManagerApiController) GetWarehouseOutInfoList() {
 }
 func (c *StockManagerApiController) EditWarehouseOut() {
 	warehouse_out_time := c.GetString("warehouse_out_time")
-
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
 
@@ -1509,7 +1574,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				var productDate int64
 				if len(product_date) > 0 {
-					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
 					if err != nil {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -1591,18 +1656,50 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 		}
 	}
 	var errs error
+	//新增出库
 	if len(warehousingOutInfo) > 0 {
 
-		errs = service.CreateWarehousingOutInfo(warehousingOutInfo)
+		warehousingOutDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehouse_out_time)
+		if parseDateErr != nil {
+			c.ErrorLog("日期(%v)解析错误：%v", warehousingOutDate, parseDateErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		creater := adminUserInfo.AdminUser.Id
+
+		for _, item := range warehousingOutInfo {
+			// 查询该耗材是否有库存
+			warehouseOne, _ := service.FindWarehousingInfoTen(item.GoodId)
+			// 如果出库数量大于该批次剩余库存数量
+			if item.Count > warehouseOne.StockCount {
+				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":                "7",
+					"good_name":          goodObj.GoodName,
+					"specification_name": goodObj.SpecificationName,
+				})
+				return
+
+			} else {
+
+				warehouseOut, _ := service.GetWarehouseById(id)
+
+				//出库逻辑
+				parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count, creater)
+				if parseDateErr != nil {
+					utils.ErrorLog(parseDateErr.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+					return
+				}
+			}
+		}
 	}
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-
+			fmt.Println("item2332323232323", item.ProductDate, item.ExpiryDate)
 			//1.查询该耗材该批次的最后一次出库记录
-			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, adminUserInfo.CurrentOrgId)
-			fmt.Println("lastGood", lastGood.Count)
-			fmt.Println("item2323232", item.Count)
+			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId)
 
 			// 退库的库存和该耗材该批次最后一次出库数量进行比较
 			//如果退库数量大于 最后一次批次的数量(要么要进行出库)
@@ -1611,7 +1708,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				//查询该耗材是否还有库存
 				warehouseinfo, _ := service.GetTotalCountByGoodId(item.GoodId)
-				fmt.Println("hhhhhh23h2323232", warehouseinfo.StockCount)
+
 				//无库存
 				if warehouseinfo.StockCount <= 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -1627,10 +1724,10 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					var total_count int64
 					//计算和最后一次出库数据的差
 					total = item.Count - lastGood.Count
-					fmt.Println("total22323232", total)
+
 					//获取该耗材该批次的剩余库存量
 					info, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
-					fmt.Println("info2232323232323", info)
+
 					//判断该批次的剩余库存 和出库的库存进行比较
 					//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
 
@@ -1640,12 +1737,20 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						//清空本批次次库存
 						service.DeleteWarehouseInfo(item.WarehouseInfotId)
 						//调用出库逻辑
-						service.ConsumablesDeliveryTwo(item.OrgId, item, total_count)
+						parseDateErr := service.ConsumablesDeliveryTwo(item.OrgId, item, total_count)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+							return
+						}
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg": "1",
+						})
 					}
 					//如果出库的库存小于或等于于该批次的剩余库存,那么需要该批次出库
 					if item.Count <= info.StockCount {
 						stock_cout = lastGood.Count + total
-						fmt.Println("232323223232323232323232", stock_cout)
+						fmt.Println(stock_cout)
 						//扣减库存
 						warehouse := models.WarehousingInfo{
 							StockCount: info.StockCount - total,
@@ -1688,8 +1793,13 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg": "1",
 							})
+							return
 						} else if errcode == nil {
 							service.UpDateWarehouseOutInfo(item)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg": "1",
+							})
+							return
 						}
 
 					}
@@ -1701,31 +1811,30 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 			var stock_total int64
 			//如果退库数量小于最后一次批次的数量(要么要进行退库)
 			if item.Count < lastGood.Count {
-				fmt.Println("hh232323h2h3hh23hh23hh2h3h23")
+
 				//退库数量和最后一次出库数据进行计算
 				last_count = lastGood.Count - item.Count
-				fmt.Println("last_count", last_count)
+
 				//获取该耗材该批次的剩余库存量
 				infoInfo, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
 
 				//退库数量和最后一次出库数据进行计算的差 加上 剩余库存的数量与 该批次的入库数量进行比较
 				all_total = last_count + infoInfo.StockCount
-				fmt.Println("all_total", all_total)
+
 				//如果库存大于总数量，则退回到这个批次
-				fmt.Println("inf232323", infoInfo.WarehousingCount)
 
 				if infoInfo.WarehousingCount > all_total {
 					stock_total = last_count + infoInfo.StockCount
-					fmt.Println("经历323232323232232", last_count, stock_total)
+
 					//退回该批次,计算数量
 					warehousingInfoOne := models.WarehousingInfo{
 						StockCount: stock_total,
 						ID:         item.WarehouseInfotId,
 						OrgId:      item.OrgId,
 					}
-					fmt.Println("********************", warehousingInfoOne, item.WarehouseInfotId)
+
 					parseDateErr := service.UpdateWarehousingInfo(warehousingInfoOne, item.WarehouseInfotId)
-					fmt.Println("parseDateErr2323232322323", parseDateErr)
+					fmt.Println("parseDateErr", parseDateErr)
 					//插入一条新纪录
 					warehouseOutInfoThree := &models.WarehouseOutInfo{
 						WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
@@ -1761,8 +1870,10 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg": "1",
 						})
+						return
 					} else if errcode == nil {
 						service.UpDateWarehouseOutInfo(item)
+						return
 					}
 				}
 
@@ -1776,6 +1887,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 			}
 
 			if item.Count == lastGood.Count {
+
 				errs = service.UpDateWarehouseOutInfo(item)
 				if errs != nil {
 					utils.ErrorLog(errs.Error())
@@ -1785,6 +1897,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "1",
 				})
+				return
 			}
 
 		}
@@ -1981,7 +2094,9 @@ func (c *StockManagerApiController) CreateCancelStock() {
 	for _, item := range cancelStockInfos {
 
 		//统计该批次耗材的出库数量
-		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+		//info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+
+		info, _ := service.GetWarehoureOrderStockOutFlow(item.GoodId, item.OrgId, item.WarehouseInfoId)
 		fmt.Println("2333223323322332233223322323", item.Count, info.Count)
 		if item.Count > info.Count {
 			service.UpdateCancelInfo(item.CancelStockId)
@@ -2007,10 +2122,11 @@ func (c *StockManagerApiController) CreateCancelStock() {
 				service.AddSigleCancelStock(&cancelStock)
 			}
 			listcancel, _ := service.GetLastCancelStockById(adminUserInfo.CurrentOrgId)
-			for _, it := range cancelStockInfos {
-				it.CancelStockId = listcancel.ID
-			}
-			errs := service.CreateCancelStockInfo(cancelStockInfos)
+
+			fmt.Println("2332323232323232323", cancelStockInfos)
+			item.CancelStockId = listcancel.ID
+			errs := service.CreateCancelStockInfoOne(item)
+
 			if len(stockFLow) > 0 {
 				service.CreateStockFlow(stockFLow)
 			}
@@ -2030,7 +2146,11 @@ func (c *StockManagerApiController) CreateCancelStock() {
 			}
 			//更改入库数量
 			errs = service.UpdateWareInfoById(item.WarehouseInfoId, item.Count)
-			break
+			if err != nil {
+				utils.ErrorLog(err.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
 		}
 	}
 
@@ -2378,7 +2498,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 
 		for _, item := range cancelStockInfos {
 			//统计该耗材的出库数量
-			info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId, item.WarehouseInfoId)
+			info, _ := service.GetWarehoureOrderStockOutFlow(item.GoodId, item.OrgId, item.WarehouseInfoId)
 			if item.Count > info.Count {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"msg": "2",
@@ -4356,7 +4476,6 @@ func (this *StockManagerApiController) GetAllStockList() {
 	orgId := adminUserInfo.CurrentOrgId
 
 	list, total, _ := service.GetAllGoodInfoStockList(page, limit, startTime, endTime, types, keywords, orgId)
-	fmt.Println("耗材总计23323232232323232323", total)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
@@ -4493,13 +4612,9 @@ func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
 	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
-	//获取该耗材的最后一条数据
-	info, _ := service.GetLastWarehouseOutInfo(idsArray, orgId)
-	fmt.Println("info323e2342342342432342342432", info)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"order": order,
 		"list":  list,
-		"info":  info,
+		"order": order,
 	})
 }
 
@@ -5236,13 +5351,17 @@ func (this *StockManagerApiController) GetReportStockList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	keyword := this.GetString("keyword")
 	fmt.Println("startTime", startTime, "endTime", endTime)
-	list, total, _ := service.GetReportStockList(startTime, endTime, orgId, keyword, page, limit)
+	//list, total, _ := service.GetReportStockList(startTime, endTime, orgId, keyword, page, limit)
+
+	list, total, _ := service.GetStockDamagedList(orgId, keyword, page, limit, startTime, endTime)
+	damageList, _ := service.GetStockDamagedCount(orgId)
 	doctorlist, _ := service.GetAllDoctorThree(orgId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":       list,
 		"total":      total,
 		"doctorlist": doctorlist,
+		"damageList": damageList,
 	})
 }
 
@@ -6146,3 +6265,257 @@ func (this *StockManagerApiController) GetWarehouseTotal() {
 		"list": list,
 	})
 }
+
+func (this *StockManagerApiController) GetGoodInventoryWarehouseList() {
+
+	id, _ := this.GetInt64("id")
+	list, _ := service.GetGoodInventoryWarehouseList(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	fmt.Println(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *StockManagerApiController) SaveStockInventoryList() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+
+	tableData, _ := dataBody["tableData"].([]interface{})
+
+	if len(tableData) > 0 {
+		for _, item := range tableData {
+			items := item.(map[string]interface{})
+			good_name := items["good_name"].(string)
+			if items["good_name"] == nil || reflect.TypeOf(items["good_name"]).String() != "string" {
+				utils.ErrorLog("good_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			specification_name := items["specification_name"].(string)
+			if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+				utils.ErrorLog("specification_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			warehousing_unit := items["warehousing_unit"].(string)
+			if items["warehousing_unit"] == nil || reflect.TypeOf(items["warehousing_unit"]).String() != "string" {
+				utils.ErrorLog("warehousing_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			stock_count := int64(items["stock_count"].(float64))
+			if items["stock_count"] == nil || reflect.TypeOf(items["stock_count"]).String() != "float64" {
+				utils.ErrorLog("stock_count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			price := items["price"].(float64)
+			if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "float64" {
+				utils.ErrorLog("price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			manufacturer_name := items["manufacturer_name"].(string)
+			if items["manufacturer_name"] == nil || reflect.TypeOf(items["manufacturer_name"]).String() != "string" {
+				utils.ErrorLog("manufacturer_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			good_id := int64(items["good_id"].(float64))
+			if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
+				utils.ErrorLog("good_id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			manufacturer := int64(items["manufacturer"].(float64))
+			if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "float64" {
+				utils.ErrorLog("manufacturer")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			warehousing_order := items["warehousing_order"].(string)
+			if items["warehousing_order"] == nil || reflect.TypeOf(items["warehousing_order"]).String() != "string" {
+				utils.ErrorLog("warehousing_order")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			number := items["number"].(string)
+			if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				utils.ErrorLog("number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			id := int64(items["id"].(float64))
+			if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+				utils.ErrorLog("id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "float64" {
+				utils.ErrorLog("expiry_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			expiry_date := int64(items["expiry_date"].(float64))
+
+			if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "float64" {
+				utils.ErrorLog("product_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			product_date := int64(items["product_date"].(float64))
+
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+			adminId := this.GetAdminUserInfo().AdminUser.Id
+
+			stock_type := int64(items["type"].(float64))
+			if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+				utils.ErrorLog("type")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			last_stock_count := int64(items["last_stock_count"].(float64))
+			if items["last_stock_count"] == nil || reflect.TypeOf(items["last_stock_count"]).String() != "float64" {
+				utils.ErrorLog("last_stock_count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			var total_count int64
+			var inventory_type int64
+			fmt.Println("盘点前", stock_count)
+			fmt.Println("盘点后", last_stock_count)
+			if stock_count > last_stock_count {
+				total_count = stock_count - last_stock_count
+				inventory_type = 11
+			}
+			if stock_count < last_stock_count {
+				total_count = last_stock_count - stock_count
+				inventory_type = 10
+			}
+
+			creater := this.GetAdminUserInfo().AdminUser.Id
+			inventory := models.XtStockInventory{
+				GoodName:          good_name,
+				SpecificationName: specification_name,
+				WarehousingUnit:   warehousing_unit,
+				Count:             total_count,
+				BuyPrice:          price,
+				PackingPrice:      price,
+				NewPrice:          0,
+				Manufacturer:      manufacturer_name,
+				Dealer:            "",
+				Remark:            "",
+				GoodId:            good_id,
+				UserOrgId:         orgId,
+				Ctime:             time.Now().Unix(),
+				Mtime:             0,
+				Status:            1,
+				WarehousingOrder:  warehousing_order,
+				LicenseNumber:     number,
+				StartTime:         time.Now().Unix(),
+				Creater:           adminId,
+				Checker:           0,
+				CheckerStatus:     0,
+				CheckerTime:       0,
+				Total:             0,
+				Number:            number,
+				WarehousingInfoId: id,
+				ExpireDate:        expiry_date,
+				ProductDate:       product_date,
+				GoodOriginPlace:   "",
+				Type:              10,
+				InventoryType:     stock_type,
+				LastStockCount:    last_stock_count,
+				StockCount:        stock_count,
+			}
+			service.CreateInentory(inventory)
+
+			stockFlow := models.VmStockFlow{
+				WarehousingId:           0,
+				GoodId:                  good_id,
+				Number:                  number,
+				LicenseNumber:           "",
+				Count:                   total_count,
+				UserOrgId:               orgId,
+				PatientId:               0,
+				SystemTime:              0,
+				ConsumableType:          inventory_type,
+				IsSys:                   0,
+				WarehousingOrder:        "",
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: warehousing_order,
+				IsEdit:                  0,
+				CancelStockId:           0,
+				CancelOrderNumber:       "",
+				Manufacturer:            manufacturer,
+				Dealer:                  0,
+				Creator:                 creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ProductDate:             product_date,
+				ExpireDate:              expiry_date,
+				ReturnCount:             0,
+			}
+
+			info := models.WarehousingInfo{
+				StockCount: last_stock_count,
+			}
+			//更改库存
+			service.UpdatedWarehousingInfo(info, id)
+			if stock_count != last_stock_count {
+				service.CreateStockFlowOne(stockFlow)
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"inventory": inventory,
+			})
+		}
+	}
+}
+
+func (this *StockManagerApiController) GetDamageDetailByGoodId() {
+
+	good_id, _ := this.GetInt64("good_id")
+	warehousing_order := this.GetString("warehousing_order")
+	inventory_type, _ := this.GetInt64("type")
+	fmt.Println("inventory_type23232323223322332", inventory_type)
+	list, _ := service.GetDamageDetailByGoodId(good_id, warehousing_order, inventory_type)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	damageList, _ := service.GetStockDamagedCountOne(orgId, warehousing_order, inventory_type)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":       list,
+		"damageList": damageList,
+	})
+}
+
+func (this *StockManagerApiController) GetInventoryExportList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetInventoryExportList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+	})
+}

models/common_models.go

@@ -294,6 +294,8 @@ type BloodDialysisPrescription struct {
 	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 }
 
 func (BloodDialysisPrescription) TableName() string {

models/device_models.go

@@ -140,15 +140,16 @@ func (DeviceGroup) TableName() string {
 }
 
 type DeviceNumber struct {
-	ID         int64  `gorm:"column:id" json:"id"`
-	OrgID      int64  `gorm:"column:org_id" json:"-"`
-	Number     string `gorm:"column:number" json:"number"`
-	GroupID    int64  `gorm:"column:group_id" json:"group_id"`
-	ZoneID     int64  `gorm:"column:zone_id" json:"zone_id"`
-	Status     int8   `json:"-"`
-	CreateTime int64  `gorm:"column:ctime" json:"-"`
-	ModifyTime int64  `gorm:"column:mtime" json:"-"`
-	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	ID         int64      `gorm:"column:id" json:"id"`
+	OrgID      int64      `gorm:"column:org_id" json:"-"`
+	Number     string     `gorm:"column:number" json:"number"`
+	GroupID    int64      `gorm:"column:group_id" json:"group_id"`
+	ZoneID     int64      `gorm:"column:zone_id" json:"zone_id"`
+	Status     int8       `json:"-"`
+	CreateTime int64      `gorm:"column:ctime" json:"-"`
+	ModifyTime int64      `gorm:"column:mtime" json:"-"`
+	Sort       int64      `gorm:"column:sort" json:"sort" form:"sort"`
+	DeviceZone DeviceZone `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneID;"`
 }
 
 func (DeviceNumber) TableName() string {
@@ -403,18 +404,19 @@ type Schedules struct {
 }
 
 type XtSchedule struct {
-	ID           int64 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ID              int64                   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId     int64                   `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId           int64                   `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId       int64                   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate    int64                   `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType    int64                   `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek    int64                   `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId          int64                   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status          int64                   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime     int64                   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime     int64                   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	LastAfterWeight AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 
 func (XtSchedule) TableName() string {
@@ -1065,3 +1067,56 @@ type VmXtSchedule struct {
 	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
 	Count        int64
 }
+
+type PatientDeviceNumber struct {
+	ID         int64           `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64           `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number     string          `gorm:"column:number" json:"number" form:"number"`
+	GroupId    int64           `gorm:"column:group_id" json:"group_id" form:"group_id"`
+	ZoneId     int64           `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+	Status     int64           `gorm:"column:status" json:"status" form:"status"`
+	Ctime      int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Sort       int64           `gorm:"column:sort" json:"sort" form:"sort"`
+	DeviceZone DeviceZone      `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneId;"`
+	Schedule   []*BlodSchedule `json:"schedule" gorm:"foreignkey:BedId;AssociationForeignKey:ID;"`
+}
+
+func (PatientDeviceNumber) TableName() string {
+
+	return "xt_device_number"
+}
+
+type PatientDialysisOrder struct {
+	ID                     int64  `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate           int64  `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	UserOrgId              int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId              int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PrescriptionId         int64  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Stage                  int64  `gorm:"column:stage" json:"stage" form:"stage"`
+	Remark                 string `gorm:"column:remark" json:"remark" form:"remark"`
+	BedId                  int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	StartNurse             int64  `gorm:"column:start_nurse" json:"start_nurse" form:"start_nurse"`
+	FinishNurse            int64  `gorm:"column:finish_nurse" json:"finish_nurse" form:"finish_nurse"`
+	Status                 int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime            int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime            int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	PunctureNurse          int64  `gorm:"column:puncture_nurse" json:"puncture_nurse" form:"puncture_nurse"`
+	Creator                int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	FinishCreator          int64  `gorm:"column:finish_creator" json:"finish_creator" form:"finish_creator"`
+	FinishModifier         int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
+	SchedualType           int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
+	StartTime              int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime                int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	WashpipeNurse          int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	ChangeNurse            int64  `gorm:"column:change_nurse" json:"change_nurse" form:"change_nurse"`
+	DifficultPunctureNurse int64  `gorm:"column:difficult_puncture_nurse" json:"difficult_puncture_nurse" form:"difficult_puncture_nurse"`
+	NewFistulaNurse        int64  `gorm:"column:new_fistula_nurse" json:"new_fistula_nurse" form:"new_fistula_nurse"`
+	ZoneId                 int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
+}
+
+func (PatientDialysisOrder) TableName() string {
+
+	return "xt_dialysis_order"
+}

models/dialysis.go

@@ -862,8 +862,8 @@ type XtDialysisOrders struct {
 	FinishCreator  int64  `gorm:"column:finish_creator" json:"finish_creator" form:"finish_creator"`
 	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
 	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
-	Number         int64  `gorm:"column:number" json:"number" form:"number"`
-	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Number         string `gorm:"column:number" json:"number" form:"number"`
+	UserName       string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 }
@@ -1093,3 +1093,59 @@ type BloodDoctorAdvice struct {
 	DeliveryWay string `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	Total       int64
 }
+
+type HisDoctorAdvice struct {
+	ID                    int64              `gorm:"column:id" json:"id" form:"id"`
+	GroupNo               int64              `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	UserOrgId             int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceType            int64              `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64              `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64              `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string             `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string             `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64              `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64            `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string             `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	DrugSpec              float64            `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string             `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescribingNumber     float64            `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string             `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string             `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string             `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64              `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64              `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64              `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64              `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string             `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string             `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64              `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string             `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64              `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64              `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64              `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64              `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64              `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64              `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64              `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64              `gorm:"column:record_date" json:"record_date"`
+	DialysisOrderId       int64              `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	CheckTime             int64              `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64              `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	AdviceId              int64              `gorm:"-"`
+	RemindType            int64              `gorm:"column:remind_type" json:"remind_type"`
+	FrequencyType         int64              `gorm:"column:frequency_type" json:"frequency_type"`
+	DayCount              int64              `gorm:"column:day_count" json:"day_count"`
+	WeekDay               string             `gorm:"column:week_day" json:"week_day"`
+	ChildDoctorAdvice     []*HisDoctorAdvice `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+	TemplateId            string             `gorm:"column:template_id" json:"template_id"`
+	Modifier              int64              `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsCheck               int64              `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64              `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+}
+
+func (HisDoctorAdvice) TableName() string {
+	return "his_doctor_advice_info"
+}

models/drug.go

@@ -65,9 +65,10 @@ type BaseDrugLib struct {
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
-	DrugDay               string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugDay               string                 `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                 float64                `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DrugWarehouseInfo     []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
 }
 
 func (BaseDrugLib) TableName() string {

models/drug_stock.go

@@ -283,6 +283,7 @@ type VmDrugWarehouseInfo struct {
 	CountUnit      string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 	StockMinNumber int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
 	StockMaxNumber int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	MinNumber      int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
 }
 
 type StDrugWarehouseOutInfo struct {
@@ -324,6 +325,7 @@ type StDrugWarehouseOutInfo struct {
 	LastPrice               string  `json:"last_price"`
 	PackingUnit             string  `json:"packing_unit"`
 	Dosage                  int64   `json:"dosage"`
+	ExpireDate              int64   `json:"expire_date"`
 }
 
 type DrugFlow struct {

models/good_models.go

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

models/his_charge_models.go

@@ -203,3 +203,43 @@ type HisLabelPrintInfo struct {
 func (HisLabelPrintInfo) TableName() string {
 	return "his_label_print_info"
 }
+
+type HisLabelPrintInfo struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number      string `gorm:"column:number" json:"number" form:"number"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	DoctorId    int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	ProjectName string `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsPrint     int64  `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ItemId      int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PProjectId  int64  `gorm:"column:p_project_id" json:"p_project_id" form:"p_project_id"`
+
+	FeedetlSn   string `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	DoctorName  string `gorm:"column:doctor_name" json:"doctor_name" form:"doctor_name"`
+	PatientName string `gorm:"column:patient_name" json:"patient_name" form:"patient_name"`
+}
+
+func (HisLabelPrintInfo) TableName() string {
+	return "his_label_print_info"
+}
+
+type HisFapiaoRecord struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	FapiaoCode   string `gorm:"column:fapiao_code" json:"fapiao_code" form:"fapiao_code"`
+	FapiaoNumber string `gorm:"column:fapiao_number" json:"fapiao_number" form:"fapiao_number"`
+	IsUse        int64  `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+}
+
+func (HisFapiaoRecord) TableName() string {
+	return "his_fapiao_record"
+}

models/his_models.go

@@ -236,6 +236,7 @@ type HisDoctorAdviceInfo struct {
 	Way                   int64                  `gorm:"column:way" json:"way" form:"way"`
 	HospApprFlag          int64                  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	HisOrderInfo          HisOrderInfo           `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"order_info"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -779,6 +780,11 @@ type HisPrescriptionProject struct {
 	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
 	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
 	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	FrequencyType int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount      int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay       string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam   int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo  HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -967,6 +973,7 @@ type HisOrder struct {
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis               string                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId     int64                   `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
 }
 
 func (HisOrder) TableName() string {
@@ -1059,6 +1066,49 @@ func (HisOrderInfoTwo) TableName() string {
 	return "his_order_info"
 }
 
+type HisOrderInfoTwo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId     int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+
+	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+}
+
+func (HisOrderInfoTwo) TableName() string {
+	return "his_order_info"
+}
+
 type VMHisPatient struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
@@ -1429,7 +1479,7 @@ type HisPrescriptionProjectTemplate struct {
 	PatientId          int64        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count              int64        `gorm:"column:count" json:"count" form:"count"`
+	Count              string       `gorm:"column:count" json:"count" form:"count"`
 	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`

models/patient_models.go

@@ -1320,7 +1320,7 @@ type XtAssessmentBeforeDislysis struct {
 	DuctusArantii                  string  `gorm:"column:ductus_arantii" json:"ductus_arantii" form:"ductus_arantii"`
 	EmergencyTreatment             int64   `gorm:"column:emergency_treatment" json:"emergency_treatment" form:"emergency_treatment"`
 	EmergencyTreatmentOther        string  `gorm:"column:emergency_treatment_other" json:"emergency_treatment_other" form:"emergency_treatment_other"`
-	DialysisCount                  int64   `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
+	DialysisCount                  string  `gorm:"column:dialysis_count" json:"dialysis_count" form:"dialysis_count"`
 	AssessmentDoctor               int64   `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
 	AssessmentTime                 int64   `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
 	MachineType                    string  `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`

models/schedule_models.go

@@ -44,12 +44,12 @@ type Schedule struct {
 	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
 
-	Patient       string        `gorm:"-" json:"patient" form:"patient"`
-	DeviceZone    DeviceZone    `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
-	DeviceNumber  DeviceNumber  `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	TreatmentMode TreatmentMode `json:"mode" gorm:"foreignkey:ModeId"`
-	DialysisOrder DialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-
+	Patient                   string               `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone                DeviceZone           `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber              DeviceNumber         `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	TreatmentMode             TreatmentMode        `json:"mode" gorm:"foreignkey:ModeId"`
+	DialysisOrder             DialysisOrder        `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisPrescription      DialysisPrescription `json:"dialysis_prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
 	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
@@ -190,16 +190,101 @@ type VmSchedulesRemind struct {
 
 	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
 	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisOrder              DialysisOrder              `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisOrder              DialysisOrder              `json:"order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	XtPatients                 XtPatients                 `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
+}
+
+func (VmSchedulesRemind) TableName() string {
+	return "xt_schedule"
+}
+
+type WeekScheduleSix struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+
+	Patient                    string                     `gorm:"-" json:"patient" form:"patient"`
+	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
+	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
+	DialysisPrescription       DialysisSolution           `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
 }
 
-func (VmSchedulesRemind) TableName() string {
+func (WeekScheduleSix) TableName() string {
+	return "xt_schedule"
+}
+
+type BlodSchedule struct {
+	ID                        int64                     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                 int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId               int64                     `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                     int64                     `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId                 int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate              int64                     `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType              int64                     `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek              int64                     `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId                    int64                     `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                    int64                     `gorm:"column:status" json:"status" form:"status"`
+	VmBloodPatients           VmBloodPatients           `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
+	BloodDialysisOrder        BloodPatientDialysisOrder `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	BloodDialysisPrescription BloodDialysisPrescription `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:RecordDate,PatientId;"`
+}
+
+func (BlodSchedule) TableName() string {
 	return "xt_schedule"
 }
+
+type BloodPatientDialysisOrder struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Stage        int64 `gorm:"column:stage" json:"stage" form:"stage"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+}
+
+func (BloodPatientDialysisOrder) TableName() string {
+	return "xt_dialysis_order"
+}
+
+type BloodPatientDialysisPrescription struct {
+	ID                         int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId                  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MachineType                string `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
+	ModeId                     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisDialyszers         string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialyzerPerfusionApparatus string `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+}
+
+func (BloodPatientDialysisPrescription) TableName() string {
+	return "xt_dialysis_prescription"
+}
+
+type VmBloodPatients struct {
+	ID    int64  `gorm:"column:id" json:"id" form:"id"`
+	BedId int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	Name  string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (VmBloodPatients) TableName() string {
+	return "xt_patients"
+}

models/self_drug_models.go

@@ -670,6 +670,7 @@ type VmDrugWarehouseOutInfo struct {
 	MinPrice                float64 `json:"min_price"`
 	DrugName                string  `json:"drug_name"`
 	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 }
 
 type XtDrugAdjustPrice struct {
@@ -767,6 +768,49 @@ func (XtDrugDamage) TableName() string {
 	return "xt_drug_damage"
 }
 
+type VmXtDrugInventory struct {
+	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string     `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName  string     `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit    string     `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count              int64      `gorm:"column:count" json:"count" form:"count"`
+	LastPrice          float64    `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice        float64    `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice           float64    `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer       string     `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer             string     `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId             int64      `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime              int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64      `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder   string     `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber      string     `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime          int64      `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater            int64      `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker            int64      `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus      int64      `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime        int64      `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	ExpiryDate         int64      `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate        int64      `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Number             string     `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber        string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Total              string     `gorm:"column:total" json:"total" form:"total"`
+	DrugOriginPlace    string     `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	WarehouseInfoId    int64      `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	ProofCount         int64      `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
+	StockMaxNumber     int64      `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber     int64      `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	MinCount           int64      `gorm:"column:min_count" json:"min_count" form:"min_count"`
+	MinUnit            string     `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	LastStockMaxNumber int64      `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber int64      `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64      `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	Type               int64      `gorm:"column:type" json:"type" form:"type"`
+	XtBaseDrug         XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+}
+
 type XtDrugInventory struct {
 	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
 	DrugName           string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
@@ -892,3 +936,21 @@ type SgjDrugWarehouseOutInfo struct {
 func (SgjDrugWarehouseOutInfo) TableName() string {
 	return "xt_drug_warehouse_out_info"
 }
+
+type PatientDrugWarehouseInfo struct {
+	DrugId         int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number         string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate    int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate     int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	StockMaxNumber int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	BatchNumber    string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DrugName       string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit        string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit        string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MinNumber      int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose           float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit       string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	Manufacturer   int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer         int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+}

models/stock_models.go

@@ -317,6 +317,7 @@ type WarehousingGoodInfo struct {
 	Dealers           Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	BuyPrice          float64      `gorm:"column:buy_price" json:"buy_price"`
 	Total             float64      `gorm:"column:total" json:"total" form:"total"`
+	RegisterNumber    string       `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (WarehousingGoodInfo) TableName() string {
@@ -550,29 +551,30 @@ func (VmStockFlow) TableName() string {
 }
 
 type CancelStockInfo struct {
-	ID              int64       `gorm:"column:id" json:"id"`
-	GoodId          int64       `gorm:"column:good_id" json:"good_id"`
-	CancelStockId   int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
-	GoodTypeId      int64       `gorm:"column:good_type_id" json:"good_type_id"`
-	Count           int64       `gorm:"column:count" json:"count"`
-	Price           float64     `gorm:"column:price" json:"price"`
-	Total           float64     `gorm:"column:total" json:"total"`
-	ProductDate     int64       `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate      int64       `gorm:"column:expiry_date" json:"expiry_date"`
-	Ctime           int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime           int64       `gorm:"column:mtime" json:"mtime"`
-	Status          int64       `gorm:"column:status" json:"status"`
-	OrgId           int64       `gorm:"column:org_id" json:"org_id"`
-	OrderNumber     string      `gorm:"column:order_number" json:"order_number"`
-	Type            int64       `gorm:"column:type" json:"type"`
-	CancelStock     CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
-	Dealer          string      `gorm:"column:dealer" json:"dealer"`
-	Manufacturer    string      `gorm:"column:manufacturer" json:"manufacturer"`
-	Number          string      `gorm:"column:number" json:"number" form:"number"`
-	RegisterAccount string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
-	Remark          string      `gorm:"column:remark" json:"remark" form:"remark"`
-	WarehouseInfoId int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	GoodInfo        GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	ID              int64              `gorm:"column:id" json:"id"`
+	GoodId          int64              `gorm:"column:good_id" json:"good_id"`
+	CancelStockId   int64              `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
+	GoodTypeId      int64              `gorm:"column:good_type_id" json:"good_type_id"`
+	Count           int64              `gorm:"column:count" json:"count"`
+	Price           float64            `gorm:"column:price" json:"price"`
+	Total           float64            `gorm:"column:total" json:"total"`
+	ProductDate     int64              `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate      int64              `gorm:"column:expiry_date" json:"expiry_date"`
+	Ctime           int64              `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64              `gorm:"column:mtime" json:"mtime"`
+	Status          int64              `gorm:"column:status" json:"status"`
+	OrgId           int64              `gorm:"column:org_id" json:"org_id"`
+	OrderNumber     string             `gorm:"column:order_number" json:"order_number"`
+	Type            int64              `gorm:"column:type" json:"type"`
+	CancelStock     CancelStock        `ForeignKey:CancelStockId json:"CancelStock"`
+	Dealer          string             `gorm:"column:dealer" json:"dealer"`
+	Manufacturer    string             `gorm:"column:manufacturer" json:"manufacturer"`
+	Number          string             `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount string             `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark          string             `gorm:"column:remark" json:"remark" form:"remark"`
+	WarehouseInfoId int64              `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	GoodInfo        GoodInfo           `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	WarehousingInfo []*WarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"xt_warehouse_info"`
 }
 
 func (CancelStockInfo) TableName() string {
@@ -986,6 +988,10 @@ type XtStockInventory struct {
 	ExpireDate        int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
 	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
 	GoodOriginPlace   string  `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
+	Type              int64   `gorm:"column:type" json:"type" form:"type"`
+	InventoryType     int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	LastStockCount    int64   `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
+	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (XtStockInventory) TableName() string {
@@ -1022,6 +1028,10 @@ type VmStockInventory struct {
 	Number            string  `gorm:"column:number" json:"number" form:"number"`
 	ExpireDate        int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
 	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Type              int64   `gorm:"column:type" json:"type" form:"type"`
+	InventoryType     int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	LastStockCount    int64   `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
+	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 type XtStockCorrectRecord struct {
@@ -1105,6 +1115,37 @@ type SgjCancelStockInfo struct {
 	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 }
 
+type GoodSotckInfo struct {
+	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	GoodName          string  `gorm:"column:good_name" json:"good_name"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	Price             float64 `gorm:"column:price" json:"price" form:"price"`
+}
+
+func (GoodSotckInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
+type PatientWarehouseInfo struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Number            string `gorm:"column:number" json:"number" form:"number"`
+	ProductDate       int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingUnit   string `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Dealer            int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	GoodName          string `gorm:"column:good_name" json:"good_name"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
+}
+
+func (PatientWarehouseInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
 type PatientWarehouseInfo struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	GoodId            int64  `gorm:"column:good_id" json:"good_id" form:"good_id"`

models/stock_query_models.go

@@ -14,6 +14,7 @@ type StockInfo struct {
 	QueryWarehouseOutInfo []QueryWarehouseOutInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehouseout_info"`
 	QueryCancelStockInfo  []QueryCancelStockInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_cancel_stock_info"`
 	GoodsType             GoodsType               `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
+	RegisterNumber        string                  `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (StockInfo) TableName() string {

service/app_version.go

@@ -257,13 +257,18 @@ func UpDateHis2(his *models.HisPrescriptionProject) {
 	writeDb.Save(&his)
 }
 
-func GetAllHisOrder() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106 AND status = 1 AND order_status = 2 AND settle_accounts_date < 1623168000").Find(&his).Error
+func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code == '' AND fa_piao_number == '' ", org_id).Find(&his).Error
+	return
+}
+
+func GetAllHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND fa_piao_code <> '' AND fa_piao_number <> '' ", org_id).Last(&his).Error
 	return
 }
 
 func GetLastHisOrder() (his models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 4 AND status = 1 AND order_status = 2").Last(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106 AND status = 1 AND order_status = 2").Last(&his).Error
 	return
 }
 
@@ -378,7 +383,7 @@ type HisPrescriptionProjectTemplate struct {
 	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count              int64   `gorm:"column:count" json:"count" form:"count"`
+	Count              string  `gorm:"column:count" json:"count" form:"count"`
 	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	MedListCodg        string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 	SingleDose         string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
@@ -437,3 +442,7 @@ func UpdateStatus(project_id int64, p_id int64) {
 	writeDb.Model(&HisPrescriptionProjectTemplate{}).Where("id = ?", project_id).Updates(map[string]interface{}{"status": 0})
 	writeDb.Model(&HisPrescriptionInfoTemplateTwo{}).Where("id = ?", p_id).Updates(map[string]interface{}{"status": 0})
 }
+
+func SaveOrder(order *models.HisOrder) {
+	writeDb.Save(&order)
+}

service/dialysis_service.go

@@ -1330,7 +1330,7 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 
 func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 
-	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodinfo).Error
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1").Find(&goodinfo).Error
 	return goodinfo, err
 }
 
@@ -1370,6 +1370,17 @@ func ModifyExceDoctorAdviceById(m *models.HisDoctorAdviceInfo, ids []string) (er
 	return err
 }
 
+func ModifyHisPrescriptionProject(m *models.HisPrescriptionProject, ids []string) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisPrescriptionProject{}).Where("status = 1   AND id IN (?) AND execution_state = 1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+	return err
+}
+
 func FindHisProjectById(orgID int64, id int64) (advice models.HisPrescriptionProject, err error) {
 	err = readDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id=? and status=1 and id = ?", orgID, id).First(&advice).Error
 	return
@@ -1580,3 +1591,35 @@ func GetAllPcTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatment
 		}
 	}
 }
+
+func UpdateTeamProjectExceStatus(ids []int64, admin_user_id int64, execution_time int64) (err error) {
+	ut := writeDb.Begin()
+	db := ut.Model(&models.HisPrescriptionProject{})
+	err = db.Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_state": 1, "execution_staff": admin_user_id}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+
+	ut.Commit()
+	return err
+
+}
+
+func UpdateTeamProjectCheckStatus(ids []int64, patient_id int64, record_date int64, user_org_id int64, admin_user_id int64, check_time int64) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisPrescriptionProject{}).Where("status = 1   AND id IN (?) AND patient_id = ? AND user_org_id = ? AND record_date = ?", ids, patient_id, user_org_id, record_date).Updates(map[string]interface{}{"check_time": check_time, "check_state": 1, "checker": admin_user_id}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+
+	ut.Commit()
+	return err
+
+}
+
+func GetCheckTeamProject(team_id int64, patient_id int64, record_date int64, user_org_id int64) (ps []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Joins("JOIN xt_his_project as p On p.id = his_prescription_project.project_id AND p.cost_classify = 3").Where("his_prescription_project.team_id IN (?) AND his_prescription_project.patient_id = ? AND his_prescription_project.user_org_id = ? AND his_prescription_project.record_date = ? AND his_prescription_project.status = 1", team_id, patient_id, user_org_id, record_date).Find(&ps).Error
+	return
+}

service/doctor_schedule_service.go

@@ -598,6 +598,44 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	return schedule, err
 }
 
+func GetPatientScheduleByBed(schedule_date int64, zoneid int64, orgid int64, class_type int64) (list []*models.PatientDeviceNumber, err error) {
+
+	db := XTReadDB().Table("xt_device_number as x").Where("x.status = 1")
+	if zoneid > 0 {
+		db = db.Where("x.zone_id = ?", zoneid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if class_type > 0 {
+		err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("DeviceZone", "status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ? and schedule_type = ?", orgid, schedule_date, class_type).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date)
+		}).Find(&list).Error
+	} else {
+		err = db.Select("x.id,x.number,x.sort,x.group_id,x.zone_id,x.sort").Preload("DeviceZone", "status = 1").Preload("Schedule", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Model(&models.BlodSchedule{}).Where("status = 1 AND user_org_id = ? and schedule_date = ?", orgid, schedule_date).Preload("VmBloodPatients", "status = 1 and user_org_id = ?", orgid).Preload("BloodDialysisOrder", "status = 1 and dialysis_date = ?", schedule_date).Preload("BloodDialysisPrescription", "status = 1 and record_date = ?", schedule_date)
+		}).Find(&list).Error
+	}
+
+	return list, err
+}
+
+func GetPatientDialysisOrderDate(shcedule_date int64, class_type int64, orgid int64) (schedule []*models.Schedule, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if shcedule_date > 0 {
+		db = db.Where("x.schedule_date = ?", shcedule_date)
+	}
+	if class_type > 0 {
+		db = db.Where("x.schedule_type = ?", class_type)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id").Preload("DialysisOrder", "status = 1").Preload("DialysisPrescription", "status = 1").Find(&schedule).Error
+	return schedule, err
+}
+
 func DeleteSchedule(id int64) error {
 
 	schedule := models.XtSchedule{}
@@ -610,8 +648,9 @@ func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []
 
 	likeKey := "%" + keywords + "%"
 	db := XTReadDB().Table("xt_schedule as s")
-	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", "status= 1").
-		Preload("DialysisOrder", "status =1").
+	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Preload("DeviceZone", "status = 1")
+	}).Preload("DialysisOrder", "status =1").Preload("DialysisPrescription", "status =1").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id And(p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
 	return schedule, err
@@ -635,3 +674,64 @@ func UpdateStaffScheduleOne(nextid int64, schedule models.WeekSchedule) error {
 	err := XTWriteDB().Model(&schedule).Where("id = ?", nextid).Updates(map[string]interface{}{"patient_id": schedule.PatientId, "mode_id": schedule.ModeId}).Error
 	return err
 }
+
+func UpdatedScheduleMode(schedule models.XtSchedule, id int64) error {
+
+	xtSchedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&xtSchedule).Where("id = ? and status =1 ", id).Updates(map[string]interface{}{"mode_id": schedule.ModeId}).Error
+	return err
+}
+
+func UpdatedSchedule(schedule models.XtSchedule, patient_id int64, schedule_date int64, schedule_type int64, bed_id int64) error {
+
+	xtSchedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&xtSchedule).Where("patient_id = ? and status =1 and schedule_date = ?  and bed_id = ?", patient_id, schedule_date, bed_id).Updates(map[string]interface{}{"schedule_type": schedule.ScheduleType, "mode_id": schedule.ModeId}).Error
+	return err
+}
+
+func GetDialyisSolution(patientid int64, recorddate int64) (*models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+
+	err := XTReadDB().Where("patient_id = ? and record_date = ? and status = 1", patientid, recorddate).Find(&prescription).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		} else {
+			return nil, err
+		}
+	}
+	return &prescription, nil
+}
+
+func GetPatientScheduleIsExist(startime int64, schedule_type int64, bed_id int64) (*models.Schedule, error) {
+
+	schedule := models.Schedule{}
+	err := XTReadDB().Model(&schedule).Where("schedule_date = ? and schedule_type = ? and bed_id = ? and status = 1", startime, schedule_type, bed_id).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+}
+
+func CreateDialysisPrescription(prescription *models.DialysisPrescription) error {
+
+	err := XTReadDB().Create(&prescription).Error
+
+	return err
+}
+
+func CreateDialysisSolution(solution models.DialysisSolution) error {
+
+	err := XTReadDB().Create(&solution).Error
+	return err
+}
+
+func UpdateDialysisPrescriptionOne(prescription models.DialysisPrescription, patientid int64, recordate int64, mode_id int64) error {
+
+	err := XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and status = 1", patientid, recordate).Updates(map[string]interface{}{"dialysis_dialyszers": prescription.DialysisDialyszers, "mode_id": mode_id, "dialysis_irrigation": prescription.DialysisIrrigation}).Error
+	return err
+}

service/his_charge_service.go

@@ -3,13 +3,14 @@ package service
 import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
+	"time"
 )
 
 func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.ChargePatient, err error) {
 	if len(keyword) == 0 {
 		switch item_type {
 		case 0:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
@@ -22,12 +23,12 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 1:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -39,12 +40,12 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 2:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -54,12 +55,12 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 3:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -69,7 +70,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
@@ -80,7 +81,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 		keyword := "%" + keyword + "%"
 		switch item_type {
 		case 0:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -92,12 +93,12 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 1:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -109,12 +110,12 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 2:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -124,12 +125,12 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 3:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
 					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -139,7 +140,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
 						})
-					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
@@ -155,32 +156,32 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 	if len(keyword) == 0 {
 		switch item_type {
 		case 0:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 1:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 2:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 3:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 4:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
@@ -191,32 +192,32 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 		keyword = "%" + keyword + "%"
 		switch item_type {
 		case 0:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 1:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 2:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 3:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 4:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
@@ -226,3 +227,65 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 
 	return
 }
+
+func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisLabelPrintInfo{})
+	if is_print > 0 {
+		db = db.Where("is_print = ?", is_print)
+	}
+	if len(keywors) > 0 {
+		keywors = "%" + keywors + "%"
+		db = db.Where("patient_name Like ?", keywors)
+
+	}
+	err = db.Where("user_org_id = ? AND record_date = ? AND status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
+	return
+}
+
+func GetLabelPrintInfo(id int64) (labels models.HisLabelPrintInfo, err error) {
+	db := readDb.Model(&models.HisLabelPrintInfo{})
+	err = db.Where("id = ?", id).First(&labels).Error
+	return
+}
+
+func AddSigleFapiaoRecord(dealer *models.HisFapiaoRecord) (err error, record *models.HisFapiaoRecord) {
+	err = writeDb.Create(&dealer).Error
+	return err, dealer
+}
+
+func ModifyFapiao(mesick *models.HisFapiaoRecord) error {
+	err := writeDb.Save(&mesick).Error
+
+	return err
+}
+
+func UpdateFapiaoIsUse(org_id int64) {
+	writeDb.Model(&models.HisFapiaoRecord{}).Where("user_org_id = ?", org_id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "is_use": 0})
+
+}
+
+func FindAllFapiaoList(orgId int64, page int64, limit int64) (list []*models.HisFapiaoRecord, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisFapiaoRecord{})
+	db = db.Where("user_org_id = ? AND status = 1", orgId)
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	return
+}
+
+func DeleteFapiaoById(id int64) error {
+	err := writeDb.Model(&models.HisFapiaoRecord{}).Where("id = ? AND status = 1", id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
+	return err
+}
+
+func FindFapiaoById(id int64) (*models.HisFapiaoRecord, error) {
+	dealer := &models.HisFapiaoRecord{}
+	err := readDb.Model(&models.HisFapiaoRecord{}).Where("id = ? AND status = 1", id).First(&dealer).Error
+	return dealer, err
+}
+
+func FindFapiaoByIsUse(org_id int64) (models.HisFapiaoRecord, error) {
+	record := models.HisFapiaoRecord{}
+	err := readDb.Model(&models.HisFapiaoRecord{}).Where("user_org_id = ? AND status = 1 AND is_use = 1", org_id).First(&record).Error
+	return record, err
+}

service/his_hospital_service.go

@@ -131,10 +131,10 @@ func GetUnChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, his_
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id).
 		Find(&prescription).Error
@@ -147,10 +147,10 @@ func GetChargeHisHospitalPrescriptionFive(org_id int64, patient_id int64, his_pa
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2 ", org_id, record_date, patient_id).
 		Find(&prescription).Error

service/his_service.go

@@ -475,10 +475,10 @@ func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
 	}).
@@ -810,8 +810,14 @@ func CreateOrderInfo(order *models.HisOrderInfo) (err error) {
 	return
 }
 
-func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64, p_type int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).First(&info).Error
+func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64, p_type int64, his_patient_id int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ? AND his_patient_id = ? ", org_id, record_date, patient_id, p_type, his_patient_id).First(&info).Error
+	return
+
+}
+
+func FindPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date int64, p_type int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ?  ", org_id, record_date, patient_id).First(&info).Error
 	return
 
 }
@@ -2086,10 +2092,10 @@ func GetChargeHisPrescriptionSeven(org_id int64, patient_id int64, order_number
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", org_id)
 	}).

service/manage_service.go

@@ -799,25 +799,48 @@ func GetAllEquitName(orgid int64) (equiment []*models.DeviceEquimentname, err er
 
 func GetUserForm(id int64, orgId int64, limit int64, page int64) (infor []*models.DeviceInformations, total int64, err error) {
 
-	db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_patients as p")
-	fmt.Println("table", table)
-	dbs := UserReadDB().Table("sgj_user_admin_role as r")
-	fmt.Println("dbs", dbs)
-	offset := (page - 1) * limit
+	if orgId == 10060 {
+		db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_patients as p")
+		fmt.Println("table", table)
+		dbs := UserReadDB().Table("sgj_user_admin_role as r")
+		fmt.Println("dbs", dbs)
+		offset := (page - 1) * limit
+
+		if id > 0 {
+			db = db.Where("x.equiment_id = ?", id)
+		}
 
-	if id > 0 {
-		db = db.Where("x.equiment_id = ?", id)
-	}
+		if orgId > 0 {
+			db = db.Where("x.user_org_id = ?", orgId)
+		}
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date asc").Scan(&infor).Error
+		if err != nil {
+			return
+		}
+		return
+	} else {
+		db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_patients as p")
+		fmt.Println("table", table)
+		dbs := UserReadDB().Table("sgj_user_admin_role as r")
+		fmt.Println("dbs", dbs)
+		offset := (page - 1) * limit
+
+		if id > 0 {
+			db = db.Where("x.equiment_id = ?", id)
+		}
 
-	if orgId > 0 {
-		db = db.Where("x.user_org_id = ?", orgId)
-	}
-	err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
-	if err != nil {
+		if orgId > 0 {
+			db = db.Where("x.user_org_id = ?", orgId)
+		}
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
+		if err != nil {
+			return
+		}
 		return
 	}
-	return
+
 }
 
 func GetBedNumber(id int64, orgid int64) (models.DeviceAddmacher, error) {

service/mobile_dialysis_service.go

@@ -1666,6 +1666,52 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
 		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 = ? AND dialysis_date = ?", orgID, scheduleDate).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 = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").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 = ? AND dialysis_date = ?", orgID, scheduleDate).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 = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").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
+	}
 
 	return vms, err
 }
@@ -2575,7 +2621,7 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?  ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
 		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -2804,20 +2850,21 @@ func (HisMScheduleDoctorAdviceVMOne) TableName() string {
 }
 
 type HisMScheduleProjectVM struct {
-	ID                     int64                            `gorm:"column:id" json:"id"`
-	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId                  int64                            `gorm:"column:bed_id" json:"bed_id"`
-	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate           int64                            `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status                 int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
-	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
-	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	ID                         int64                            `gorm:"column:id" json:"id"`
+	UserOrgId                  int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId                int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId                      int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId                  int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate               int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType               int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                     int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status                     int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder              *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient            *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber               *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription               *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisPrescriptionProject     []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	HisPrescriptionTeamProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"team_project"`
 }
 
 func (HisMScheduleProjectVM) TableName() string {
@@ -2884,76 +2931,157 @@ func GetHisDoctorAdviceCount(startime int64, endtime int64, deliveway string, or
 	return advice, err
 }
 
-func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64) ([]*MScheduleDoctorAdviceVM, error) {
+func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	adviceCondition := []interface{}{}
 	if adviceType == 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
 
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
+
 		}
 
 	} else if adviceType == 1 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
 
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0 and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		}
 
 	} else if adviceType == 3 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ? and patient_id = ?  "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
+
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0 and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
+
 		}
 
 	} else if adviceType == 2 && len(deliverWay) > 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+			}
+
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			if patient_id > 0 {
+
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+			}
+
 		}
 
 	} else if adviceType == 2 && len(deliverWay) <= 0 {
 		if patientType == 0 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
 
 		} else if patientType == 1 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ? and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+			}
+
 		} else if patientType == 2 {
-			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
-			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			if patient_id > 0 {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and patient_id = ?"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+			} else {
+				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
+				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+			}
+
 		}
 
 	}
@@ -2983,7 +3111,7 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	return vms, err
 }
 
-func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64) ([]*HisMScheduleDoctorAdviceVM, error) {
+func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64, patient_id int64) ([]*HisMScheduleDoctorAdviceVM, error) {
 
 	var vms []*HisMScheduleDoctorAdviceVM
 	if len(deliverWay) > 0 {
@@ -2994,19 +3122,36 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 		if partitionType > 0 {
 			db = db.Where("partition_id = ?", partitionType)
 		}
-		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
-			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)
-			}).
-			Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if patient_id > 0 {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id =?", orgID, patient_id).
+				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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and patient_id = ?", orgID, scheduleDate, deliverWay, patient_id).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+				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)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+
 	} else {
 		db := readDb.Table("xt_schedule")
 		if scheduleType > 0 {
@@ -3015,19 +3160,36 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 		if partitionType > 0 {
 			db = db.Where("partition_id = ?", partitionType)
 		}
-		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
-			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)
-			}).
-			Where("status = 1 AND user_org_id = ?", orgID)
-		if scheduleDate != 0 {
-			db = db.Where("schedule_date = ?", scheduleDate)
+		if patient_id > 0 {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
+				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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
+		} else {
+			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
+				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)
+				}).
+				Where("status = 1 AND user_org_id = ?", orgID)
+			if scheduleDate != 0 {
+				db = db.Where("schedule_date = ?", scheduleDate)
+			}
+			err = db.Find(&vms).Error
 		}
-		err = db.Find(&vms).Error
+
 	}
 
 	return vms, err
@@ -3157,8 +3319,99 @@ func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64
 	return
 }
 
-func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleProjectVM, error) {
+func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64, patient_id int64) ([]*HisMScheduleProjectVM, error) {
 	var vms []*HisMScheduleProjectVM
+
+	if patientType == 0 {
+
+		if patient_id > 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 = ? and patient_id = ?", orgID, patient_id).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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				}).
+				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").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
+		} else {
+			if patient_id > 0 {
+				db := readDb.
+					Table("xt_schedule").
+					Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).
+					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").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
+			} else {
+				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 = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+					}).
+					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").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 = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").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").

service/patient_schedule_template_service.go

@@ -422,7 +422,7 @@ func SavePatientScheduleTemplateModeAndClearNextTwoWeekSchedules(templateMode *m
 	nextMonday, _ := utils.GetMondayAndSundayOfWeekDate(&nextWeek)
 	nextSecWeek := now.AddDate(0, 0, 14)
 	_, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
-	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
 	if disableErr != nil {
 		tx.Rollback()
 		return disableErr

service/patient_service.go

@@ -67,7 +67,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	offset := (page - 1) * limit
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
 }
 
@@ -1179,7 +1179,7 @@ func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int6
 		db = db.Where("x.start_time>=?", start)
 	}
 	if end != 0 {
-		db = db.Where("start_time<=?", end)
+		db = db.Where("x.start_time<=?", end)
 	}
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
@@ -1222,7 +1222,7 @@ func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, sto
 		db = db.Where("x.start_time>=?", start)
 	}
 	if end != 0 {
-		db = db.Where("start_time<=?", end)
+		db = db.Where("x.start_time<=?", end)
 	}
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
@@ -1338,7 +1338,7 @@ func GetPatientDialysisRecord(orgID, patientID int64, page, limit, start, end, m
 		}).
 		Joins("JOIN xt_schedule as s ON s.patient_id=? and FROM_UNIXTIME(s.schedule_date, '%Y-%m-%d')=FROM_UNIXTIME(do.dialysis_date, '%Y-%m-%d')", patientID).
 		Joins("JOIN xt_device_zone as dz ON dz.org_id = ? and dz.id=s.partition_id", orgID).
-		Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Group("s.schedule_date")
+		Where("do.patient_id=? and do.user_org_id=?  and do.status=1", patientID, orgID).Group("s.schedule_date")
 
 	if start != 0 {
 		db = db.Where("do.dialysis_date>=?", start)
@@ -1461,6 +1461,7 @@ func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*mod
 
 func GetPatientByKeyWord(orgID int64, keywords string) (patient []*models.Patients, err error) {
 	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1", orgID)
+	fmt.Println("keywords22222223322332322332322323323", keywords)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("name LIKE ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error
@@ -1538,7 +1539,7 @@ func UpdateDoctorAdviceAndSubAdvice(m *models.DoctorAdvice) (err error) {
 		ut.Rollback()
 		return
 	}
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", m.ID).Updates(map[string]interface{}{"start_time": m.StartTime, "groupno": m.GroupNo, "mtime": time.Now().Unix()}).Error
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", m.ID).Updates(map[string]interface{}{"start_time": m.StartTime, "groupno": m.GroupNo, "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		ut.Rollback()
 		return
@@ -1872,575 +1873,88 @@ func UpdateScheduleItemByPatientId(id int64) error {
 	return err
 }
 
-func GetAllDeviceNumberByList(orgID int64) (number []*models.DeviceNumber, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":device_number_all"
-	number_info_str, _ := redis.Get(key).Result()
-	if len(number_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DeviceNumber{}).Where("org_id=? and status=1", orgID).Find(&number).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(number) > 0 {
-				//缓存数据
-				device_number_json, err := json.Marshal(&number)
-				if err == nil {
-					redis.Set(key, device_number_json, time.Second*60*60*18)
-				}
-			}
-			return number, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(number_info_str), &number)
-		return number, nil
-	}
-}
-
-func GetAllZoneByList(orgID int64) (zone []*models.DeviceZone, err error) {
+func GetDoctorAdviceListThree(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.HisDoctorAdvice, total int64, err error) {
 
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":device_zone_all"
-	zone_info_str, _ := redis.Get(key).Result()
-	if len(zone_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DeviceZone{}).Where("org_id=? and status=1", orgID).Find(&zone).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(zone) > 0 {
-				//缓存数据
-				zone_number_json, err := json.Marshal(&zone)
-				if err == nil {
-					redis.Set(key, zone_number_json, time.Second*60*60*18)
-				}
-			}
-			return zone, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(zone_info_str), &zone)
-		return zone, nil
+	db := readDb.Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Print("table", table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
 	}
-}
-
-func GetAllPrescriptionByList(orgID int64, scheduleDate int64) (prescriptions []*models.VMDialysisPrescription, err error) {
-
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
-	prescriptions_list_all, _ := redis.Get(key).Result()
-
-	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMDialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(prescriptions) > 0 {
-				//缓存数据
-				prescriptions_list_all, err := json.Marshal(&prescriptions)
-				if err == nil {
-					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
-				}
-			}
-			return prescriptions, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
-		return prescriptions, nil
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
 	}
-}
-
-func GetAllAssessmentBeforesByListOne(orgID int64, scheduleDate int64) (assessmentBefores []*models.VMPredialysisEvaluation, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_befores_list_all"
-	assessment_befores_list_all, _ := redis.Get(key).Result()
-
-	if len(assessment_befores_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMPredialysisEvaluation{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(assessmentBefores) > 0 {
-				//缓存数据
-				assessment_befores_list_all, err := json.Marshal(&assessmentBefores)
-				if err == nil {
-					redis.Set(key, assessment_befores_list_all, time.Second*60*60*18)
-				}
-			}
-			return assessmentBefores, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
-		return assessmentBefores, nil
+	if advice_type == 1 && advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
 	}
-}
-
-func GetAllDialysisOrdersByListOne(orgID int64, scheduleDate int64) (dialysisOrders []*models.VMMonitorDialysisOrder, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
-	dialysis_orders_list_all, _ := redis.Get(key).Result()
-
-	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMMonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(dialysisOrders) > 0 {
-				//缓存数据
-				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
-				if err == nil {
-					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
-				}
-			}
-			return dialysisOrders, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
-		return dialysisOrders, nil
+	if advice_type == 3 && advice_type > 0 {
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
 	}
-}
-
-func GetAllAssessmentAfterDislysisByListOne(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.VMAssessmentAfterDislysis, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_after_dislysis_list_all"
-	assessment_after_dislysis__all, _ := redis.Get(key).Result()
-
-	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMAssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(assessmentAfterDislysis) > 0 {
-				//缓存数据
-				assessment_after_dislysis__all, err := json.Marshal(&assessmentAfterDislysis)
-				if err == nil {
-					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
-				}
-			}
-			return assessmentAfterDislysis, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
-		return assessmentAfterDislysis, nil
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
 	}
-}
-
-func GetAllMonitorList(orgID int64, scheduleDate int64) (monitor []*models.VMMonitoringRecord, err error) {
-
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":monitor_record_list_all"
-	monitor_record_list_all, _ := redis.Get(key).Result()
-	fmt.Println("monitor_recorde_list", len(monitor_record_list_all))
-	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMMonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(monitor) > 0 {
-				//缓存数据
-				assessment_after_dislysis__all, err := json.Marshal(&monitor)
-				if err == nil {
-					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
-				}
-			}
-			return monitor, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(monitor_record_list_all), &monitor)
-		return monitor, nil
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
 	}
-}
 
-func GetAllPatientListByListOne(orgID int64) (patients []*models.VMMonitorPatients, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
-	patient_info_str, _ := redis.Get(key).Result()
-
-	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.VMMonitorPatients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(patients) > 0 {
-				//缓存数据
-				patient_info_json, err := json.Marshal(&patients)
-				if err == nil {
-					redis.Set(key, patient_info_json, time.Second*60*60*18)
-				}
-			}
-			return patients, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(patient_info_str), &patients)
-		return patients, nil
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
 	}
-}
-
-func GetAllTreatModeByList(orgID int64) (treatement []*models.TreatmentMode, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":treatement_mode_all"
-	treatment_info_str, _ := redis.Get(key).Result()
-
-	if len(treatment_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.TreatmentMode{}).Where("status=1").Find(&treatement).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(treatement) > 0 {
-				//缓存数据
-				patient_info_json, err := json.Marshal(&treatement)
-				if err == nil {
-					redis.Set(key, patient_info_json, time.Second*60*60*18)
-				}
-			}
-			return treatement, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(treatment_info_str), &treatement)
-		return treatement, nil
+	if end != 0 {
+		db = db.Where("x.start_time<=?", end)
 	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	fmt.Print("err", err)
+	return
 }
 
-func GetAllPatientListByListTwo(orgID int64) (patients []*MSchedualPatientVM, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
-	patient_info_str, _ := redis.Get(key).Result()
+func GetDoctorAdviceListFour(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64) (advices []*models.HisDoctorAdvice, total int64, err error) {
 
-	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&MSchedualPatientVM{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(patients) > 0 {
-				//缓存数据
-				patient_info_json, err := json.Marshal(&patients)
-				if err == nil {
-					redis.Set(key, patient_info_json, time.Second*60*60*18)
-				}
-			}
-			return patients, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(patient_info_str), &patients)
-		return patients, nil
+	db := readDb.Table("his_doctor_advice_info as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println(table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
 	}
-}
-
-func GetAllDeviceNumberByListOne(orgID int64) (number []*MDeviceNumberVM, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":device_number_all"
-	number_info_str, _ := redis.Get(key).Result()
-	if len(number_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&MDeviceNumberVM{}).Where("org_id=? and status=1", orgID).Find(&number).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(number) > 0 {
-				//缓存数据
-				device_number_json, err := json.Marshal(&number)
-				if err == nil {
-					redis.Set(key, device_number_json, time.Second*60*60*18)
-				}
-			}
-			return number, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(number_info_str), &number)
-		return number, nil
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
 	}
-}
-
-func GetAllPrescriptionByListOne(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
-
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
-	prescriptions_list_all, _ := redis.Get(key).Result()
-
-	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DialysisPrescriptionList{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(prescriptions) > 0 {
-				//缓存数据
-				prescriptions_list_all, err := json.Marshal(&prescriptions)
-				if err == nil {
-					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
-				}
-			}
-			return prescriptions, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
-		return prescriptions, nil
+	if advice_type == 1 {
+		db = db.Where("x.advice_type = ?", advice_type)
 	}
-}
-
-func GetAllDialysisOrdersByListTwo(orgID int64, scheduleDate int64) (dialysisOrders []*MDialysisOrderVM, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
-	dialysis_orders_list_all, _ := redis.Get(key).Result()
-
-	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&MDialysisOrderVM{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(dialysisOrders) > 0 {
-				//缓存数据
-				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
-				if err == nil {
-					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
-				}
-			}
-			return dialysisOrders, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
-		return dialysisOrders, nil
+	if advice_type == 3 && advice_type > 0 {
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
 	}
-}
-
-func GetAllPatientListByListThree(orgID int64) (patients []*models.MonitorPatients, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":patient_list_all"
-	patient_info_str, _ := redis.Get(key).Result()
-
-	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.MonitorPatients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(patients) > 0 {
-				//缓存数据
-				patient_info_json, err := json.Marshal(&patients)
-				if err == nil {
-					redis.Set(key, patient_info_json, time.Second*60*60*18)
-				}
-			}
-			return patients, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(patient_info_str), &patients)
-		return patients, nil
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
 	}
-}
 
-func GetAllPrescriptionByListTwo(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescription, err error) {
-
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":prescriptions_list_all"
-	prescriptions_list_all, _ := redis.Get(key).Result()
-
-	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DialysisPrescription{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(prescriptions) > 0 {
-				//缓存数据
-				prescriptions_list_all, err := json.Marshal(&prescriptions)
-				if err == nil {
-					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
-				}
-			}
-			return prescriptions, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
-		return prescriptions, nil
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
 	}
-}
-
-func GetAllAssessmentBeforesByListThree(orgID int64, scheduleDate int64) (assessmentBefores []*models.PredialysisEvaluation, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_befores_list_all"
-	assessment_befores_list_all, _ := redis.Get(key).Result()
 
-	if len(assessment_befores_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.PredialysisEvaluation{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(assessmentBefores) > 0 {
-				//缓存数据
-				assessment_befores_list_all, err := json.Marshal(&assessmentBefores)
-				if err == nil {
-					redis.Set(key, assessment_befores_list_all, time.Second*60*60*18)
-				}
-			}
-			return assessmentBefores, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
-		return assessmentBefores, nil
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
 	}
-}
-
-func GetAllDialysisOrdersByListThree(orgID int64, scheduleDate int64) (dialysisOrders []*models.MonitorDialysisOrder, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
-	dialysis_orders_list_all, _ := redis.Get(key).Result()
-
-	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.MonitorDialysisOrder{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(dialysisOrders) > 0 {
-				//缓存数据
-				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
-				if err == nil {
-					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
-				}
-			}
-			return dialysisOrders, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
-		return dialysisOrders, nil
+	if end != 0 {
+		db = db.Where("x.start_time<=?", end)
 	}
-}
-
-func GetAllAssessmentAfterDislysisByListThree(orgID int64, scheduleDate int64) (assessmentAfterDislysis []*models.AssessmentAfterDislysis, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":assessment_after_dislysis_list_all"
-	assessment_after_dislysis__all, _ := redis.Get(key).Result()
-
-	if len(assessment_after_dislysis__all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.AssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(assessmentAfterDislysis) > 0 {
-				//缓存数据
-				assessment_after_dislysis__all, err := json.Marshal(&assessmentAfterDislysis)
-				if err == nil {
-					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
-				}
-			}
-			return assessmentAfterDislysis, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
-		return assessmentAfterDislysis, nil
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
 	}
-}
-
-func GetAllMonitorListThree(orgID int64, scheduleDate int64) (monitor []*models.MonitoringRecord, err error) {
-
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + ":monitor_record_list_all"
-	monitor_record_list_all, _ := redis.Get(key).Result()
+	offset := (page - 1) * limit
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Scan(&advices).Error
+	fmt.Print("错误是什么", err)
+	return
 
-	if len(monitor_record_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.MonitoringRecord{}).Where("status = 1  AND user_org_id = ? AND  monitoring_date= ?", orgID, scheduleDate).Find(&monitor).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(monitor) > 0 {
-				//缓存数据
-				assessment_after_dislysis__all, err := json.Marshal(&monitor)
-				if err == nil {
-					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
-				}
-			}
-			return monitor, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(monitor_record_list_all), &monitor)
-		return monitor, nil
-	}
 }

service/schedule_service.go

@@ -591,7 +591,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -605,12 +605,12 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date =?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
+	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error
 
 	return list, err
@@ -618,7 +618,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -632,12 +632,12 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
+	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error
 
 	return list, err
@@ -795,7 +795,7 @@ func UpdateNewScheduleTemplateStatus(id int64, org_id int64) (err error) {
 	return
 }
 
-func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string) (schedules []*models.WeekSchedule, err error) {
+func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endtime int64, orgID int64, zone []string) (schedules []*models.WeekScheduleSix, err error) {
 
 	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
 	if orgID > 0 {
@@ -824,8 +824,6 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 			return db.Where("status = 1").Order("id asc")
 		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Order("id asc")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Group("patient_id,mode_id").Order("id desc")
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").
@@ -993,6 +991,8 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
 
-	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Find(&schedule).Error
+	err = readDb2.Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
+	}).Find(&schedule).Error
 	return schedule, err
 }

service/self_drug_service.go

@@ -879,12 +879,15 @@ func CreateDrugDamage(damage models.XtDrugDamage) error {
 func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.VmDrugInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and inventory_type = 11")
+	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and type = 4")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	tab := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 	fmt.Println(table, tab)
+	//if len(keyword) > 0 {
+	//	db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
+	//}
 	if len(keyword) > 0 {
-		db = db.Where("x.warehousing_order = ? or r.user_name like ?", keyword, likeKey)
+		db = db.Where("x.drug_name like ?", likeKey)
 	}
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
@@ -900,7 +903,7 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 }
 
 func GetDrugDamageByOrgId(orgid int64) (list []*models.XtDrugInventory, err error) {
-	err = XTReadDB().Model(&list).Where("user_org_id = ? and inventory_type = 11 and status = 1", orgid).Find(&list).Error
+	err = XTReadDB().Model(&list).Where("user_org_id = ? and type = 4 and status = 1", orgid).Find(&list).Error
 	return list, err
 }
 
@@ -1034,6 +1037,12 @@ func GetLastDrugWarehouseOut(orgid int64) (models.DrugWarehouseOut, error) {
 	return info, err
 }
 
+func GetLastDrugWarehouseInfSix(drugid int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("drug_id=? and status = 1", drugid).Last(&info).Error
+	return info, err
+}
 //func GetLastDrugWarehouseInfo(drugid int64) (models.XtDrugWarehouseInfo, error) {
 //
 //	info := models.XtDrugWarehouseInfo{}
@@ -1121,9 +1130,9 @@ func CreateDrugWarehouseOutInfo(info models.DrugWarehouseOutInfo) error {
 	return err
 }
 
-func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.XtDrugInventory, err error) {
+func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (drug []*models.VmXtDrugInventory, err error) {
 
-	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1 and inventory_type = 11 ")
+	db := XTReadDB().Table("xt_drug_inventory").Where("status = 1")
 
 	if drugid > 0 {
 		db = db.Where("drug_id = ?", drugid)
@@ -1134,7 +1143,22 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 	if drugtype > 0 {
 		db = db.Where("type = ?", drugtype)
 	}
+	if drugtype == 0 {
+		db = db.Where("type = 4")
+	}
 
-	err = db.Find(&drug).Error
+	err = db.Preload("XtBaseDrug", "status = 1").Find(&drug).Error
 	return drug, err
 }
+
+func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+	return info, err
+}

service/stock_service.go

@@ -4023,6 +4023,7 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 }
 
 func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid_id int64) (models.WarehouseOutInfo, error) {
+func GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64) (models.WarehouseOutInfo, error) {
 
 	info := models.WarehouseOutInfo{}
 	err := XTReadDB().Where("good_id = ? and warehouse_info_id= ? and status =1", goodid, warehouse_info_id).Last(&info).Error

service/user_service.go

@@ -48,16 +48,14 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 }
 
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
-	//fmt.Println("orgid", orgId)
-	//fmt.Println("appid", appid)
+
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }
 
 func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
-	//fmt.Println("orgid", orgId)
-	//fmt.Println("appid", appid)
+
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
@@ -140,9 +138,7 @@ func GetLastData(orgid int64) (models.SgjPatientDryweight, error) {
 }
 
 func UpdateDialysisPrescription(patientid int64, orgid int64, dryweight float64, prescription models.PredialysisEvaluation) error {
-	fmt.Println("patientid", patientid)
-	fmt.Println("orgid", orgid)
-	fmt.Println("dryweight", dryweight)
+
 	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ?", patientid, orgid).Update(map[string]interface{}{"dry_weight": dryweight, "mtime": time.Now().Unix()}).Last(&prescription).Error
 	fmt.Println("错误是设么", err)
 	return err

service/warhouse_service.go

@@ -1696,6 +1696,8 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		maxNumber = goods.Count
 
+		fmt.Println("数据1111111111111", warehouse.StockCount)
+		fmt.Println("s数据233232323232323232233232", maxNumber)
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")
 		}
@@ -1703,6 +1705,11 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 		warehouse.Mtime = time.Now().Unix()
 
+		//扣减库存
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		fmt.Println("几年里2323323232323232323232")
+		if errThree != nil {
+			return errThree
 		if warehouse.StockCount <= 0 {
 			return errors.New("库存数量不足")
 		} else {