修改redis清除数据时间

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 7957
+		subscibe.OrgId = 4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 7957
+		adminUserInfo.CurrentOrgId = 4
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 7957
+		subscibe.OrgId = 4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 7957
+		adminUserInfo.CurrentOrgId = 4
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -554,17 +554,17 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 		}
 
-		//if dialysisPrescribe != nil {
-		//	dialysisPrescribe.UpdatedTime = time.Now().Unix()
-		//	dialysisPrescribe.RecordDate = theAssessmentDateTime
-		//	dialysisPrescribe.DewaterAmount = dewater_amount
-		//	dialysisPrescribe.TargetUltrafiltration = dewater_amount
-		//	dialysisPrescribe.Status = 1
-		//	updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
-		//	if updateErr != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-		//	}
-		//}
+		if dialysisPrescribe != nil {
+			dialysisPrescribe.UpdatedTime = time.Now().Unix()
+			dialysisPrescribe.RecordDate = theAssessmentDateTime
+			dialysisPrescribe.DewaterAmount = dewater_amount
+			dialysisPrescribe.TargetUltrafiltration = dewater_amount
+			dialysisPrescribe.Status = 1
+			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+			if updateErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+			}
+		}
 
 		theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 		if getPEErr != nil {

controllers/mobile_api_controllers/login_api_controller.go

@@ -33,8 +33,8 @@ func (this *LoginAPIController) LoginByPwd() {
 		return
 	}
 	ip := utils.GetIP(this.Ctx.Request)
-	ssoDomain := beego.AppConfig.String("sso_domain")
-	//ssoDomain := "http://localhost:8091"
+	//ssoDomain := beego.AppConfig.String("sso_domain")
+	ssoDomain := "http://localhost:8091"
 	api := ssoDomain + "/m/login/pwd"
 	values := make(url.Values)
 	values.Set("mobile", mobile)

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -118,4 +118,16 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/doctoradvice/get", &DialysisAPIController{}, "Get:GetLastOrNextDoctorAdvice")
 
+	beego.Router("/m/api/dialysisbeforeprepare/create", &DialysisAPIController{}, "Post:CreateConsumables")
+	beego.Router("/m/api/dialysisbeforeprepare/edit", &DialysisAPIController{}, "Post:EditConsumables")
+
+	beego.Router("/m/api/stockout/create", &DialysisAPIController{}, "Post:CreateStockOutInfo")
+	//beego.Router("/m/api/stockout/edit", &DialysisAPIController{}, "Post:EditStockOutInfo")
+
+	beego.Router("/m/api/otherstockout/create", &DialysisAPIController{}, "Post:CreateOtherStockOutInfo")
+
+	beego.Router("/m/api/dialysisgoods/get", &DialysisAPIController{}, "Get:GetDialysisGoods")
+	beego.Router("/m/api/goodstatistics/get", &DialysisAPIController{}, "Get:GetDialysisGoodsStatistics")
+	beego.Router("/m/api/stockingood/get", &DialysisAPIController{}, "Get:GetStockInGoodInfo")
+
 }

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -17,11 +17,17 @@ import (
 	"time"
 )
 
