历史排班

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10537 //机构id 10344
+		subscibe.OrgId = 10164 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,7 +92,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10537 //机构id小英10344或4
+		subscibe.OrgId = 10265 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10537 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10265 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -7688,10 +7688,12 @@ func (this *DialysisApiController) GetPatientRecordList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	beforList, _ := service.GetPatientBeforRecordList(patient_id, orgId)
 	afterList, _ := service.GetPatientAfterRecordList(patient_id, orgId)
+	monitorList, _ := service.GetMonitorRecordByGroup(patient_id, orgId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"beforList": beforList,
-		"afterList": afterList,
+		"beforList":   beforList,
+		"afterList":   afterList,
+		"monitorList": monitorList,
 	})
 
 }

controllers/dialysis_record_api_controller.go

@@ -1,20 +1,22 @@
 package controllers
 
 import (
-	"XT_New/models"
 	"encoding/json"
-	"github.com/jinzhu/gorm"
 	"math"
 	"strconv"
 	"time"
 
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+
+	"fmt"
+	"net/http"
+	"net/url"
+
 	"XT_New/enums"
 	"XT_New/service"
 	"XT_New/utils"
-	"fmt"
 	"github.com/astaxie/beego"
-	"net/http"
-	"net/url"
 )
 
 func DialysisRecordAPIControllerRegistRouter() {
@@ -433,11 +435,13 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+		fmt.Println("his_advicses--------------------222222", his_advices)
 	}
 	//查询是否是开起
 	adviceConfig, _ := service.FindAdviceSettingById(adminInfo.CurrentOrgId)
 	if adviceConfig.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+		fmt.Println("his_advicses--------------------", his_advices)
 	}
 
 	_, errcode := service.GetOrgFollowIsExist(adminInfo.CurrentOrgId)

controllers/his_api_controller.go

@@ -1647,6 +1647,12 @@ func (c *HisApiController) GetHisPatientInfo() {
 				info, _ := service.GetWarehoseInfoByDrugId(subItem.DrugId, admin.CurrentOrgId)
 				if info.RetailPrice > 0 {
 					subItem.Drug.MinPrice = info.RetailPrice
+
+					service.UpdatePrescriptionAdvice(subItem.DrugId, admin.CurrentOrgId, info.RetailPrice)
+
+					service.UpdateBaseMinPrice(subItem.DrugId, admin.CurrentOrgId, info.RetailPrice)
+
+					fmt.Println("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
 				}
 			}
 		}
@@ -1659,6 +1665,11 @@ func (c *HisApiController) GetHisPatientInfo() {
 					info, _ := service.GetGoodWarehoseInfoByGoodId(subItem.ProjectId, admin.CurrentOrgId)
 					if info.Price > 0 {
 						subItem.GoodInfo.PackingPrice = info.Price
+
+						service.UpdatePrescriptionProject(subItem.ProjectId, admin.CurrentOrgId, info.Price)
+
+						service.UpdateGood(subItem.ProjectId, admin.CurrentOrgId, info.Price)
+						fmt.Println("baaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
 					}
 				}
 			}
@@ -3487,7 +3498,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								var p models.HisPrescriptionProject
 								p.PrescriptionId = tempPrescription.ID
 								p.Ctime = time.Now().Unix()
-								p.Mtime = p.Ctime
+								p.Mtime = time.Now().Unix()
 								p.PatientId = patient_id
 								p.RecordDate = theTime3.Unix()
 								p.Doctor = doctor_id
@@ -3538,6 +3549,12 @@ func (c *HisApiController) CreateHisPrescription() {
 								//	}
 								//
 								//}
+								var randNum int
+								randNum = rand.Intn(10000) + 1000
+								timestamp := time.Now().Unix()
+								tempTime := time.Unix(timestamp, 0)
+								timeFormat := tempTime.Format("20060102150405")
+								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
 
 								service.CreateNewHisProjectTwo(&p, tx)
 
@@ -3743,12 +3760,6 @@ func (c *HisApiController) CreateHisPrescription() {
 										service.CreateDoctorAdviceLog(adviceLog)
 
 										projectList = append(projectList, p)
-										var randNum int
-										randNum = rand.Intn(10000) + 1000
-										timestamp := time.Now().Unix()
-										tempTime := time.Unix(timestamp, 0)
-										timeFormat := tempTime.Format("20060102150405")
-										p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
 
 										if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
 											//新增或者编辑项目，修改对应的标签数据
@@ -3800,8 +3811,6 @@ func (c *HisApiController) CreateHisPrescription() {
 											}
 										}
 
-										service.SaveNewHisProjectTwo(&p, tx)
-
 									}
 								}
 								tx.Commit()
