耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/device_api_controller.go

@@ -772,6 +772,7 @@ func (this *DeviceAPIController) CreateNumber() {
 	num := this.GetString("number")
 	zoneID, _ := this.GetInt64("zone")
 	groupID, _ := this.GetInt64("group")
+	sort, _ := this.GetInt64("sort")
 	if len(num) == 0 || zoneID <= 0 || groupID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -800,7 +801,7 @@ func (this *DeviceAPIController) CreateNumber() {
 
 	_, errcode := service.GetCreateDeviceNumber(num, adminInfo.CurrentOrgId)
 	if errcode == gorm.ErrRecordNotFound {
-		number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID)
+		number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID, sort)
 		if createErr != nil {
 			this.ErrorLog("创建机号失败:%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
@@ -813,6 +814,7 @@ func (this *DeviceAPIController) CreateNumber() {
 			"group_id":   number.GroupID,
 			"zone_name":  zone.Name,
 			"group_name": group.Name,
+			"sort":       number.Sort,
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"number": numberJson,
@@ -834,7 +836,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 	num := this.GetString("number")
 	zoneID, _ := this.GetInt64("zone")
 	groupID, _ := this.GetInt64("group")
-
+	sort, _ := this.GetInt64("sort")
 	if id <= 0 || len(num) == 0 || zoneID <= 0 || groupID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -874,6 +876,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 	number.Number = num
 	number.ZoneID = zoneID
 	number.GroupID = groupID
+	number.Sort = sort
 	byName, _ := service.GetDeviceNumberByName(num, adminInfo.CurrentOrgId)
 	if byName.ID > 0 && byName.ID != id {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -893,6 +896,7 @@ func (this *DeviceAPIController) ModifyNumber() {
 		"group_id":   number.GroupID,
 		"zone_name":  zone.Name,
 		"group_name": group.Name,
+		"sort":       number.Sort,
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"number": numberJson,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1711,7 +1711,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 		//如果有数据就插入
@@ -3090,7 +3090,9 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 			}
 		}
+		//去重
 		updateBeforePrepares = RemoveRepeatedGood(updateBeforePrepares)
+
 		if len(updateBeforePrepares) > 0 {
 			for _, item := range updateBeforePrepares {
 				errs = service.UpdateDialysisBeforePrepareTwo(item)
@@ -4119,6 +4121,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 	consumables, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
 
+	//去重
 	consumables = RemoveRepeatedGood(consumables)
 
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)

controllers/stock_good_api_controller.go

@@ -39,6 +39,8 @@ func (c *StockGoodApiController) CreateGoodType() {
 	remark := c.GetString("remark")
 	out_stock := c.GetString("out_stock")
 	outStockInt, _ := strconv.ParseInt(out_stock, 10, 64)
+	stock_attribute := c.GetString("stock_attribute")
+	stockAttribute, _ := strconv.ParseInt(stock_attribute, 10, 64)
 	adminUserInfo := c.GetAdminUserInfo()
 	totals := service.FindGoodTypeByName(type_name, adminUserInfo.CurrentOrgId)
 	if totals > 0 {
@@ -50,15 +52,16 @@ func (c *StockGoodApiController) CreateGoodType() {
 	code := strconv.FormatInt(total+1, 10)
 	code = "34000000" + code
 	goodType := models.GoodsType{
-		TypeCode: code,
-		TypeName: type_name,
-		Remark:   remark,
-		Ctime:    time.Now().Unix(),
-		Mtime:    time.Now().Unix(),
-		OrgId:    adminUserInfo.CurrentOrgId,
-		Creater:  adminUserInfo.AdminUser.Id,
-		Status:   1,
-		OutStock: outStockInt,
+		TypeCode:       code,
+		TypeName:       type_name,
+		Remark:         remark,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		OrgId:          adminUserInfo.CurrentOrgId,
+		Creater:        adminUserInfo.AdminUser.Id,
+		Status:         1,
+		OutStock:       outStockInt,
+		StockAttribute: stockAttribute,
 	}
 	err, types := service.AddSigleGoodType(&goodType)
 	if err == nil {
@@ -78,7 +81,8 @@ func (c *StockGoodApiController) ModifyGoodType() {
 	out_stock := c.GetString("out_stock")
 	outStockInt, _ := strconv.ParseInt(out_stock, 10, 64)
 	adminUserInfo := c.GetAdminUserInfo()
-
+	stock_attribute := c.GetString("stock_attribute")
+	stockAttribute, _ := strconv.ParseInt(stock_attribute, 10, 64)
 	//totals := service.FindGoodTypeByName(type_name, adminUserInfo.CurrentOrgId)
 	//if totals > 0 {
 	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodTypeNameExistError)
@@ -86,16 +90,17 @@ func (c *StockGoodApiController) ModifyGoodType() {
 	//}
 
 	goodType := models.GoodsType{
-		ID:       id,
-		TypeCode: good_type_code,
-		TypeName: type_name,
-		Remark:   remark,
-		Ctime:    time.Now().Unix(),
-		Mtime:    time.Now().Unix(),
-		OrgId:    adminUserInfo.CurrentOrgId,
-		Modifier: adminUserInfo.AdminUser.Id,
-		Status:   1,
-		OutStock: outStockInt,
+		ID:             id,
+		TypeCode:       good_type_code,
+		TypeName:       type_name,
+		Remark:         remark,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		OrgId:          adminUserInfo.CurrentOrgId,
+		Modifier:       adminUserInfo.AdminUser.Id,
+		Status:         1,
+		OutStock:       outStockInt,
+		StockAttribute: stockAttribute,
 	}
 	err, types := service.ModifyGoodType(&goodType)
 	if err == nil {

models/device_models.go

@@ -148,6 +148,7 @@ type DeviceNumber struct {
 	Status     int8   `json:"-"`
 	CreateTime int64  `gorm:"column:ctime" json:"-"`
 	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (DeviceNumber) TableName() string {

models/good_models.go

@@ -1,19 +1,20 @@
 package models
 
 type GoodsType 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"`
-	OutStock int64  `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
+	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"`
+	OutStock       int64  `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
+	StockAttribute int64  `gorm:"column:stock_attribute" json:"stock_attribute" form:"stock_attribute"`
 }
 
 func (GoodsType) TableName() string {

service/device_service.go

@@ -459,7 +459,7 @@ func GetCreateDeviceNumber(num string, orgid int64) (*models.DeviceNumber, error
 	return &number, nil
 }
 
-func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64) (*models.DeviceNumber, error) {
+func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64, sort int64) (*models.DeviceNumber, error) {
 	now := time.Now().Unix()
 	numberModel := models.DeviceNumber{
 		OrgID:      orgID,
@@ -469,6 +469,7 @@ func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64)
 		Status:     1,
 		CreateTime: now,
 		ModifyTime: now,
+		Sort:       sort,
 	}
 	err := writeDb.Model(&models.DeviceNumber{}).Create(&numberModel).Error
 	if err != nil {
@@ -492,7 +493,7 @@ func UpdateDeviceNumber(number *models.DeviceNumber) error {
 		tx.Rollback()
 		return updateNumberErr
 	}
-	updateDeviceErr := tx.Model(&models.Device{}).Where("org_id = ? AND device_number_id = ?", number.OrgID, number.ID).Updates(map[string]interface{}{"device_number": number.Number}).Error
+	updateDeviceErr := tx.Model(&models.Device{}).Where("org_id = ? AND device_number_id = ?", number.OrgID, number.ID).Updates(map[string]interface{}{"device_number": number.Number, "sort": number.Sort}).Error
 	if updateDeviceErr != nil {
 		tx.Rollback()
 		return updateDeviceErr

service/mobile_dialysis_service.go

@@ -1354,7 +1354,7 @@ func GetDialysisCountByPatientId(startime int64, endtime int64, patientid int64,
 }
 
 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", orgID, patient_id, recordDate).Find(&consumables).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
 }
 

service/stock_service.go

@@ -129,11 +129,12 @@ func AddSigleGoodType(goodType *models.GoodsType) (error, *models.GoodsType) {
 
 func ModifyGoodType(goodType *models.GoodsType) (error, *models.GoodsType) {
 	err := writeDb.Model(&models.GoodsType{}).Where("id = ? AND status = 1", goodType.ID).Updates(map[string]interface{}{
-		"modifier":  goodType.Modifier,
-		"mtime":     time.Now().Unix(),
-		"remark":    goodType.Remark,
-		"type_name": goodType.TypeName,
-		"out_stock": goodType.OutStock,
+		"modifier":        goodType.Modifier,
+		"mtime":           time.Now().Unix(),
+		"remark":          goodType.Remark,
+		"type_name":       goodType.TypeName,
+		"out_stock":       goodType.OutStock,
+		"stock_attribute": goodType.StockAttribute,
 	}).Error
 	return err, goodType