+//func InitGoodTypesConfig(org *models.Org){
+//
+//
+//}
+
 type HomeController struct {
 	NewMobileBaseAPIAuthController
 }
 
 func (this *HomeController) GetHomeData() {
+
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	if adminUserInfo.Org != nil && adminUserInfo.Org.Id != 0 {
 		//获取该管理员所有机构列表
@@ -73,6 +79,7 @@ func (this *HomeController) GetHomeData() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
+
 		cretor := adminUserInfo.AdminUser.Id
 		this.ServeSuccessJSON(map[string]interface{}{
 			"orgs":            orgs,
@@ -83,6 +90,7 @@ func (this *HomeController) GetHomeData() {
 			"cretor":          cretor,
 		})
 	} else {
+
 		apps, err := service.GetAllApp(0)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -404,6 +412,8 @@ func (this *HomeController) CreateOrg() {
 		InitEquitMentInformation(org)
 		//初始化显示配置和打印模版
 		InitShowConfig(org)
+		//初始化商品类型
+		InitGoodTypesConfig(org)
 
 		if len(orgs) == 0 {
 			ip := utils.GetIP(this.Ctx.Request)

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -242,6 +242,9 @@ func (this *MobileRegistController) CreateOrg() {
 		//初始化显示配置和打印模版
 		InitShowConfig(org)
 
+		//初始化商品类型
+		InitGoodTypesConfig(org)
+
 		//创建完机构后进行登录验证操作
 		ip := utils.GetIP(this.Ctx.Request)
 		ssoDomain := beego.AppConfig.String("sso_domain")
@@ -1205,3 +1208,67 @@ func InitShowConfig(org *models.Org) {
 	}
 	service.CreateVMPrintTemplate(template)
 }
+
+type GoodTypesConfig struct {
+	Types []*models.VMGoodsType "json:types"
+}
+
+func LoadGoodTypeConfig(dataFile string) *GoodTypesConfig {
+	var config GoodTypesConfig
+	_, filename, _, _ := runtime.Caller(1)
+	datapath := path.Join(path.Dir(filename), dataFile)
+	config_file, err := os.Open(datapath)
+	fmt.Println("1111111")
+	fmt.Println(err)
+	fmt.Println("2222222")
+
+	if err != nil {
+		emit("Failed to open config file '%s': %s\n", datapath, err)
+		return &config
+	}
+
+	fi, _ := config_file.Stat()
+
+	buffer := make([]byte, fi.Size())
+	_, err = config_file.Read(buffer)
+
+	buffer, err = StripComments(buffer) //去掉注释
+	fmt.Println("333333")
+	fmt.Println(err)
+	fmt.Println("4444444")
+	if err != nil {
+		emit("Failed to strip comments from json: %s\n", err)
+		return &config
+	}
+
+	buffer = []byte(os.ExpandEnv(string(buffer))) //特殊
+	err = json.Unmarshal(buffer, &config)         //解析json格式数据
+	fmt.Println("55555555")
+	fmt.Println(err)
+	fmt.Println("66666666")
+	if err != nil {
+		emit("Failed unmarshalling json: %s\n", err)
+		return &config
+	}
+	return &config
+}
+
+func InitGoodTypesConfig(org *models.Org) {
+	good_types := LoadGoodTypeConfig("./good_types.json").Types
+	fmt.Println(good_types)
+	for _, item := range good_types {
+		good_type := &models.GoodsType{
+			TypeCode: item.TypeCode,
+			TypeName: item.TypeName,
+			Remark:   "",
+			Number:   item.Number,
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			OrgId:    org.Id,
+			Status:   1,
+			Type:     1,
+		}
+		service.AddSigleGoodType(good_type)
+	}
+
+}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/enums"
 	"XT_New/service"
 	"fmt"
+	"time"
 )
 
 type StaffScheduleApiController struct {
@@ -235,3 +236,87 @@ func (this *StaffScheduleApiController) ChangeMobileOption() {
 		"chartworkdayminute": chartworkdayminute,
 	})
 }
+
+func (this *StaffScheduleApiController) GetAllZone() {
+
+	id := this.GetMobileAdminUserInfo().Org.Id
+	zone, err := service.GetAllMobileZone(id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zone": zone,
+	})
+}
+
+func (this *StaffScheduleApiController) GetPatientScheduleList() {
+	orgid := this.GetMobileAdminUserInfo().Org.Id
+	fmt.Println("orgid", orgid)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	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)
+
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}
+
+func (this *StaffScheduleApiController) DeleteSchedule() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	err := service.DeleteSchedule(id)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *StaffScheduleApiController) SearchPatient() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	fmt.Println(keyword)
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	start_time := this.GetString("start_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	schedule, err := service.GetSearchPatient(keyword, orgId, startTime)
+
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"schedule": schedule,
+	})
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -15,4 +15,8 @@ func StaffScheduleApiControllersRegisterRouters() {
 	beego.Router("/m/api/getmobilechartlist", &StaffScheduleApiController{}, "Get:GetMobileChartList")
 	beego.Router("/m/api/tosearchmobiletotal", &StaffScheduleApiController{}, "Get:ToSearchMobileTotal")
 	beego.Router("/m/api/changemobileoption", &StaffScheduleApiController{}, "Get:ChangeMobileOption")
+	beego.Router("/m/api/getallzone", &StaffScheduleApiController{}, "Get:GetAllZone")
+	beego.Router("/m/api/getpatientschedulelist", &StaffScheduleApiController{}, "Get:GetPatientScheduleList")
+	beego.Router("/m/api/deleteSchedule", &StaffScheduleApiController{}, "Get:DeleteSchedule")
+	beego.Router("/m/api/ssearchpatient", &StaffScheduleApiController{}, "Get:SearchPatient")
 }

controllers/public_api_controller.go

@@ -24,8 +24,8 @@ func PublicApiRegistRouters() {
 	beego.Router("/api/public/servertime", &PublicApiController{}, "Get:GetServerTime")
 	beego.Router("/api/app/release", &PublicApiController{}, "Get:AppRelease")
 	beego.Router("/api/get", &PublicApiController{}, "Get:GetJson")
-
 	beego.Router("/api/public/handledata", &PublicApiController{}, "get:HandleData")
+	beego.Router("/api/public/handlestockdata", &PublicApiController{}, "get:HandleStockData")
 
 }
 
@@ -654,3 +654,252 @@ func LoadRoleConfig(dataFile string) *RoleConfig {
 	}
 	return &config
 }