@@ -4116,16 +4125,6 @@ func (c *HisApiController) CreateHisPrescription() {
 			return
 		}
 	} else {
-		// 开始主事务
-		db := service.XTWriteDB()
-		tx := db.Begin()
-
-		// 在函数结束时处理事务回滚
-		defer func() {
-			if r := recover(); r != nil {
-				tx.Rollback()
-			}
-		}()
 
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
@@ -7448,11 +7447,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 			hisAdvice, err := service.GetHisDoctorAdvicesById(advice.ID)
 			if err == nil {
 				if hisAdvice.ID > 0 {
-					if hisAdvice.YbSyncStatus == 1 {
-						advice.YbSyncStatus = 0
-					}
-					advice.UpdatedTime = time.Now().Unix()
-					advice.CreatedTime = hisAdvice.CreatedTime
+
 					advice.ExecutionTime = hisAdvice.ExecutionTime
 					advice.ExecutionStaff = hisAdvice.ExecutionStaff
 					advice.ExecutionState = hisAdvice.ExecutionState
@@ -7623,22 +7618,13 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		id := int64(json["id"].(float64))
 		project.ID = id
 		temp_project, _ := service.GetHisPrescriptionProjectByID(id)
-		if temp_project.ID > 0 {
-			if temp_project.YbSyncStatus == 1 {
-				project.YbSyncStatus = 0
-			}
-			project.ExecutionStaff = temp_project.ExecutionStaff
-			project.ExecutionState = temp_project.ExecutionState
-			project.ExecutionTime = temp_project.ExecutionTime
-			project.Checker = temp_project.Checker
-			project.CheckState = temp_project.CheckState
-			project.CheckTime = temp_project.CheckTime
-			project.TeamId = temp_project.TeamId
-			project.Ctime = temp_project.Ctime
-			project.Mtime = time.Now().Unix()
-
-		}
-
+		project.ExecutionStaff = temp_project.ExecutionStaff
+		project.ExecutionState = temp_project.ExecutionState
+		project.ExecutionTime = temp_project.ExecutionTime
+		project.Checker = temp_project.Checker
+		project.CheckState = temp_project.CheckState
+		project.CheckTime = temp_project.CheckTime
+		project.TeamId = temp_project.TeamId
 	}
 	if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
 		types := int64(json["type"].(float64))

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1529,6 +1529,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: advice.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
+							tx.Commit()
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",
 								"advice": advice,

controllers/pharmacy_controller.go

@@ -91,49 +91,48 @@ func (this *PharmacyController) TodayNumber() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10480 {
-		//查询表里当天的数据
-		var wtotal int
-		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
+	//if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10480 {
+	//	//查询表里当天的数据
+	//	var wtotal int
+	//	wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
+	//
+	//	if err != nil {
+	//		utils.ErrorLog(err.Error())
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//		return
+	//	}
+	//
+	//	var itotal int
+	//	itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
+	//
+	//	drug, _ := service.GetAllBaseDrugList(orgid)
+	//	if err != nil {
+	//		utils.ErrorLog(err.Error())
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//		return
+	//	}
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"wtotal": wtotal,
+	//		"itotal": itotal,
+	//		"drug":   drug,
+	//	})
+	//	return
+	//}
 
-		if err != nil {
-			utils.ErrorLog(err.Error())
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
+	var wtotal int
+	var itotal int
+	//查找出库数量
+	wtotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 1)
 
-		var itotal int
-		itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
+	itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
 
-		drug, _ := service.GetAllBaseDrugList(orgid)
-		if err != nil {
-			utils.ErrorLog(err.Error())
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"wtotal": wtotal,
-			"itotal": itotal,
-			"drug":   drug,
-		})
-		return
-	}
-
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10480 {
-		var wtotal int
-		var itotal int
-		//查找出库数量
-		wtotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 1)
-
-		itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
-		drug, _ := service.GetAllBaseDrugList(orgid)
-		this.ServeSuccessJSON(map[string]interface{}{
-			"wtotal": wtotal,
-			"itotal": itotal,
-			"drug":   drug,
-		})
-		return
-	}
+	drug, _ := service.GetAllBaseDrugList(orgid)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"wtotal": wtotal,
+		"itotal": itotal,
+		"drug":   drug,
+	})
+	return
 
 }
 func (this *PharmacyController) IssuedDrug() {
@@ -180,7 +179,7 @@ func (this *PharmacyController) IssuedDrug() {
 	}
 
 	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 1, ids)