+
+type GoodTypesConfig struct {
+	GoodTypes []*models.VMGoodsType "json:list"
+}
+
+func LoadGoodTypeConfig(dataFile string) *GoodTypesConfig {
+	var config GoodTypesConfig
+	_, filename, _, _ := runtime.Caller(1)
+	datapath := path.Join(path.Dir(filename), dataFile)
+	config_file, err := os.Open(datapath)
+	if err != nil {
+		emit("Failed to open config file '%s': %s\n", datapath, err)
+		return &config
+	}
+
+	fi, _ := config_file.Stat()
+
+	buffer := make([]byte, fi.Size())
+	_, err = config_file.Read(buffer)
+
+	buffer, err = StripComments(buffer) //去掉注释
+	if err != nil {
+		emit("Failed to strip comments from json: %s\n", err)
+		return &config
+	}
+
+	buffer = []byte(os.ExpandEnv(string(buffer))) //特殊
+	err = json.Unmarshal(buffer, &config)         //解析json格式数据
+	if err != nil {
+		emit("Failed unmarshalling json: %s\n", err)
+		return &config
+	}
+	return &config
+}
+
+func (c *PublicApiController) HandleStockData() {
+	org, _ := service.FindAllOrgByImportType()
+	for _, item := range org {
+		goodTypes := &models.GoodsType{
+			TypeCode: "14000000",
+			TypeName: "穿刺针",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   1,
+		}
+
+		service.AddSigleGoodType(goodTypes)
+
+		goodTypes1 := &models.GoodsType{
+			TypeCode: "14000001",
+			TypeName: "透析器",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   2,
+		}
+
+		service.AddSigleGoodType(goodTypes1)
+
+		goodTypes2 := &models.GoodsType{
+			TypeCode: "14000002",
+			TypeName: "灌流器",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   3,
+		}
+
+		service.AddSigleGoodType(goodTypes2)
+
+		goodTypes3 := &models.GoodsType{
+			TypeCode: "14000003",
+			TypeName: "血路管",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   4,
+		}
+
+		service.AddSigleGoodType(goodTypes3)
+
+		goodTypes4 := &models.GoodsType{
+			TypeCode: "14000004",
+			TypeName: "血滤补液管",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   5,
+		}
+
+		service.AddSigleGoodType(goodTypes4)
+
+		goodTypes5 := &models.GoodsType{
+			TypeCode: "14000005",
+			TypeName: "注射器",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   6,
+		}
+
+		service.AddSigleGoodType(goodTypes5)
+
+		goodTypes6 := &models.GoodsType{
+			TypeCode: "14000006",
+			TypeName: "护理包(内瘘穿刺包)",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   7,
+		}
+
+		service.AddSigleGoodType(goodTypes6)
+
+		goodTypes7 := &models.GoodsType{
+			TypeCode: "14000007",
+			TypeName: "细菌过滤器",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   8,
+		}
+
+		service.AddSigleGoodType(goodTypes7)
+
+		goodTypes8 := &models.GoodsType{
+			TypeCode: "14000008",
+			TypeName: "血液透析干粉",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   9,
+		}
+
+		service.AddSigleGoodType(goodTypes8)
+
+		goodTypes9 := &models.GoodsType{
+			TypeCode: "14000009",
+			TypeName: "A液",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   10,
+		}
+
+		service.AddSigleGoodType(goodTypes9)
+
+		goodTypes10 := &models.GoodsType{
+			TypeCode: "14000010",
+			TypeName: "B液",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   11,
+		}
+
+		service.AddSigleGoodType(goodTypes10)
+
+		goodTypes11 := &models.GoodsType{
+			TypeCode: "14000011",
+			TypeName: "导管包",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   12,
+		}
+
+		service.AddSigleGoodType(goodTypes11)
+
+		goodTypes12 := &models.GoodsType{
+			TypeCode: "14000012",
+			TypeName: "血液透析导管",
+			Remark:   "",
+			Ctime:    time.Now().Unix(),
+			Mtime:    time.Now().Unix(),
+			Creater:  0,
+			Modifier: 0,
+			OrgId:    item.Id,
+			Status:   1,
+			Type:     1,
+			Number:   13,
+		}
+
+		service.AddSigleGoodType(goodTypes12)
+
+	}
+
+}

controllers/stock_good_api_controller.go

@@ -279,10 +279,17 @@ func (c *StockGoodApiController) DeleteGoodInfo() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	total, _ := service.FindWarehouseInfoTotalByGoodId(id)
+	total2, _ := service.FindWarehouseOutInfoTotalByGoodId(id)
+
 	if total > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteGoodInfoFail)
 		return
 	}
+	if total2 > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeleteGoodInfoFail)
+		return
+	}
+
 	err := service.DeleteGoodInfoById(id, adminUserInfo.AdminUser.Id)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/stock_in_api_controller.go

@@ -1339,20 +1339,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 				}
 				id := int64(items["id"].(float64))
 
-				if items["is_sys"] == nil || reflect.TypeOf(items["is_sys"]).String() != "float64" {
-					utils.ErrorLog("is_sys")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				is_sys := int64(items["is_sys"].(float64))
-
-				if items["sys_record_time"] == nil || reflect.TypeOf(items["sys_record_time"]).String() != "float64" {
-					utils.ErrorLog("sys_record_time")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				sys_record_time := int64(items["sys_record_time"].(float64))
-
 				if id == 0 {
 					warehouseOutInfo := &models.WarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1375,6 +1361,20 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
 				} else {
+					if items["is_sys"] == nil || reflect.TypeOf(items["is_sys"]).String() != "float64" {
+						utils.ErrorLog("is_sys")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					is_sys := int64(items["is_sys"].(float64))
+
+					if items["sys_record_time"] == nil || reflect.TypeOf(items["sys_record_time"]).String() != "float64" {
+						utils.ErrorLog("sys_record_time")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					sys_record_time := int64(items["sys_record_time"].(float64))
+
 					warehouseOutInfo := &models.WarehouseOutInfo{
 						ID: id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,

enums/error_code.go

@@ -202,6 +202,8 @@ const ( // ErrorCode
 	ErrorCodeOrgNoPatient = 20051
 
 	ErrorCodeDoctorAdviceEmpty = 20052
+
+	ErrorCodeOpenStocktWrong = 20053
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -346,7 +348,7 @@ var ErrCodeMsgs = map[int]string{
 
 	ErrorCodeCancelStockFail:    "出库退库失败",
 	ErrorCodeDeleteGoodTypeFail: "该类型存在商品信息,无法删除",
-	ErrorCodeDeleteGoodInfoFail: "该商品已经入库无法删除",
+	ErrorCodeDeleteGoodInfoFail: "该商品已经入库或者出库无法删除",
 
 	ErrorCodeDeleteFail: "删除失败",
 
@@ -401,6 +403,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeOrgNoPatient: "暂无病人",
 
 	ErrorCodeDoctorAdviceEmpty: "没有更多了",
+	ErrorCodeOpenStocktWrong:   "未开启自动扣减功能,无法出库",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -905,3 +905,22 @@ type UserAdminRoles struct {
 	Url           string `gorm:"column:url" json:"url" form:"url"`
 	Hash          string `gorm:"column:hash" json:"hash" form:"hash"`
 }
+
+type DialysisBeforePrepare 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"`
+	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	GoodId     int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId int64 `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count      int64 `gorm:"column:count" json:"count" form:"count"`
+	Ctime      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater    int64 `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier   int64 `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (DialysisBeforePrepare) TableName() string {
+	return "dialysis_before_prepare"
+}

models/good_models.go

@@ -12,6 +12,7 @@ type GoodsType struct {
 	OrgId    int64  `gorm:"column:org_id" json:"org_id"`
 	Status   int64  `gorm:"column:status" json:"status"`
 	Type     int64  `gorm:"column:type" json:"type"`
+	Number   int64  `gorm:"column:number" json:"number"`
 }
 
 func (GoodsType) TableName() string {

models/stock_models.go

@@ -296,6 +296,7 @@ type AutomaticReduceDetail struct {
 	GoodInfo                GoodInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"info"`
 	GoodsType               GoodsType `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
 	Patients                Patients  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
+	Count                   int64     `gorm:"column:count" json:"count"`
 }
 
 func (AutomaticReduceDetail) TableName() string {

models/vm_models.go

@@ -334,3 +334,22 @@ type VMGobalTemplate struct {
 func (VMGobalTemplate) TableName() string {
 	return "xt_gobal_template"
 }
+
+type VMGoodsType struct {
+	ID       int64  `gorm:"column:id" json:"id"`
+	TypeCode string `gorm:"column:type_code" json:"type_code"`
+	TypeName string `gorm:"column:type_name" json:"type_name"`
+	Remark   string `gorm:"column:remark" json:"remark"`
+	Ctime    int64  `gorm:"column:ctime" json:"ctime"`
+	Mtime    int64  `gorm:"column:mtime" json:"mtime"`
+	Creater  int64  `gorm:"column:creater" json:"creater"`
+	Modifier int64  `gorm:"column:modifier" json:"modifier"`
+	OrgId    int64  `gorm:"column:org_id" json:"org_id"`
+	Status   int64  `gorm:"column:status" json:"status"`
+	Type     int64  `gorm:"column:type" json:"type"`
+	Number   int64  `gorm:"column:number" json:"number"`
+}
+
+func (VMGoodsType) TableName() string {
+	return "xt_goods_type"
+}

service/app_version.go

@@ -224,3 +224,8 @@ func HandleData() {
 	}
 
 }
+
+func FindAllOrgByImportType() (org []*models.Org, err error) {
+	err = readUserDb.Model(&models.Org{}).Where("status =1 AND import = 0").Find(&org).Error
+	return
+}

service/dialysis_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"XT_New/models"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/jinzhu/gorm"
@@ -1011,7 +1012,7 @@ func GetLastLongAdviceByGroupNoThree(orgId int64, patient_id int64) (advice []*m
 }
 
 func FindAllDoctorAdviceByTime(now int64, end int64, patient_id int64, orgId int64, temp_id string) (advice []*models.DoctorAdvice, err error) {
-	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 2   AND frequency_type = 2 AND advice_date > ? AND advice_date <= ? AND template_id = ?  ", orgId, patient_id, end, now, temp_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 2   AND advice_date > ? AND advice_date <= ? AND template_id = ?  ", orgId, patient_id, end, now, temp_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	return
 }
 
@@ -1024,3 +1025,59 @@ func UpdateAssessmentAfterDate(patient_id int64, org_id int64, date int64, actua
 	err = writeDb.Model(&models.AssessmentAfterDislysis{}).Where("status =1 AND user_org_id = ? AND patient_id = ? AND assessment_date = ?", org_id, patient_id, date).Updates(map[string]interface{}{"actual_treatment_hour": actual_treatment_hour, "actual_treatment_minute": actual_treatment_minute}).Error
 	return
 }
+
+func CreateDialysisBeforePrepare(beforePrepares []*models.DialysisBeforePrepare) (err error) {
+	if len(beforePrepares) > 0 {
+		utx := writeDb.Begin()
+		if len(beforePrepares) > 0 {
+			thisSQL := "INSERT INTO dialysis_before_prepare (user_org_id, patient_id, record_date, good_id, good_type_id,count,ctime,mtime,creater,modifier,status) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, prepare := range beforePrepares {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, prepare.UserOrgId)
+				insertData = append(insertData, prepare.PatientId)
+				insertData = append(insertData, prepare.RecordDate)
+				insertData = append(insertData, prepare.GoodId)
+				insertData = append(insertData, prepare.GoodTypeId)
+				insertData = append(insertData, prepare.Count)
+				insertData = append(insertData, prepare.Ctime)
+				insertData = append(insertData, prepare.Mtime)
+				insertData = append(insertData, prepare.Creater)
+				insertData = append(insertData, prepare.Modifier)
+				insertData = append(insertData, 1)
+
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+
+}
+
+func UpdateDialysisBeforePrepare(info *models.DialysisBeforePrepare) (err error) {
+	err = writeDb.Save(&info).Error
+	return err
+}
+
+func UpdateOrderCountSub(good_type_id int64, good_id int64, number string, org_id int64, count int64) {
+	writeDb.Model(&models.WarehouseOutInfo{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, number).UpdateColumn("count", gorm.Expr("count - ?", count))
+
+}
+
+func UpdateOrderCountAdd(good_type_id int64, good_id int64, number string, org_id int64, count int64) {
+	writeDb.Model(&models.WarehouseOutInfo{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, number).UpdateColumn("count", gorm.Expr("count + ?", count))
+
+}
+
+func UpdateUserInfoDetails(good_type_id int64, good_id int64, time int64, org_id int64, patient_id int64, count int64, out *models.WarehouseOutInfo) {
+	writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND warehouse_out_order_number = ? AND patient_id = ?", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber, patient_id).Updates(map[string]interface{}{"count": count})
+	//writeDb.Model(&models.AutomaticReduceDetail{}).Where("good_id = ? AND good_type_id = ? AND org_id = ? AND status = 1 AND is_sys = 1 AND warehouse_out_order_number = ? ", good_id, good_type_id, org_id, out.WarehouseOutOrderNumber).UpdateColumn("count", count)
+
+}

service/doctor_schedule_service.go

@@ -139,7 +139,7 @@ func GetStaffScheduleList(orgid int64, startime int64, endtime int64) (schedule
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,r.user_type,s.class_attributes,r.sort,r.is_sort,s.work_time,s.minute").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ? and s.status = 1", orgid, orgid).Scan(&schedule).Error
+	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,r.user_type,s.class_attributes,r.sort,r.is_sort,s.work_time,s.minute").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ? and s.status = 1 and r.is_sort = 1", orgid, orgid).Scan(&schedule).Error
 	return schedule, err
 }
 
@@ -198,7 +198,7 @@ func ToSearchSeacheduleList(keywords string, startime int64, endtime int64, orgi
 	//if(doctorid >0){
 	//  db = db.Where("x.doctor_id = ?", doctorid)
 	//}
-	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.schedule_date,x.end_time,r.user_type,r.user_name,s.class_name,r.admin_user_id,s.class_attributes,r.sort,r.is_sort").Joins("left join sgj_users.sgj_user_admin_role AS r ON r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type and s.user_org_id = ?", orgid).Where("r.org_id = ? and r.status = 1  and r.user_name like ?", orgid, likeKey).Scan(&schedule).Error
+	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.schedule_date,x.end_time,r.user_type,r.user_name,s.class_name,r.admin_user_id,s.class_attributes,r.sort,r.is_sort").Joins("left join sgj_users.sgj_user_admin_role AS r ON r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type and s.user_org_id = ?", orgid).Where("r.org_id = ? and r.status = 1 and r.is_sort = 1  and r.user_name like ?", orgid, likeKey).Scan(&schedule).Error
 	return schedule, err
 }
 
@@ -575,3 +575,43 @@ func GetMySchedule(startime int64, endtime int64, orgid int64, creator int64) (s
 	err = db.Group("x.id").Select("x.doctor_id,x.schedule_week,s.class_name").Where("x.start_time >=? and x.end_time<=? and x.user_org_id = ? and x.doctor_id = ?", startime, endtime, orgid, creator).Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Scan(&schedule).Error
 	return schedule, err
 }
+
+func GetAllMobileZone(orgid int64) (zone []*models.DeviceZone, err error) {
+
+	err = XTReadDB().Model(&zone).Where("org_id = ? and status = 1", orgid).Find(&zone).Error
+	return zone, err
+}
+
+func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int64) (schedule []*models.Schedule, err error) {
+
+	db := XTReadDB().Table("xt_schedule as s")
+	if zoneid > 0 {
+		db = db.Where("s.partition_id = ?", zoneid)
+	}
+	if classtype > 0 {
+		db = db.Where("s.schedule_type = ?", classtype)
+	}
+	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", "status= 1").
+		Preload("DialysisOrder", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").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
+}
+
+func DeleteSchedule(id int64) error {
+
+	schedule := models.XtSchedule{}
+
+	err := XTWriteDB().Model(&schedule).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []*models.Schedule, err error) {
+
+	likeKey := "%" + keywords + "%"
+	db := XTReadDB().Table("xt_schedule as s")
+	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", "status= 1").
+		Preload("DialysisOrder", "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
+}

service/mobile_dialysis_service.go

@@ -1299,3 +1299,247 @@ func GetDialysisCountByPatientId(startime int64, endtime int64, patientid int64,
 	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o left join xt_schedule AS x ON x.patient_id = o.patient_id   where o.status = 1 and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ? and x.schedule_date = o.dialysis_date and x.status = 1 and o.patient_id = ?", startime, endtime, orgid, patientid).Scan(&order).Group("o.patient_id").Error
 	return order, err
 }
+
+func FindConsumablesByDate(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1 	AND count > 0", orgID, patient_id, recordDate).Find(&consumables).Error
+	return
+}
+
+//func FindLastConsumables(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error){
+//	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1", orgID, patient_id,recordDate).Find(&consumables).Error
+//	return
+//}
+//
+
+func GetLastTimeConsumables(orgID int64, patientID int64, maxDate int64) (prepare []*models.DialysisBeforePrepare, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date < ?", patientID, orgID, maxDate).Order("record_date desc").Find(&prepare).Error
+
+	return
+}
+
+type GoodsType struct {
+	ID       int64  `gorm:"column:id" json:"id"`
+	TypeName string `gorm:"column:type_name" json:"type_name"`
+	Remark   string `gorm:"column:remark" json:"remark"`
+	OrgId    int64  `gorm:"column:org_id" json:"org_id"`
+	Status   int64  `gorm:"column:status" json:"status"`
+	Type     int64  `gorm:"column:type" json:"type"`
+}
+
+func (GoodsType) TableName() string {
+	return "xt_goods_type"
+}
+
+type VMGoodInfo struct {
+	ID                int64  `gorm:"column:id" json:"id"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
+	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id"`
+}
+
+func (VMGoodInfo) TableName() string {
+	return "xt_good_information"
+}
+
+type AutomaticReduceDetail struct {
+	ID         int64      `gorm:"column:id" json:"id"`
+	PatientId  int64      `gorm:"column:patient_id" json:"patient_id"`
+	Status     int64      `gorm:"column:status" json:"status"`
+	RecordTime int64      `gorm:"column:record_time" json:"record_time"`
+	OrgId      int64      `gorm:"column:org_id" json:"org_id"`
+	GoodId     int64      `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId int64      `gorm:"column:good_type_id" json:"good_type_id"`
+	VMGoodInfo VMGoodInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"info"`
+	GoodsType  GoodsType  `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
+	Count      int64      `gorm:"column:count" json:"count"`
+}
+
+func (AutomaticReduceDetail) TableName() string {
+	return "xt_automatic_reduce_detail"
+}
+
+type DialysisBeforePrepare 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"`
+	PatientId  int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	GoodId     int64      `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	GoodTypeId int64      `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	Count      int64      `gorm:"column:count" json:"count" form:"count"`
+	Ctime      int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime      int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creater    int64      `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier   int64      `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	VMGoodInfo VMGoodInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"info"`
+	GoodsType  GoodsType  `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
+}
+
+func (DialysisBeforePrepare) TableName() string {
+	return "dialysis_before_prepare"
+}
+
+type MDialysisGoodsVM 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"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status"`
+
+	DeviceNumber              *MDeviceNumberVM         `gorm:"ForeignKey:BedId" json:"device_number"`
+	SchedualPatient           *MSchedualPatientVMList  `gorm:"ForeignKey:PatientId" json:"patient"`
+	AutomaticReduceDetail     []*AutomaticReduceDetail `gorm:"ForeignKey:PatientId,ScheduleDate;AssociationForeignKey:PatientId,RecordTime" json:"good_user"`
+	LastAutomaticReduceDetail []*AutomaticReduceDetail `gorm:"-" json:"last_good_user"`
+	DialysisBeforePrepare     []*DialysisBeforePrepare `gorm:"ForeignKey:PatientId,ScheduleDate;AssociationForeignKey:PatientId,RecordDate" json:"good_user_detail"`
+	LastDialysisBeforePrepare []*DialysisBeforePrepare `gorm:"-" json:"last_good_user_detail"`
+}
+
+func (MDialysisGoodsVM) TableName() string {
+	return "xt_schedule"
+}
+
+type VMWarehouseOutInfo struct {
+	ID                      int64      `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64      `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	GoodId                  int64      `gorm:"column:good_id" json:"good_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"`
+	TotalPrice              float64    `gorm:"column:total_price" json:"total_price"`
+	Status                  int64      `gorm:"column:status" json:"status"`
+	OrgId                   int64      `gorm:"column:org_id" json:"org_id"`
+	WarehouseOutOrderNumber string     `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	GoodInfo                VMGoodInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_info"`
+	GoodsType               GoodsType  `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"good_type"`
+	IsSys                   int64      `gorm:"column:is_sys" json:"is_sys"`
+	SysRecordTime           int64      `gorm:"column:sys_record_time" json:"sys_record_time"`
+	Mtime                   int64      `gorm:"column:mtime" json:"mtime"`
+	Ctime                   int64      `gorm:"column:ctime" json:"ctime"`
+}
+
+func (VMWarehouseOutInfo) TableName() string {
+	return "xt_warehouse_out_info"
+}
+
+type DialysisGoodsDate struct {
+	RecordDate int64
+}
+
+type DialysisGoodsDetailDate struct {
+	RecordTime int64
+}
+
+func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string) ([]*MDialysisGoodsVM, error, int64) {
+	var vms []*MDialysisGoodsVM
+	var total int64
+
+	db := readDb.
+		Table("xt_schedule as sch").
+		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("DialysisBeforePrepare", 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 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 record_time = ? AND count > 0 ", orgID, scheduleDate)
+		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
+	if scheduleDate != 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type != 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id != 0 {
+		db = db.Where("partition_id = ?", partition_id)
+	}
+	if patient_id != 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	//db = db.Count(&total)
+	//offset := (page - 1) * limit
+	//
+	//db = db.Offset(offset).Limit(limit)
+	err := db.Find(&vms).Error
+
+	return vms, err, total
+}
+
+func GetLastDialysisGoods(patient_id int64, orgID int64, record_time int64) (goodUser []*AutomaticReduceDetail, err error) {
+	var Id []*DialysisGoodsDetailDate
+	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
+	if len(Id) > 0 {
+		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
+	}
+	return
+}
+
+func GetLastDialysisBeforePrepare(patient_id int64, orgID int64, record_time int64) (goodUser []*DialysisBeforePrepare, err error) {
+	var Id []*DialysisGoodsDate
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date < ? AND count > 0", patient_id, orgID, record_time).Select("record_date").Group("record_date").Order("record_date asc").Scan(&Id).Error
+	if len(Id) > 0 {
+		err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordDate).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Find(&goodUser).Error
+	}
+	return
+}
+
+func MobileGetGoodsStatistics(orgID int64, start_time int64, end_time int64) (list []*models.StockInfo, err error) {
+	db := readDb.Model(&models.StockInfo{})
+	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgID)
+	db = db.Joins("JOIN xt_warehouse_out_info AS info ON info.good_id=xt_good_information.id AND info.status = 1 AND info.org_id = ?", orgID).Group("xt_good_information.id")
+	db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1", orgID).Joins("JOIN xt_warehouse_out ON xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.status = 1 AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.org_id = ? ", start_time, end_time, orgID)
+	})
+	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgID)
+	err = db.Order("ctime desc").Find(&list).Error
+	return
+}
+
+func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string) ([]*MDialysisGoodsVM, error, int64) {
+	var vms []*MDialysisGoodsVM
+	var total int64
+
+	db := readDb.
+		Model(&models.Schedule{}).
+		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("DialysisBeforePrepare", 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 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 record_time = ?  AND count > 0", orgID, scheduleDate)
+		}).Where("xt_schedule.status = 1 AND xt_schedule.user_org_id = ?", orgID)
+
+	if scheduleDate != 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if patient_id != 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if len(keywords) != 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+	} else {
+		if schedule_type != 0 {
+			db = db.Where("schedule_type = ?", schedule_type)
+		}
+		if partition_id != 0 {
+			db = db.Where("partition_id = ?", partition_id)
+		}
+
+		db = db.Count(&total)
+		offset := (page - 1) * limit
+
+		db = db.Offset(offset).Limit(limit)
+
+	}
+
+	err := db.Find(&vms).Error
+
+	return vms, err, total
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -169,7 +169,7 @@ func FindPrintStockGoodInfoByType(types int, startTime int64, end_time int64, or
 		})
 
 	}