-
+	fmt.Println("LIST=================", list)
 	var flist []models.TmpPatientOne
 	if len(list) > 0 {
 		for _, item := range list {
@@ -248,57 +247,54 @@ func (this *PharmacyController) WaitingDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid != 10344 {
-		//查询表里当天的数据
-		var flist []*models.TmpPatient
-		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
-
-		if err != nil {
-			utils.ErrorLog(err.Error())
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-		listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
-
-		if err != nil {
-			utils.ErrorLog(err.Error())
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-		baseList, _ := service.GetAllBaseDrugListTwo(orgid)
-		this.ServeSuccessJSON(map[string]interface{}{
-			"list":     listt,
-			"baseList": baseList,
-		})
-		return
+	//if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10375 && orgid != 10480 && orgid != 10344 {
+	//	//查询表里当天的数据
+	//	var flist []*models.TmpPatient
+	//	flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
+	//
+	//	if err != nil {
+	//		utils.ErrorLog(err.Error())
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//		return
+	//	}
+	//	listt, err := service.PartitionAndLayout(stime, etime, orgid, shift, partition, flist)
+	//
+	//	if err != nil {
+	//		utils.ErrorLog(err.Error())
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//		return
+	//	}
+	//	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
+	//	this.ServeSuccessJSON(map[string]interface{}{
+	//		"list":     listt,
+	//		"baseList": baseList,
+	//	})
+	//	return
+	//}
+	fmt.Println(keyword)
+	//当未发药的人数
+	//获取排班班次
+	schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
+	var ids []int64
+	for _, item := range schedule {
+		ids = append(ids, item.PatientId)
 	}
 
-	//当天已发药的人数
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10375 || orgid == 10480 || orgid == 10344 {
+	list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0, ids)
 
-		//获取排班班次
-		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
-		var ids []int64
-		for _, item := range schedule {
-			ids = append(ids, item.PatientId)
-		}
-
-		list, _ := service.GetTodayAdviceCountOne(stime, etime, orgid, 0, ids)
-
-		var flist []models.TmpPatientOne
-		if len(list) > 0 {
-			for _, item := range list {
-				patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
-				flist = append(flist, patientlist)
-			}
+	var flist []models.TmpPatientOne
+	if len(list) > 0 {
+		for _, item := range list {
+			patientlist, _ := service.GetPatientByAdviceId(item.PatientId)
+			flist = append(flist, patientlist)
 		}
-		baseList, _ := service.GetAllBaseDrugListTwo(orgid)
-		this.ServeSuccessJSON(map[string]interface{}{
-			"list":     flist,
-			"baseList": baseList,
-		})
-		return
 	}
+	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":     flist,
+		"baseList": baseList,
+	})
+	return
 
 }
 
@@ -328,6 +324,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	}
 	var list []*models.PharmacyContent
 	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
+
 	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 	if err != nil {
 		utils.ErrorLog(err.Error())

controllers/self_drug_api_congtroller.go

@@ -4121,7 +4121,7 @@ func (this *SelfDrugApiController) GetDrugFlowDetailById() {
 			}
 			if index == 0 {
 				var count int64
-				count = list[index].OverCount + list[index].Count
+				count = list[index].FlushOverCount + list[index].Count
 				service.UpdateDrugOverCount(list[index+1].ID, count)
 			}
 

controllers/sign_api_controller.go

@@ -1,14 +1,15 @@
 package controllers
 
 import (
-	"XT_New/models"
-	"XT_New/service"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
 	"io/ioutil"
 	"time"
+
+	"XT_New/models"
+	"XT_New/service"
+	"github.com/astaxie/beego"
 )
 
 type SignApiController struct {
@@ -92,6 +93,9 @@ func SignApiRegistRouters() {
 	//加油
 	beego.Router("/api/device/toautojiayou", &SignApiController{}, "Get:ToAutoJiaYou")
 
+	//显示字段脚本
+	beego.Router("/api/device/getfieldconfiglist", &SignApiController{}, "Get:GetFieldConfigList")
+
 }
 
 // 短信服务接口
@@ -1280,3 +1284,64 @@ func (this *SignApiController) ToAutoJiaYou() {
 		service.UpdateDialysisScheduleOne(schedule.ID, item.ModeId, DialysisMachineName)
 	}
 }
+
+func (this *SignApiController) GetFieldConfigList() {
+
+	orderList, _ := service.GetDialysisOrderByUserOrgId()
+
+	if len(orderList) > 0 {
+		filedConfigList, _ := service.GetFieldConfigList(9442)
+
+		for _, item := range orderList {
+			for _, it := range filedConfigList {
+				//查询该机构该模式是否有这个字段
+				fiedConfigObj, _ := service.GetFieldConfigByOrgId(item.UserOrgId, it.FiledNameCn, it.Module)
+				if fiedConfigObj.ID == 0 {
+					config := models.FiledConfig{
+						OrgId:        item.UserOrgId,
+						Module:       it.Module,
+						FiledName:    it.FiledName,
+						FiledNameCn:  it.FiledNameCn,
+						IsShow:       2,
+						CreateTime:   time.Now().Unix(),
+						UpdateTime:   time.Now().Unix(),
+						SysModule:    it.SysModule,
+						IsWrite:      it.IsWrite,
+						IsSecondMenu: it.IsSecondMenu,
+					}
+					service.CretedConfig(config)
+				}
+			}
+		}
+	}
+
+	//filedConfig, _ := service.GetFieldConfigGroupList(7)
+	//if len(filedConfig) > 0 {
+	//	for _, item := range filedConfig {
+	//		//查询该机构
+	//		fiedConfigObj, _ := service.GetFieldConfigByOrgId(9442, item.FiledNameCn, item.Module)
+	//
+	//		if fiedConfigObj.ID == 0 {
+	//
+	//			config := models.FiledConfig{
+	//				OrgId:        9442,
+	//				Module:       item.Module,
+	//				FiledName:    item.FiledName,
+	//				FiledNameCn:  item.FiledNameCn,
+	//				IsShow:       2,
+	//				CreateTime:   time.Now().Unix(),
+	//				UpdateTime:   time.Now().Unix(),
+	//				SysModule:    item.SysModule,
+	//				IsWrite:      item.IsWrite,
+	//				IsSecondMenu: item.IsSecondMenu,
+	//			}
+	//
+	//			service.CretedConfig(config)
+	//		}
+	//	}
+	//}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

controllers/stock_in_api_controller.go

@@ -3820,6 +3820,12 @@ func (this *StockManagerApiController) AddGoodInformation() {
 		packing_unit := goodNameM["good_unit"].(string)
 		good.PackingUnit = packing_unit
 
+		number := goodNameM["number"].(string)
+		good.Number = number
+
+		register_number := goodNameM["register_number"].(string)
+		good.RegisterNumber = register_number
+
 		goods = append(goods, &good)
 
 	}
@@ -3882,6 +3888,8 @@ func (this *StockManagerApiController) AddGoodInformation() {
 				DefaultCount:                item.DefaultCount,
 				DefaultCountUnit:            item.DefaultCountUnit,
 				FirstLetter:                 item.FirstLetter,
+				RegisterNumber:              item.RegisterNumber,
+				Number:                      item.Number,
 			}
 
 			//查询同种耗材名称同种类型同种规格的耗材是否存在
@@ -8202,115 +8210,127 @@ func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	list, _ := service.GetAllBaseDrugList(orgId)
+	//list, _ := service.GetAllBaseDrugList(orgId)
 	//
 
-	for _, item := range list {
-		var sum_in_count int64
-		var sum_out_count int64
-		var flush_out_count int64
-		//var str = ""
-		//str = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit
-		//service.UpdateBaseDrugById(item.ID, drug_dosage_form_str)
-
-		//drug_dosage_form_str := service.GetDosageFormListById(item.DrugDosageForm, orgId)
-		//service.UpdateDosageFormListById(drug_dosage_form_str, item.ID)
-
-		warehouseinfo, _ := service.GetDrugWarehouseInfoByItemId(item.ID)
-		if len(warehouseinfo) > 0 {
-			for _, it := range warehouseinfo {
-				if item.MaxUnit == it.MaxUnit && item.MaxUnit != item.MinUnit {
-					it.WarehousingCount = it.WarehousingCount * item.MinNumber
-				}
+	//for _, item := range list {
+	//	var sum_in_count int64
+	//	var sum_out_count int64
+	//	var flush_out_count int64
+	//	//var str = ""
+	//	//str = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit
+	//	//service.UpdateBaseDrugById(item.ID, str)
+	//	//
+	//	//drug_dosage_form_str := service.GetDosageFormListById(item.DrugDosageForm, orgId)
+	//	//service.UpdateDosageFormListById(drug_dosage_form_str, item.ID)
+	//
+	//	warehouseinfo, _ := service.GetDrugWarehouseInfoByItemId(item.ID)
+	//	if len(warehouseinfo) > 0 {
+	//		for _, it := range warehouseinfo {
+	//			if item.MaxUnit == it.MaxUnit && item.MaxUnit != item.MinUnit {
+	//				it.WarehousingCount = it.WarehousingCount * item.MinNumber
+	//			}
+	//
+	//			if item.MaxUnit == it.MinUnit && item.MaxUnit != item.MinUnit {
+	//				it.WarehousingCount = it.WarehousingCount
+	//			}
+	//
+	//			if item.MaxUnit == it.MinUnit && item.MaxUnit == item.MinUnit {
+	//				it.WarehousingCount = it.WarehousingCount
+	//			}
+	//
+	//			sum_in_count += it.WarehousingCount
+	//		}
+	//
+	//	}
+	//	//
+	//	outList, _ := service.GetDrugWarehosueOutInfoByItemId(item.ID)
+	//	if len(outList) > 0 {
+	//		for _, it := range outList {
+	//			if item.MaxUnit == it.CountUnit && item.MaxUnit != item.MinUnit {
+	//				it.Count = it.Count * item.MinNumber
+	//			}
+	//
+	//			if item.MaxUnit == it.CountUnit && item.MaxUnit != item.MinUnit {
+	//				it.Count = it.Count
+	//			}
+	//
+	//			if item.MaxUnit == it.CountUnit && item.MaxUnit == item.MinUnit {
+	//				it.Count = it.Count
+	//			}
+	//
+	//			sum_out_count += it.Count
+	//		}
+	//	}
+	//
+	//	flush_out_count = sum_in_count - sum_out_count
+	//	fmt.Println("sum_in_count+++++++++++++", sum_in_count)
+	//	fmt.Println("sum_out_count++++++++++++++", sum_out_count)
+	//	fmt.Println("flushi_out_count===========", flush_out_count)
+	//
+	//	service.UpdateBaseDrugByIdCountTwo(item.ID, flush_out_count)
+	//}
 
-				if item.MaxUnit == it.MinUnit && item.MaxUnit != item.MinUnit {
-					it.WarehousingCount = it.WarehousingCount
-				}
+	//info, _ := service.GetDrugAllInfo(orgId)
 
-				if item.MaxUnit == it.MinUnit && item.MaxUnit == item.MinUnit {
-					it.WarehousingCount = it.WarehousingCount
-				}
+	info, _ := service.GetDrugOutAllInfo(orgId)
 
-				sum_in_count += it.WarehousingCount
-			}
+	for _, item := range info {
 
-		}
+		//dealer, _ := service.GetDealerById(item.Dealer)
 
-		outList, _ := service.GetDrugWarehosueOutInfoByItemId(item.ID)
-		if len(outList) > 0 {
-			for _, it := range outList {
-				if item.MaxUnit == it.CountUnit && item.MaxUnit != item.MinUnit {
-					it.Count = it.Count * item.MinNumber
-				}
+		manufacturer, _ := service.GetManufactureById(item.Manufacturer)
 
-				if item.MaxUnit == it.CountUnit && item.MaxUnit != item.MinUnit {
-					it.Count = it.Count
-				}
+		service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
+	}
 
-				if item.MaxUnit == it.CountUnit && item.MaxUnit == item.MinUnit {
-					it.Count = it.Count
-				}
+}
 
-				sum_out_count += it.Count
-			}
-		}
+func (this *StockManagerApiController) UpdateGoodInfoByUserOrgId() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-		flush_out_count = sum_in_count - sum_out_count
+	info, _ := service.GetAllWareHouseOutByUserOrg(orgId)
 
-		service.UpdateBaseDrugByIdCount(item.ID, flush_out_count)
-	}
+	if len(info) > 0 {
+		for _, item := range info {
+			dealer, _ := service.GetDealerById(item.Dealer)
 
-	//info, _ := service.GetDrugAllInfo(orgId)
-	//
-	//for _, item := range info {
+			//manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+
+			service.UpdateGoodInfoByUserOrgIdTwo(item.ID, dealer.DealerName)
+		}
+	}
+	//goodList, _ := service.GetAllGoodList(orgId)
 	//
-	//	dealer, _ := service.GetDealerById(item.Dealer)
+	//for _, item := range goodList {
 	//
-	//	manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	//	good_type_name := service.GetAllGoodTypeName(item.GoodTypeId, orgId)
 	//
-	//	service.UpdateDealerManufacturer(item.ID, dealer.DealerName, manufacturer.ManufacturerName)
+	//	service.UpdateGoodTypeName(item.ID, good_type_name)
 	//}
 
-}
-
-func (this *StockManagerApiController) UpdateGoodInfoByUserOrgId() {
-
-	orgId := this.GetAdminUserInfo().CurrentOrgId
-
-	//info, _ := service.GetAllWareHouseInforByUserOrg(orgId)
 	//
-	//if len(info) > 0 {
-	//	for _, item := range info {
-	//		dealer, _ := service.GetDealerById(item.Dealer)
+	//for _, item := range goodList {
 	//
-	//		manufacturer, _ := service.GetManufactureById(item.Manufacturer)
+	//	var sum_in_count int64
+	//	var sum_out_count int64
+	//	var flush_out_count int64
+	//	infor, _ := service.GetAllWarehouseSumInCount(item.ID)
+	//
+	//	for _, item := range infor {
+	//		sum_in_count += item.WarehousingCount
+	//	}
+	//
+	//	outInfo, _ := service.GetAllWarehouseSumOutCount(item.ID)
 	//
-	//		service.UpdateGoodInfoByUserOrgId(item.ID, dealer.DealerName, manufacturer.ManufacturerName)
+	//	for _, item := range outInfo {
+	//		sum_out_count += item.Count
 	//	}
+	//
+	//	flush_out_count = sum_in_count - sum_out_count
+	//
+	//	service.UpdateGoodInfoByIdOne(item.ID, flush_out_count)
 	//}
 
-	goodList, _ := service.GetAllGoodList(orgId)
-
-	for _, item := range goodList {
-
-		var sum_in_count int64
-		var sum_out_count int64
-		var flush_out_count int64
-		infor, _ := service.GetAllWarehouseSumInCount(item.ID)
-
-		for _, item := range infor {
-			sum_in_count += item.WarehousingCount
-		}
-
-		outInfo, _ := service.GetAllWarehouseSumOutCount(item.ID)
-
-		for _, item := range outInfo {
-			sum_out_count += item.Count
-		}
-
-		flush_out_count = sum_in_count - sum_out_count
-
-		service.UpdateGoodInfoById(item.ID, flush_out_count)
-	}
-
 }

models/dialysis.go

@@ -780,6 +780,22 @@ func (MonitoringRecord) TableName() string {
 	return "xt_monitoring_record"
 }
 
+type MonitoringRecordOne struct {
+	ID                     int64               `gorm:"column:id" json:"id"`
+	UserOrgId              int64               `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId              int64               `gorm:"column:patient_id" json:"patient_id"`
+	MonitoringDate         int64               `gorm:"column:monitoring_date" json:"monitoring_date"`
+	OperateTime            int64               `gorm:"column:operate_time" json:"operate_time"`
+	MonitoringTime         string              `gorm:"column:monitoring_time" json:"monitoring_time"`
+	SystolicBloodPressure  float64             `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64             `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	MonitoringRecord       []*MonitoringRecord `gorm:"ForeignKey:MonitoringDate,PatientId;AssociationForeignKey:MonitoringDate,PatientId" json:"child"`
+}
+
+func (MonitoringRecordOne) TableName() string {
+	return "xt_monitoring_record"
+}
+
 type DialysisOrders struct {
 	ID             int64        `gorm:"column:id" json:"id"`
 	DialysisDate   int64        `gorm:"column:dialysis_date" json:"dialysis_date"`

models/drug_stock.go

@@ -194,6 +194,7 @@ type DrugWarehouseOutInfo struct {
 	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 	OverCount               int64       `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	OrderId                 int64       `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ManafacturerName        string      `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {

models/good_models.go

@@ -226,6 +226,7 @@ type GoodInfoSevenThirty struct {
 	SumCancelCount              int64                `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
 	TotalCount                  int64                `gorm:"column:total_count" json:"total_count" form:"total_count"`
 	TotalCountOne               int64                `gorm:"column:total_count_one" json:"total_count_one" form:"total_count_one"`
+	TotalCountTwo               int64                `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
 }
 
 func (GoodInfoSevenThirty) TableName() string {

models/self_drug_models.go

@@ -78,6 +78,7 @@ type XtBaseDrug struct {
 	IsPharmacy             int64   `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 	DrugDosageFormName     string  `gorm:"column:drug_dosage_form_name" json:"drug_dosage_form_name" form:"drug_dosage_form_name"`
 	TotalCountOne          int64   `gorm:"column:total_count_one" json:"total_count" form:"total_count_one"`
+	TotalCountTwo          int64   `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
 }
 
 func (XtBaseDrug) TableName() string {
@@ -1137,6 +1138,7 @@ type GoodInformation struct {
 	XtGoodStockCount            []*XtGoodStockCount `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_good_stock"`
 	GoodStockCount              []*XtGoodStockCount `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_good_stock_info"`
 	WarehousingInfo             []*WarehousingInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	GoodTypeName                string              `gorm:"column:good_type_name" json:"good_type_name" form:"good_type_name"`
 }
 
 func (GoodInformation) TableName() string {

models/stock_models.go

@@ -304,6 +304,7 @@ type WarehouseOutInfo struct {
 	OverCount               int64                `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	OrderId                 int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	WarehousingInfoNight    WarehousingInfoNight `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId"`
+	DealerName              string               `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
 }
 
 func (WarehouseOutInfo) TableName() string {

service/common_service.go

@@ -1,11 +1,12 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strconv"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetInspectionMajor(orgid int64) (inspection []*models.XtInspectionReference, err error) {

service/dialysis_service.go

@@ -2459,49 +2459,26 @@ func CreatePrescriptionLog(log models.XtDialysisPrescriptionLog) error {
 
 func CreateBeforLog(log models.XtAssessmentBeforeDislysisLog) error {
 
-	ut := writeDb.Begin()
 	err := XTWriteDB().Create(&log).Error
 
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
 	return err
 }
 
 func CreateAfterDialysisLog(log models.XtAssessmentAfterDialysisLog) error {
 
-	ut := writeDb.Begin()
 	err := XTWriteDB().Create(&log).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
+
 	return err
 }
 
 func CreateDoctorAdviceLog(log models.XtDoctorAdviceLog) error {
 
-	ut := writeDb.Begin()
 	err := XTWriteDB().Create(&log).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
 	return err
 }
 
 func CreateMonitorRecordLog(log models.XtMonitorRecordLog) error {
 
-	ut := writeDb.Begin()
 	err := XTWriteDB().Create(&log).Error
-	if err != nil {
-		ut.Rollback()
-		return err
-	}
-	ut.Commit()
 	return err
 }

service/his_service.go

@@ -1,11 +1,12 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"strings"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 type VMSchedule struct {
@@ -414,14 +415,9 @@ func SaveHisPrescriptionOne(tx *gorm.DB, prescription *models.HisPrescription) (
 }
 
 func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
-	tx := writeDb.Begin()
 
-	if err = tx.Model(&models.HisPrescription{}).Save(prescription).Error; err != nil {
-		tx.Rollback()
-		return
-	}
-	tx.Commit()
-	return
+	err = writeDb.Model(&models.HisPrescription{}).Save(prescription).Error
+	return err
 }
 
 func SaveHisPrescriptionTwo(prescription *models.HisPrescription) (err error) {
@@ -941,12 +937,8 @@ func CreateNewHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB)
 	return
 }
 func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
-	tx := writeDb.Begin()
-	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {
-		tx.Rollback()
-		return
-	}
-	tx.Commit()
+
+	err = writeDb.Model(&models.HisPrescriptionProject{}).Save(project).Error
 
 	return
 }
@@ -1051,14 +1043,10 @@ func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date
 }
 
 func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
-	tx := writeDb.Begin()
 
-	if err = tx.Model(&models.HisPrescription{}).Save(&info).Error; err != nil {
-		tx.Rollback()
-		return
-	}
-	tx.Commit()
-	return
+	err = writeDb.Model(&models.HisPrescription{}).Save(&info).Error
+
+	return err
 }
 
 func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64, med_type int64) (order []*models.HisOrder, err error, total int64) {
@@ -3059,3 +3047,36 @@ func GetBatchHisProjectByIDs(ids []int64) (list []*models.HisPrescriptionProject
 	err = readDb.Model(&models.HisPrescriptionProject{}).Where("id in (?) and status = 1", ids).Find(&list).Error
 	return
 }
+
+func UpdatePrescriptionAdvice(drug_id int64, user_org_id int64, price float64) (models.HisPrescriptionAdviceTemplate, error) {
+
+	adviceTemplate := models.HisPrescriptionAdviceTemplate{}
+	err := XTWriteDB().Model(&adviceTemplate).Where("drug_id = ? and user_org_id =? and status =1", drug_id, user_org_id).Updates(map[string]interface{}{"price": price}).Error
+	return adviceTemplate, err
+}
+
+func UpdateBaseMinPrice(drug_id int64, user_org_id int64, retial_price float64) (models.BaseDrugLib, error) {
+
+	lib := models.BaseDrugLib{}
+
+	err := XTWriteDB().Model(&lib).Where("id = ? and org_id = ?", drug_id, user_org_id).Updates(map[string]interface{}{"min_price": retial_price}).Error
+	return lib, err
+}
+
+func UpdatePrescriptionProject(good_id int64, user_org_id int64, packing_price float64) (models.HisPrescriptionProjectTemplate, error) {
+
+	projectTemplate := models.HisPrescriptionProjectTemplate{}
+
+	err := XTWriteDB().Model(&projectTemplate).Where("project_id = ? and status=1 and user_org_id =?", good_id, user_org_id).Updates(map[string]interface{}{"price": packing_price}).Error
+
+	return projectTemplate, err
+}
+
+func UpdateGood(good_id int64, user_org_id int64, packing_price float64) (models.GoodInfo, error) {
+
+	goodInfo := models.GoodInfo{}
+
+	err := XTWriteDB().Where("id = ? and user_org_id = ? and status=1", good_id, user_org_id).Updates(map[string]interface{}{"packing_price": packing_price}).Error
+
+	return goodInfo, err
+}

service/patient_service.go

@@ -1550,7 +1550,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.status=1", patientID, orgID).Group("s.schedule_date")
+		Where("do.patient_id=? and do.user_org_id=?  and do.status=1 and s.status=1", patientID, orgID).Group("s.schedule_date")
 
 	if start != 0 {
 		db = db.Where("do.dialysis_date>=?", start)
@@ -4039,3 +4039,16 @@ func GetPatientAfterRecordList(patient_id int64, user_org_id int64) (after []*mo
 
 	return after, err
 }
+
+func GetMonitorRecordByGroup(patient_id int64, user_org_id int64) (monitor []*models.MonitoringRecordOne, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id =? and status=1 and monitoring_date>=1711900800", patient_id, user_org_id).Order("id desc").Preload("MonitoringRecord", "status=1 and user_org_id =? and monitoring_date>=1711900800", user_org_id).Group("monitoring_date").Limit(5).Find(&monitor).Error
+
+	return monitor, err
+}
+
+func GetMonitorRecordList(patient_id int64, monitor_date int64, user_org_id int64) (monitor []*models.MonitoringRecord, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and user_org_id =? and monitoring_date = ? and status =1", patient_id, user_org_id, monitor_date).Find(&monitor).Error
+	return monitor, err
+}

service/secondary_service.go

@@ -1,13 +1,14 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"math/rand"
 	"strconv"
 	"time"
+
+	"XT_New/models"
+	"XT_New/utils"
+	"github.com/jinzhu/gorm"
 )
 
 // 生成编号，规则为:"SH-"+4位随机数
@@ -1152,7 +1153,7 @@ func DeleteSecondOrderInfo(id int64) error {
 
 func GetStockFlowOrderList(good_id int64, user_org_id int64) (list []*models.VmStockFlow, err error) {
 
-	err = XTReadDB().Where("good_id = ? and user_org_id =?  and status=1", good_id, user_org_id).Order("ctime asc").Find(&list).Error
+	err = XTReadDB().Where("good_id = ? and user_org_id =?  and status=1", good_id, user_org_id).Order("id asc").Find(&list).Error
 	return list, err
 }
 

service/self_drug_service.go

@@ -3339,6 +3339,13 @@ func GetDrugAllInfo(org_id int64) (warehouseInfo []*models.DrugWarehouseInfo, er
 	return warehouseInfo, err
 }
 
+func GetDrugOutAllInfo(org_id int64) (warehouseInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status= 1 and ctime>=1672502400 and ctime<=1704038399", org_id).Find(&warehouseInfo).Error
+
+	return warehouseInfo, err
+}
+
 func UpdateDealerManufacturer(id int64, dealer_name string, manufactruer string) (err error) {
 
 	warehouseInfo := models.DrugWarehouseInfo{}
@@ -3347,16 +3354,24 @@ func UpdateDealerManufacturer(id int64, dealer_name string, manufactruer string)
 	return err
 }
 
+func UpdateDealerManufacturerOne(id int64, manufactruer string) (err error) {
+
+	warehouseInfo := models.DrugWarehouseOutInfo{}
+	err = XTWriteDB().Model(&warehouseInfo).Where("id = ? and status =1", id).Updates(map[string]interface{}{"manafacturer_name": manufactruer}).Error
+
+	return err
+}
+
 func GetDrugWarehouseInfoByItemId(drug_id int64) (list []*models.XtDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("drug_id = ? and status=1 and is_check=1 and ctime<1640966400", drug_id).Find(&list).Error
+	err = XTReadDB().Where("drug_id = ? and status=1 and is_check=1 and ctime<1704038399", drug_id).Find(&list).Error
 
 	return list, err
 }
 
 func GetDrugWarehosueOutInfoByItemId(drug_id int64) (list []*models.XtDrugWarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("drug_id = ? and status=1 and is_check=1 and ctime<1640966400", drug_id).Find(&list).Error
+	err = XTReadDB().Where("drug_id = ? and status=1 and is_check=1 and ctime<1704038399", drug_id).Find(&list).Error
 
 	return list, err
 }
@@ -3368,9 +3383,23 @@ func UpdateBaseDrugByIdCount(drug_id int64, flush_count int64) (models.XtBaseDru
 	return drug, err
 }
 
+func UpdateBaseDrugByIdCountTwo(drug_id int64, flush_count int64) (models.XtBaseDrug, error) {
+
+	drug := models.XtBaseDrug{}
+	err := XTWriteDB().Model(&drug).Model(&drug).Where("id = ? and status=1", drug_id).Updates(map[string]interface{}{"total_count_two": flush_count}).Error
+	return drug, err
+}
+
 func GetAllWareHouseInforByUserOrg(org_id int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Where("org_id =? and status =1 and is_check=1 and ctime>=1640966400 and ctime<=1703952000", org_id).Find(&info).Error
+	err = XTReadDB().Where("org_id =? and status =1 and is_check=1 and ctime>=1672502400 and ctime<=1703952000", org_id).Find(&info).Error
+
+	return info, err
+}
+
+func GetAllWareHouseOutByUserOrg(org_id int64) (info []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("org_id =? and status =1 and is_check=1 and ctime>=1672502400 and ctime<=1703952000", org_id).Find(&info).Error
 
 	return info, err
 }
@@ -3382,16 +3411,23 @@ func UpdateGoodInfoByUserOrgId(id int64, dealer_name string, manufactruer string
 	return err
 }
 
+func UpdateGoodInfoByUserOrgIdTwo(id int64, dealer_name string) (err error) {
+
+	WarehouseOutInfo := models.WarehouseOutInfo{}
+	err = XTWriteDB().Model(&WarehouseOutInfo).Where("id = ? and status =1", id).Updates(map[string]interface{}{"dealer_name": dealer_name}).Error
+	return err
+}
+
 func GetAllWarehouseSumInCount(org_id int64) (infor []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Where("id = ? and status =1 and is_check =1 and ctime<1640966400", org_id).Find(&infor).Error
+	err = XTReadDB().Where("id = ? and status =1 and is_check =1 and ctime<1704038399", org_id).Find(&infor).Error
 
 	return infor, err
 }
 
 func GetAllWarehouseSumOutCount(org_id int64) (infor []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("id = ? and status =1 and is_check =1 and ctime<1640966400", org_id).Find(&infor).Error
+	err = XTReadDB().Where("id = ? and status =1 and is_check =1 and ctime<1704038399", org_id).Find(&infor).Error
 
 	return infor, err
 }
@@ -3402,3 +3438,10 @@ func UpdateGoodInfoById(id int64, total_count_one int64) error {
 
 	return err
 }
+
+func UpdateGoodInfoByIdOne(id int64, total_count_one int64) error {
+
+	err := XTWriteDB().Model(&models.GoodInfoSevenThirty{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"total_count_two": total_count_one}).Error
+
+	return err
+}

service/sign_service.go

@@ -1,14 +1,15 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"bytes"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+
+	"XT_New/models"
+	"XT_New/utils"
 	"github.com/astaxie/beego"
 	//"github.com/jung-kurt/gofpdf"
 	"io/ioutil"
@@ -2224,3 +2225,39 @@ func UpdateSchedulePatient(patient_id int64, schedule_date int64, zone_id int64,
 	err := XTWriteDB().Model(&models.XtSchedule{}).Where("patient_id = ? and schedule_date =? and partition_id = ? and bed_id =?", patient_id, schedule_date, zone_id, bed_id).Updates(map[string]interface{}{"status": 1}).Error
 	return err
 }
+
+func GetDialysisOrderByUserOrgId() (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("status=1").Group("user_org_id").Find(&order).Error
+
+	return order, err
+}
+
+func GetFieldConfigGroupList(module int64) (filedConfig []*models.FiledConfig, err error) {
+
+	err = XTReadDB().Where("module = ?", module).Group("filed_name").Order("filed_name_cn asc").Find(&filedConfig).Error
+
+	return filedConfig, err
+}
+
+func GetFieldConfigByOrgId(org_id int64, field_name_cn string, module int64) (fiedConfig models.FiledConfig, err error) {
+
+	err = XTReadDB().Where("org_id = ? and filed_name_cn = ? and module =?", org_id, field_name_cn, module).Find(&fiedConfig).Error
+
+	return fiedConfig, err
+}
+
+func CretedConfig(config models.FiledConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+
+	return err
+}
+
+func GetFieldConfigList(user_org_id int64) (filedConfig []*models.FiledConfig, err error) {
+
+	err = XTReadDB().Where("org_id =?", user_org_id).Find(&filedConfig).Error
+
+	return filedConfig, err
+
+}

service/stock_service.go

@@ -3738,7 +3738,7 @@ func CreateGoodsInfomation(info *models.GoodInfo) error {
 
 func UpdateGoodsInformation(info *models.GoodInfo, goodName string, goodType int64, specificationName string, orgid int64) error {
 
-	err := XTWriteDB().Model(&info).Where("good_name = ? and good_type_id = ? and specification_name = ? and org_id = ? and status = 1", goodName, goodType, specificationName, orgid).Updates(map[string]interface{}{"good_name": info.GoodName, "good_type_id": info.GoodTypeId, "medical_insurance_level": info.MedicalInsuranceLevel, "good_kind": info.GoodKind, "specification_name": info.SpecificationName, "manufacturer": info.Manufacturer, "good_unit": info.GoodUnit, "retail_price": info.RetailPrice, "stock_warn_count": info.StockWarnCount, "dealer": info.Dealer, "pinyin": info.Pinyin, "wubi": info.Wubi, "buy_price": info.BuyPrice, "medical_insurance_number": info.MedicalInsuranceNumber, "is_special_diseases": info.IsSpecialDiseases, "is_record": info.IsRecord, "statistics_category": info.StatisticsCategory, "good_status": info.GoodStatus, "social_security_directory_code": info.SocialSecurityDirectoryCode, "production_type": info.ProductionType, "special_medical": info.SpecialMedical, "remark": info.Remark}).Error
+	err := XTWriteDB().Model(&info).Where("good_name = ? and good_type_id = ? and specification_name = ? and org_id = ? and status = 1", goodName, goodType, specificationName, orgid).Updates(map[string]interface{}{"good_name": info.GoodName, "good_type_id": info.GoodTypeId, "medical_insurance_level": info.MedicalInsuranceLevel, "good_kind": info.GoodKind, "specification_name": info.SpecificationName, "manufacturer": info.Manufacturer, "good_unit": info.GoodUnit, "retail_price": info.RetailPrice, "stock_warn_count": info.StockWarnCount, "dealer": info.Dealer, "pinyin": info.Pinyin, "wubi": info.Wubi, "buy_price": info.BuyPrice, "medical_insurance_number": info.MedicalInsuranceNumber, "is_special_diseases": info.IsSpecialDiseases, "is_record": info.IsRecord, "statistics_category": info.StatisticsCategory, "good_status": info.GoodStatus, "social_security_directory_code": info.SocialSecurityDirectoryCode, "production_type": info.ProductionType, "special_medical": info.SpecialMedical, "remark": info.Remark, "number": info.Number, "register_number": info.RegisterNumber}).Error
 	return err
 }
 
@@ -8132,13 +8132,8 @@ func UpdateGoodInfoSumCountSix(goodid int64, sum_count int64, orgid int64) error
 }
 
 func UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) error {
-	tx := XTWriteDB().Begin()
-	err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	tx.Commit()
+
+	err = XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
 	return err
 
 }
@@ -8892,6 +8887,25 @@ func GetGoodTypeObj(goodid int64, org_id int64) (models.GoodsType, error) {
 	return goodsType, err
 }
 
+func GetAllGoodTypeName(good_type_id int64, org_id int64) (good_type_name string) {
+
+	goodsTypeList, _ := GetAllGoodType(org_id)
+	for _, item := range goodsTypeList {
+		if good_type_id == item.ID {
+			good_type_name = item.TypeName
+		}
+	}
+	return good_type_name
+}
+
+func UpdateGoodTypeName(good_id int64, good_type_name string) (models.GoodInformation, error) {
+
+	information := models.GoodInformation{}
+
+	err := XTWriteDB().Model(&information).Where("id = ? and status =1", good_id).Updates(map[string]interface{}{"good_type_name": good_type_name}).Error
+	return information, err
+}
+
 func GetSencondeGoodWarehouseInfo(good_id int64, org_id int64) (info []*models.WarehousingInfo, err error) {
 
 	err = XTReadDB().Where("good_id = ? and org_id= ? and status= 1 and is_check = 1", good_id, org_id).Find(&info).Error