-	db = db.Preload("GoodsType", "(org_id = ? AND status = 1) OR (status = 1 AND type = 1)", orgId)
+	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
 	err = db.Order("ctime desc").Find(&list).Error
 	return
 }

service/stock_service.go

@@ -137,13 +137,13 @@ func ModifyGoodType(goodType *models.GoodsType) (error, *models.GoodsType) {
 func FindAllGoodTypeList(orgId int64, page int64, limit int64, keyword string) (list []*models.GoodsType, total int64, err error) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.GoodsType{})
-	db = db.Where("(org_id=? AND status = 1) OR (type = 1 AND status = 1)", orgId)
+	db = db.Where("org_id=? AND status = 1", orgId)
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
 		db = db.Where("type_code LIKE ? OR type_name LIKE ?", likeKey, likeKey)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("type desc, number desc,ctime desc").Find(&list).Error
 	return
 }
 
@@ -220,7 +220,7 @@ func FindGoodInfoById(id int64) (*models.GoodInfo, error) {
 }
 
 func FindAllGoodType(org_id int64) (goodType []*models.GoodsType, err error) {
-	err = readDb.Model(&models.GoodsType{}).Where("(org_id = ? AND status = 1) OR (type = 1 AND status = 1)", org_id).Find(&goodType).Error
+	err = readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1", org_id).Find(&goodType).Error
 	return goodType, err
 }
 
@@ -654,7 +654,7 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string) (lis
 
 	db := readDb.Model(&models.StockInfo{})
 	db = db.Where("xt_good_information.org_id = ? AND xt_good_information.status = 1", orgId)
-	db = db.Joins("JOIN xt_warehouse_info AS info ON info.good_id=xt_good_information.id AND info.status = 1").Group("xt_good_information.id")
+	db = db.Group("xt_good_information.id")
 	db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("org_id = ? AND status = 1", orgId)
 	})
@@ -663,11 +663,11 @@ func FindAllStockInfo(orgId int64, page int64, limit int64, keyword string) (lis
 		return db.Where("org_id = ? AND status = 1", orgId)
 	})
 	db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
-	db = db.Preload("GoodsType", "(org_id = ? AND status = 1) OR (status = 1 AND type = 1)", orgId)
+	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
 
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Joins("join xt_goods_type on xt_goods_type.id = xt_good_information.good_type_id  AND ((xt_goods_type.org_id = ? AND xt_goods_type.status = 1) OR (xt_goods_type.type = 1 AND xt_goods_type.status = 1))", orgId)
+		db = db.Joins("join xt_goods_type on xt_goods_type.id = xt_good_information.good_type_id  AND xt_goods_type.org_id = ? AND xt_goods_type.status = 1", orgId)
 		db = db.Where("xt_good_information.good_code LIKE ? OR xt_good_information.specification_name LIKE ? OR xt_goods_type.type_name LIKE ?", likeKey, likeKey, likeKey).Group("xt_good_information.id")
 	}
 
@@ -682,6 +682,10 @@ func FindWarehouseInfoTotalByGoodId(goodId int64) (total int64, err error) {
 	return
 }
 
+func FindWarehouseOutInfoTotalByGoodId(goodId int64) (total int64, err error) {
+	err = readDb.Model(&models.WarehouseOutInfo{}).Where("good_id = ? AND status = 1", goodId).Count(&total).Error
+	return
+}
 func UpDateWarehouse(warehouse *models.Warehousing) (err error) {
 	err = readDb.Model(&models.Warehousing{}).Where("warehousing_order = ? AND status = 1", warehouse.WarehousingOrder).Update(map[string]interface{}{"operation_time": warehouse.OperationTime, "mtime": warehouse.Mtime, "modifier": warehouse.Modifier}).Error
 	return
@@ -769,7 +773,7 @@ func FindAllGoodByManufactureId(manufacturer_id int64, dealer_id int64, org_id i
 	if dealer_id > 0 {
 		db = db.Where("dealer = ?", dealer_id)
 	}
-	err = db.Preload("GoodsType", "status = 1 AND (org_id = ? OR type = 1)", org_id).Find(&goodInfo).Error
+	err = db.Preload("GoodsType", "status = 1 AND org_id = ?", org_id).Find(&goodInfo).Error
 	return goodInfo, err
 }
 
@@ -801,7 +805,7 @@ func FindAllWarehouse(org_id int64, types int64) (list []*models.Warehousing, er
 
 func FindAllWarehouseInfo(org_id int64, types int64) (list []*models.WarehousingInfoConfig, err error) {
 	err = readDb.Model(&models.WarehousingInfoConfig{}).Preload("WarehousingGoodInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND org_id = ?", org_id).Preload("GoodsType", "(status = 1 AND org_id = ?)OR(type = 1 AND status = 1)", org_id).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id)
+		return db.Where("status = 1 AND org_id = ?", org_id).Preload("GoodsType", "status = 1 AND org_id = ?", org_id).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id)
 	}).Where("org_id = ? AND status = 1 AND type = ?", org_id, types).Find(&list).Error
 	return list, err
 }
@@ -946,7 +950,7 @@ func FindWarehouseOutList(org_id int64, types int64) (list []*models.WarehouseOu
 
 func FindAllWarehouseOutInfo(org_id int64, types int64) (list []*models.WarehousingOutInfoConfig, err error) {
 	err = readDb.Model(&models.WarehousingOutInfoConfig{}).Preload("WarehousingGoodInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND org_id = ?", org_id).Preload("GoodsType", "(status = 1 AND org_id = ?) OR (status = 1 AND type = 1) ", org_id).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id)
+		return db.Where("status = 1 AND org_id = ?", org_id).Preload("GoodsType", "status = 1 AND org_id = ? ", org_id).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id)
 	}).Where("org_id = ? AND status = 1 AND type = ?", org_id, types).Find(&list).Error
 	return list, err
 
@@ -1172,7 +1176,7 @@ func FindStockInByManufacturerId(id int64) (total int64, err error) {
 }
 
 func FindGoodTypeByName(name string, org_id int64) (total int64) {
-	readDb.Model(&models.GoodsType{}).Where("(org_id = ? OR type = 1) AND status = 1 AND type_name = ? ", org_id, name).Count(&total)
+	readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1 AND type_name = ? ", org_id, name).Count(&total)
 	return
 }
 func FindGoodInfoByName(name string, org_id int64) (total int64) {
@@ -1215,8 +1219,8 @@ func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
 
 }
 
-func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, out_id int64) (out models.WarehouseOutInfo, err error) {
-	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND  warehouse_out_id = ?", org_id, good_type_id, good_id, out_id).First(&out).Error
+func FindStockOutInfoByTypeId(org_id int64, good_type_id int64, good_id int64, out_id int64, number string) (out models.WarehouseOutInfo, err error) {
+	err = readDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND  (warehouse_out_id = ? or warehouse_out_order_number = ?)", org_id, good_type_id, good_id, out_id, number).First(&out).Error
 	return
 }
 
@@ -1228,10 +1232,50 @@ func UpdateStockOutInfoCount(org_id int64, id int64) {
 func FindUserDetailById(org_id int64, id int64) (user []*models.AutomaticReduceDetail, err error, total int64) {
 	db := readDb.Model(&models.AutomaticReduceDetail{})
 	db = db.Preload("GoodInfo", "org_id = ? AND status = 1", org_id)
-	db = db.Preload("GoodsType", "type = 1 AND status = 1")
+	db = db.Preload("GoodsType", "status = 1")
 	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
 	db = db.Where("status = 1 AND org_id = ? AND warehouse_out_id = ? AND good_id != 0", org_id, id)
 	db = db.Count(&total)
 	err = db.Find(&user).Error
 	return
 }
+
+func UpdateStockOutInfoCount2(org_id int64, id int64, count int64) {
+	writeDb.Model(&models.WarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND id = ?", org_id, id).UpdateColumn("count", gorm.Expr("count + ?", count))
+
+}
+
+type VMWarehousingInfo struct {
+	ID            int64    `gorm:"column:id" json:"id"`
+	WarehousingId int64    `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId        int64    `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId    int64    `gorm:"column:good_type_id" json:"good_type_id"`
+	Status        int64    `gorm:"column:status" json:"status"`
+	OrgId         int64    `gorm:"column:org_id" json:"org_id"`
+	GoodInfo      GoodInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_info"`
+}
+
+func (VMWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
+type GoodInfo struct {
+	ID                int64  `gorm:"column:id" json:"id"`
+	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
+	Status            int64  `gorm:"column:status" json:"status"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id"`
+}
+
+func (GoodInfo) TableName() string {
+	return "xt_good_information"
+}
+
+func GetStockInGoodInfo(orgId int64) (stockIn []*VMWarehousingInfo, err error) {
+	err = readDb.Model(&VMWarehousingInfo{}).Preload("GoodInfo", "status = 1 AND org_id = ?", orgId).Where("org_id = ? AND status = 1", orgId).Find(&stockIn).Error
+	return
+}
+
+func GetAllStockOutUserDetail(patient_id int64, orgId int64, record_time int64) (goodUser []*models.DialysisBeforePrepare, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND record_date = ? AND status = 1", patient_id, orgId, record_time).Find(&goodUser).Error
+	return
+}