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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = prod
+runmode = dev
 #dev/prod
 
 #

controllers/dialysis_api_controller.go

@@ -1354,6 +1354,8 @@ func (c *DialysisApiController) PostDouleCheck() {
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
 	employee_number := c.GetString("employee_number")
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
+	needle_batch_number := c.GetString("needle_batch_number")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1424,6 +1426,8 @@ func (c *DialysisApiController) PostDouleCheck() {
 		UpdatedTime:                time.Now().Unix(),
 		CheckDate:                  recordDate.Unix(),
 		EmployeeNumber:             employee_number,
+		DialyzerBatchNumber:        dialyzer_batch_number,
+		NeedleBatchNumber:          needle_batch_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -1461,6 +1465,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.UpdatedTime = time.Now().Unix()
 		doubleCheck.ID = check.ID
+
 		redis := service.RedisClient()
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
@@ -5136,7 +5141,7 @@ func (this *DialysisApiController) GetDialysisGoodTotalCount() {
 	var ids []string
 
 	ids = strings.Split(partion_type, ",")
-	fmt.Println("ids------------------------", ids)
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)

controllers/his_api_controller.go

@@ -1475,7 +1475,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
 														// 查询该药品最后一次出库记录
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
 

controllers/his_hospital_api_controller.go

@@ -38,6 +38,8 @@ func HisHospitalManagerApiRegistRouters() {
 
 	beego.Router("/api/monthhospitaldetail/get", &HisHospitalApiController{}, "get:GetHisHospitalMonthDetailInfo")
 
+	beego.Router("/api/exportuncharge/get", &HisHospitalApiController{}, "get:GetExportHisHospitalUnChargeData")
+
 }
 func (c *HisHospitalApiController) RefundDetail() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -1056,3 +1058,29 @@ func (c *HisHospitalApiController) GetHisHospitalMonthDetailInfo() {
 		"his_info":            record,
 	})
 }
+
+func (c *HisHospitalApiController) GetExportHisHospitalUnChargeData() {
+	start_time_str := c.GetString("start_time")
+	end_time_str := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	adminInfo := c.GetAdminUserInfo()
+	theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordStartTime := theStartTime.Unix()
+	theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordEndTime := theEndTime.Unix()
+	//var prescriptions []*models.HisPrescription
+	var prescriptions []*models.ExportHisPrescription
+	prescriptions, _ = service.GetUnChargeHisHospitalPrescription(adminInfo.CurrentOrgId, recordStartTime, recordEndTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"month_prescriptions": prescriptions,
+	})
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -744,7 +744,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
 	employee_number := c.GetString("employee_number")
-
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
+	needle_batch_number := c.GetString("needle_batch_number")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -828,6 +829,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		CheckDate:                  recordDate.Unix(),
 		UpdatedTime:                time.Now().Unix(),
 		EmployeeNumber:             employee_number,
+		DialyzerBatchNumber:        dialyzer_batch_number,
+		NeedleBatchNumber:          needle_batch_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -840,6 +843,19 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 			order, _ := service.GetDialysisOrder(recordDate.Unix(), id, adminUserInfo.Org.Id)
 			doubleCheck.Creater = order.StartNurse
 		}
+
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			//查询未核对的医嘱
+			doctorList, err := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			for _, advice := range doctorList {
+				if advice.ExecutionStaff == modifier {
+
+					c.ErrorLog("医嘱核对人不能和执行人为同一人!", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.AdviceCodeParamWrong)
+					return
+				}
+			}
+		}
 		err := service.AddSigleDoubleCheck(&doubleCheck)
 
 		//针对长沙南雅
@@ -848,6 +864,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 			doctorList, _ := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
 			if len(doctorList) > 0 && modifier > 0 {
 				for _, advice := range doctorList {
+
 					service.UpdateDoctorAdviceList(advice.ID, modifier)
 					key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 					redis := service.RedisClient()
@@ -885,7 +902,23 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.ID = check.ID
 		doubleCheck.EmployeeNumber = employee_number
+		doubleCheck.NeedleBatchNumber = needle_batch_number
+		doubleCheck.DialyzerBatchNumber = dialyzer_batch_number
+
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			//查询未核对的医嘱
+			doctorList, err := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			for _, advice := range doctorList {
+				if advice.ExecutionStaff == modifier {
+
+					c.ErrorLog("医嘱核对人不能和执行人为同一人!", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.AdviceCodeParamWrong)
+					return
+				}
+			}
+		}
 		err := service.UpdateDoubleCheck(&doubleCheck)
+
 		//针对长沙南雅
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
 			//查询未核对的医嘱
@@ -1696,6 +1729,13 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			if prescribing_number == 0 {
 				prescribing_number = 1
 			}
+			if prescribing_number == 0 && id == 14682 {
+				prescribing_number = 2
+			}
+
+			if prescribing_number == 0 && id == 18560 {
+				prescribing_number = 2
+			}
 			advice := models.DoctorAdvice{
 				UserOrgId:             adminUserInfo.Org.Id,
 				PatientId:             id,
@@ -3289,6 +3329,32 @@ func (c *DialysisAPIController) PostSolution() {
 		}
 	}
 
+	if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 {
+
+		if solution.PrescribingNumber == 0 {
+			solution.PrescribingNumber = 1
+		}
+		if prescription.PrescribingNumber == 0 {
+			prescription.PrescribingNumber = 1
+		}
+
+		if solution.PrescribingNumber == 0 && id == 14682 {
+			solution.PrescribingNumber = 2
+		}
+
+		if solution.PrescribingNumber == 0 && id == 18560 {
+			solution.PrescribingNumber = 2
+		}
+
+		if prescription.PrescribingNumber == 0 && id == 14682 {
+			prescription.PrescribingNumber = 2
+		}
+
+		if prescription.PrescribingNumber == 0 && id == 18560 {
+			prescription.PrescribingNumber = 2
+		}
+	}
+
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 	//获取最新1条
 	dialysisSolution, _ := service.GetLastPatientDialysisSolution(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -163,7 +163,7 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/updatestockgoods", &DialysisAPIController{}, "Get:UpdateStockGoods")
 
-	beego.Router("/m/api/getmobileschedulelist", &DialysisAPIController{}, "Get:GetMobileScheduleList")
+	//beego.Router("/m/api/getmobileschedulelist", &DialysisAPIController{}, "Get:GetMobileScheduleList")
 
 	beego.Router("/m/api/getrolelist", &DialysisAPIController{}, "Get:GetRoleList")
 

controllers/schedule_api_controller.go

@@ -1260,6 +1260,10 @@ func (c *ScheduleApiController) GetSchedules() {
 	partition_id, _ := c.GetInt64("partition_id")
 	schedule_type, _ := c.GetInt64("schedule_type")
 
+	is_before, _ := c.GetInt64("is_before")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
 	adminInfo := c.GetAdminUserInfo()
 
 	thisTime := time.Now()
@@ -1303,6 +1307,14 @@ func (c *ScheduleApiController) GetSchedules() {
 	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
 	weekStartPoint := theStarTime.Unix()
 	weekEndPoint := theEndTime.Unix()
+	if is_before > 0 {
+		timeLayout := "2006-01-02 15:04:05"
+		loc, _ := time.LoadLocation("Local")
+		theStarTime, _ := time.ParseInLocation(timeLayout, start_time, loc)
+		theEndTime, _ := time.ParseInLocation(timeLayout, end_time, loc)
+		weekStartPoint = theStarTime.Unix()
+		weekEndPoint = theEndTime.Unix()
+	}
 
 	schdules, _ := service.GetWeekScheduleOne(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, partition_id, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -4322,11 +4334,9 @@ func (c *ScheduleApiController) GetScheduleOne() {
 
 	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
 	patitionIdStr := c.GetString("patitionid")
-
 	ids := strings.Split(patitionIdStr, ",")
 	fmt.Println("patitonStr", ids)
 	schedule_type, _ := c.GetInt64("schedule_type")
-
 	adminInfo := c.GetAdminUserInfo()
 
 	thisTime := time.Now()
@@ -4372,7 +4382,6 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	weekEndPoint := theEndTime.Unix()
 
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
-
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days":           days,

controllers/self_drug_api_congtroller.go

@@ -2722,9 +2722,9 @@ func (this *SelfDrugApiController) GetStorehouseList() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	list, err := service.GetAllStoreHouseList(orgId)
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
-	goodType, _ := service.GetAllGoodType(orgId)
-	patientList, _ := service.GetAllpatient(orgId)
+	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
+	goodType, _ := service.GetAllNewGoodType(orgId)
+	patientList, _ := service.GetAllpatientThirty(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取仓库失败")
 		return
@@ -2761,16 +2761,16 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	}
 
 	var ids []int64
-	var goodIds []int64
+	//var goodIds []int64
 	manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
 	for _, it := range manufacturerList {
 		ids = append(ids, it.ID)
 	}
 
-	infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
-	for _, it := range infoList {
-		goodIds = append(goodIds, it.GoodId)
-	}
+	//infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
+	//for _, it := range infoList {
+	//	goodIds = append(goodIds, it.GoodId)
+	//}
 
 	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids)
 
@@ -3262,7 +3262,7 @@ func (this *SelfDrugApiController) GetPurchaseDrugQuery() {
 	for _, it := range infoList {
 		infoIds = append(infoIds, it.DrugId)
 	}
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 	list, total, err := service.GetDrugPurchaseStockQuery(good_type, keyword, page, limit, orgId, startTime, endTime, ids, infoIds)
 
 	for _, item := range list {
@@ -3428,7 +3428,6 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	for _, it := range infoList {
 		goodIds = append(goodIds, it.DrugId)
 	}
-	//list, total, err := service.GetDrugNewQuery(orgId, storehouse_id, good_type, keyword, page, limit, ids, goodIds, startTime, endTime)
 
 	countList, total, err := service.GetDrugStockCountList(orgId, storehouse_id, good_type, keyword, page, limit, ids, goodIds, startTime, endTime)
 
@@ -3441,8 +3440,7 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, orgId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total": total,
-		//"list":  list,
+		"total":        total,
 		"drugTypeList": drugTypeList,
 		"countList":    countList,
 	})
@@ -3665,7 +3663,7 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 	for _, it := range manufacturers {
 		ids = append(ids, it.ID)
 	}
-	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 	list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
 	for _, item := range list {
@@ -3680,18 +3678,6 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 
 		item.GoodEndFlowInfo = flow
 
-		//获取期初结余数量
-		//infoList, _ := service.GetStartGoodWarehouseInfoList(item.ID, orgId, startTime)
-		//for _, it := range infoList {
-		//  item.WarehousingInfoStart = append(item.WarehousingInfoStart, it)
-		//}
-		//
-		////获取期末结余数量
-		//warehouseInfoList, _ := service.GetEndGoodWarehouseInfoList(item.ID, orgId, endTime)
-		//for _, it := range warehouseInfoList {
-		//  item.WarehousingInfoEnd = append(item.WarehousingInfoEnd, it)
-		//}
-
 		//获取期间增加
 		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
 		for _, it := range goodWarehouseInfoList {
@@ -3720,63 +3706,6 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 		}
 
-		////获取期初结余
-		//info, _ := service.FindeStartFlowInfo(item.ID, orgId, startTime)
-		//for _, it := range info {
-		//  item.StartFlowInfo = append(item.StartFlowInfo, it)
-		//}
-		////获取期初结余
-		//flowOutInfo, _ := service.FindeStartFlowOutInfo(item.ID, orgId, startTime)
-		//for _, it := range flowOutInfo {
-		//  item.StartOutFlowInfo = append(item.StartOutFlowInfo, it)
-		//}
-		//
-		////获取期初退库
-		//cancelInfo, _ := service.FindeStartCancelInfo(item.ID, orgId, startTime)
-		//for _, it := range cancelInfo {
-		//  item.StartCancelFlowInfo = append(item.StartCancelFlowInfo, it)
-		//}
-
-		////获取期末结余
-		//flowInfo, _ := service.FindEndStartFlowInfo(item.ID, orgId, endTime)
-		//for _, it := range flowInfo {
-		//  item.EndFlowInfo = append(item.EndFlowInfo, it)
-		//}
-		//
-		////获取期末出库
-		//lowOutInfo, _ := service.FindeEndFLowOutInfo(item.ID, orgId, endTime)
-		//for _, it := range lowOutInfo {
-		//  item.EndFlowOutInfo = append(item.EndFlowOutInfo, it)
-		//}
-		//
-		////获取期末退库
-		//endCancelInfo, _ := service.FindEndCancelInfo(item.ID, orgId, endTime)
-		//for _, it := range endCancelInfo {
-		//  item.EndCancelFLowInfo = append(item.EndCancelFLowInfo, it)
-		//}
-
-		////期初盘赢
-		//inventory, _ := service.FindeStartStockInventoryProfit(item.ID, orgId, startTime)
-		//for _, it := range inventory {
-		//  item.WareStartStockInventoryProfit = append(item.WareStartStockInventoryProfit, it)
-		//}
-		////期初盘亏
-		//stockInventory, _ := service.FindStartStockInventoryLosses(item.ID, orgId, startTime)
-		//for _, it := range stockInventory {
-		//  item.WareStartStockInventoryLosses = append(item.WareStartStockInventoryLosses, it)
-		//}
-
-		////期末盘盈
-		//inventoryProfit, _ := service.FindeStartStockInventoryProfit(item.ID, orgId, endTime)
-		//for _, it := range inventoryProfit {
-		//  item.WareEndStockInventoryProfit = append(item.WareEndStockInventoryProfit, it)
-		//}
-		////期末盘亏
-		//inventoryLosses, _ := service.FindStartStockInventoryLosses(item.ID, orgId, endTime)
-		//for _, it := range inventoryLosses {
-		//  item.WareEndStockInventoryLosses = append(item.WareEndStockInventoryLosses, it)
-		//}
-
 		//期中盘盈
 		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
 		for _, it := range profit {

enums/error_code.go

@@ -275,6 +275,8 @@ const ( // ErrorCode
 	ErrorCodeDelScheduleFailByDialysisTwo = 60000003
 
 	ErrorCodeSyncWrong = 60000006
+
+	AdviceCodeParamWrong = 600000007
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -533,6 +535,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodePatientDialysisOrderTwo:      "被替换的患者已经上机,无法替换排班",
 	ErrorCodePatientScheduleRepeat:        "一天只能存在一次排班",
 	ErrorCodeDelScheduleFailByDialysisTwo: "已经上机透析，不能操作排班",
+	AdviceCodeParamWrong:                  "医嘱核对人和执行人不能为同一人,请更换第二核对人!",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -549,6 +549,8 @@ type DoubleCheck struct {
 	CheckTime                  int64  `gorm:"column:check_time" json:"check_time"`
 	FirstCheckTime             int64  `gorm:"column:first_check_time" json:"first_check_time"`
 	EmployeeNumber             string `gorm:"column:employee_number" json:"employee_number" form:"employee_number"`
+	DialyzerBatchNumber        string `gorm:"column:dialyzer_batch_number" json:"dialyzer_batch_number" form:"dialyzer_batch_number"`
+	NeedleBatchNumber          string `gorm:"column:needle_batch_number" json:"needle_batch_number" form:"needle_batch_number"`
 }
 
 func (DoubleCheck) TableName() string {

models/drug.go

@@ -100,6 +100,18 @@ func (BaseDrugLibSeven) TableName() string {
 	return "xt_base_drug"
 }
 
+type BaseDrugLibTen struct {
+	ID                  int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId               int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	TotalCount          int64 `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	DrugStockLimitCount int64 `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
+	Status              int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (BaseDrugLibTen) TableName() string {
+	return "xt_base_drug"
+}
+
 type DrugUnitSafeguard struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	Unit             string `gorm:"column:unit" json:"unit" form:"unit"`

models/drug_stock.go

@@ -94,6 +94,19 @@ func (DrugWarehouseInfo) TableName() string {
 	return "xt_drug_warehouse_info"
 }
 
+type DrugWarehouseInfoTen struct {
+	StockMaxNumber int64 `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber int64 `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	StorehouseId   int64 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck        int64 `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId          int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (DrugWarehouseInfoTen) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+
 type DrugWarehouseInfoSeven struct {
 	StockMaxNumber int64 `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
 	StockMinNumber int64 `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`

models/good_models.go

@@ -22,6 +22,18 @@ func (GoodsType) TableName() string {
 	return "xt_goods_type"
 }
 
+type NewGoodsType 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"`
+}
+
+func (NewGoodsType) TableName() string {
+	return "xt_goods_type"
+}
+
 type GoodInfo struct {
 	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
 	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
@@ -146,6 +158,17 @@ func (GoodInfoSeven) TableName() string {
 	return "xt_good_information"
 }
 
+type GoodInfoTen struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	TotalCount int64 `gorm:"column:total_count" json:"total_count" form:"total_count"`
+}
+
+func (GoodInfoTen) TableName() string {
+	return "xt_good_information"
+}
+
 type GoodsTypeOne struct {
 	ID             int64                    `gorm:"column:id" json:"id"`
 	TypeCode       string                   `gorm:"column:type_code" json:"type_code"`

models/his_models.go

@@ -132,6 +132,7 @@ type HisPatient struct {
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
 }
 
 func (HisPatient) TableName() string {
@@ -2522,3 +2523,34 @@ type GoodHisPrescriptionProject struct {
 func (GoodHisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+type ExportHisPrescription 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"`
+	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status                 int64                     `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime                int64                     `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	Total                  string                    `gorm:"-" json:"total" form:"total"`
+	PType                  int64                     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	IsMedicine             int64                     `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+}
+
+func (ExportHisPrescription) TableName() string {
+	return "his_prescription"
+}

models/new_stock_models.go

@@ -144,6 +144,37 @@ func (NewBaseDrug) TableName() string {
 	return "xt_base_drug"
 }
 
+type NewBaseDrugOne struct {
+	ID                  int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName            string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec            string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugStockLimit      string                 `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	MaxUnit             string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber           int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit             string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                string                 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit            string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	RetailPrice         float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice            float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice           float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	Number              string                 `gorm:"column:number" json:"number" form:"number"`
+	OrgId               int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugWarehouseInfo   []*VsDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	XtDrugStockCount    []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_count"`
+	DrugStockCount      []*XtDrugStockCount    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_stock_info"`
+	TotalCount          int64                  `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	IsUser              int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	BatchRetaiPrice     float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	DrugStockLimitCount int64                  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
+	SumCount            int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount          int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	IsPharmacy          int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+}
+
+func (NewBaseDrugOne) TableName() string {
+	return "xt_base_drug"
+}
+
 type XtDialysisSetting 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"`
@@ -184,28 +215,50 @@ func (XtDialysisSetting) TableName() string {
 }
 
 type VmStockFlowTwenty struct {
-	ID                  int64           `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId       int64           `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	GoodId              int64           `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	Count               int64           `gorm:"column:count" json:"count" form:"count"`
-	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"`
-	SystemTime          int64           `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType      int64           `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys               int64           `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	Price               float64         `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId int64           `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	BuyPrice            float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	IsRead              int64           `gorm:"column:is_read" json:"is_read" form:"is_read"`
-	OverCount           int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	Ctime               int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	WarehousingInfo     WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"xt_warehouse_info"`
+	ID                  int64              `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId       int64              `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId              int64              `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count               int64              `gorm:"column:count" json:"count" form:"count"`
+	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"`
+	SystemTime          int64              `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType      int64              `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys               int64              `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	Price               float64            `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId int64              `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	BuyPrice            float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	IsRead              int64              `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount           int64              `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	Ctime               int64              `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	WarehousingInfo     NewWarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"xt_warehouse_info"`
 }
 
 func (VmStockFlowTwenty) TableName() string {
 	return "xt_stock_flow"
 }
 
+type VmNewStockFlowTwenty struct {
+	ID                  int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId       int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId              int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count               int64   `gorm:"column:count" json:"count" form:"count"`
+	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"`
+	SystemTime          int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType      int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys               int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	Price               float64 `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	BuyPrice            float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	IsRead              int64   `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount           int64   `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	Ctime               int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+}
+
+func (VmNewStockFlowTwenty) TableName() string {
+	return "xt_stock_flow"
+}
+
 type GoodInfoTwenty struct {
 	ID                     int64                   `gorm:"column:id" json:"id" form:"id"`
 	SpecificationName      string                  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
@@ -216,7 +269,6 @@ type GoodInfoTwenty struct {
 	OrgId                  int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	GoodName               string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	RetailPrice            float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	Ctime                  int64                   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	PackingUnit            string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	PackingPrice           float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	StWarehousingInfo      []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`

models/schedule_models.go

@@ -59,6 +59,30 @@ func (Schedule) TableName() string {
 	return "xt_schedule"
 }
 
+type ScheduleTwo struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport     int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+
+	Patient                   string               `gorm:"-" json:"patient" form:"patient"`
+	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisMachineName       string               `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+}
+
+func (ScheduleTwo) TableName() string {
+	return "xt_schedule"
+}
+
 type SchedulePatients 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"`

models/stock_models.go

@@ -1614,3 +1614,44 @@ type GoodWarehousingInfo struct {
 func (GoodWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type BloodManufacturer struct {
+	ID               int64  `gorm:"column:id" json:"id"`
+	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id"`
+	Status           int64  `gorm:"column:status" json:"status"`
+}
+
+func (BloodManufacturer) TableName() string {
+	return "xt_manufacturer"
+}
+
+type GoodQueryNewWarehousingInfo struct {
+	ID      int64 `gorm:"column:id" json:"id"`
+	GoodId  int64 `gorm:"column:good_id" json:"good_id"`
+	Status  int64 `gorm:"column:status" json:"status"`
+	OrgId   int64 `gorm:"column:org_id" json:"org_id"`
+	IsCheck int64 `gorm:"column:is_check" json:"is_check" form:"is_check"`
+}
+
+func (GoodQueryNewWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
+type NewWarehousingInfo 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"`
+	Price            float64 `gorm:"column:price" json:"price"`
+	Status           int64   `gorm:"column:status" json:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id"`
+	WarehouseInfoId  int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice     float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	IsCheck          int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	StockCount       int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+}
+
+func (NewWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}

routers/router.go

@@ -19,8 +19,7 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	// beego.Router("/", &controllers.MainController{})
-
+	beego.Router("/", &controllers.MainController{})
 	controllers.VerifyUserLoginControllerRegistRouters()
 	controllers.RoleAPIControllerRegistRouters()
 	controllers.PatientApiRegistRouters()

service/dialysis_service.go

@@ -1480,7 +1480,7 @@ func GetDialysisBeforePrepare(goodTypeId int64, goodId int64, orgid int64, patie
 
 func CreateDialysisBeforePrepareOne(prepare *models.DialysisBeforePrepare) error {
 
-	err := XTReadDB().Create(&prepare).Error
+	err := XTWriteDB().Create(&prepare).Error
 	return err
 }
 
@@ -1593,7 +1593,7 @@ func GetAllPcAdvicestByList(orgID int64, scheduleDate int64) (advices []*VMDocto
 	advice_list_str, _ := redis.Get(key).Result()
 
 	if len(advice_list_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? and id desc ", orgID, scheduleDate).Find(&advices).Error
+		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ?", orgID, scheduleDate).Find(&advices).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(advices) <= 0 {

service/dialysis_solution_service.go

@@ -203,7 +203,7 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id []
 	//if partition_id > 0 {
 	//	db = db.Where("partition_id = ?", partition_id)
 	//}
-	fmt.Println("len-------------", len(partition_id))
+
 	if len(partition_id) > 0 {
 		db = db.Where("partition_id in(?)", partition_id)
 	}

service/doctor_schedule_service.go

@@ -58,7 +58,7 @@ func GetClassNameIsExsit(classname string, orgid int64, id int64) (schedule mode
 
 func UpdateScheduleList(id int64, schedules *models.DoctorSchedules) error {
 
-	err := XTReadDB().Model(&schedules).Where("id=?", id).Updates(map[string]interface{}{"class_name": schedules.ClassName, "class_attributes": schedules.ClassAttributes, "timeone_start": schedules.TimeoneStart, "timeone_type": schedules.TimeoneType, "timeone_end": schedules.TimeoneEnd, "timetwo_start": schedules.TimetwoStart, "timetwo_type": schedules.TimetwoType, "timetwo_end": schedules.TimetwoEnd, "work_time": schedules.WorkTime, "remarks": schedules.Remarks, "minute": schedules.Minute, "mtime": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&schedules).Where("id=?", id).Updates(map[string]interface{}{"class_name": schedules.ClassName, "class_attributes": schedules.ClassAttributes, "timeone_start": schedules.TimeoneStart, "timeone_type": schedules.TimeoneType, "timeone_end": schedules.TimeoneEnd, "timetwo_start": schedules.TimetwoStart, "timetwo_type": schedules.TimetwoType, "timetwo_end": schedules.TimetwoEnd, "work_time": schedules.WorkTime, "remarks": schedules.Remarks, "minute": schedules.Minute, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -129,7 +129,7 @@ func AddSchedule(schedule *models.StaffSchedule) error {
 }
 
 func UpdateStaffList(schedule *models.StaffSchedule, id int64) error {
-	err := XTReadDB().Model(&schedule).Where("id=?", id).Updates(map[string]interface{}{"doctor_id": schedule.DoctorId, "doctor_type": schedule.DoctorType, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "schedule_date": schedule.ScheduleDate, "mtime": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&schedule).Where("id=?", id).Updates(map[string]interface{}{"doctor_id": schedule.DoctorId, "doctor_type": schedule.DoctorType, "schedule_type": schedule.ScheduleType, "schedule_week": schedule.ScheduleWeek, "schedule_date": schedule.ScheduleDate, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -768,14 +768,14 @@ func GetPatientScheduleIsExist(startime int64, schedule_type int64, bed_id int64
 
 func CreateDialysisPrescription(prescription *models.DialysisPrescription) error {
 
-	err := XTReadDB().Create(&prescription).Error
+	err := XTWriteDB().Create(&prescription).Error
 
 	return err
 }
 
 func CreateDialysisSolution(solution models.DialysisSolution) error {
 
-	err := XTReadDB().Create(&solution).Error
+	err := XTWriteDB().Create(&solution).Error
 	return err
 }
 

service/his_hospital_service.go

@@ -565,3 +565,17 @@ func GetHisPrescriptionProjectByIDTwo(id int64) (projects models.HisPrescription
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("id = ? AND status = 1", id).First(&projects).Error
 	return
 }
+
+func GetUnChargeHisHospitalPrescription(org_id int64, start_time int64, end_time int64) (prescription []*models.ExportHisPrescription, err error) {
+	err = readDb.Model(&models.ExportHisPrescription{}).
+		Preload("Patients", "status = 1").
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND  record_date <= ? AND record_date >= ?  AND  order_status =  4 AND p_type = 1", org_id, end_time, start_time).
+		Find(&prescription).Error
+	return
+}

service/his_print_service.go

@@ -18,18 +18,108 @@ func GetBatchDrugHisPrescription(ids []string, record_time int64, user_org_id in
 	return
 }
 
+type HisPrintPrescriptionProject struct {
+	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64    `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64      `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string     `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string     `gorm:"column:day" json:"day" form:"day"`
+	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64      `gorm:"column:type" json:"type" form:"type"`
+	Doctor             int64      `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime      int64      `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff     int64      `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState     int64      `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime          int64      `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState         int64      `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker            int64      `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime          int64      `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId             int64      `gorm:"column:team_id" json:"team_id" form:"team_id"`
+
+	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	ExecutionFrequencyId int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+}
+
+type HisProject struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+}
+
+func (HisProject) TableName() string {
+	return "xt_his_project"
+}
+
+func (HisPrintPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
 func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id int64) (patients []*models.PrintPatient, err error) {
 	readDb.Model(&models.PrintPatient{}).Preload("HisPrintPatient", "status = 1 AND record_date = ?", record_time).
 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Joins("Join xt_his_project p On p.id = his_prescription_project.project_id  AND p.cost_classify != 3").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
+					return db.Joins("").Joins("Join xt_his_project p On p.id = his_prescription_project.project_id ").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).
 		Where("id in (?) AND user_org_id = ?  ", ids, user_org_id).Find(&patients)
-	return
 
+	return
 }
 
 func GetBatchInspectionProjectHisPrescription(ids []string, record_time int64, user_org_id int64) (patients []*models.PrintPatient, err error) {

service/his_project_service.go

@@ -149,7 +149,7 @@ func UpdatedDepartment(id int64, department *models.XtHisDepartment) error {
 
 func DeleteDepartment(id int64) error {
 	department := models.XtHisDepartment{}
-	err := XTReadDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&department).Where("id=? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -258,7 +258,7 @@ func GetAllDepartMent(orgid int64) (department []*models.XtHisDepartment, err er
 
 func CreateHisPatient(patient *models.XtHisPatient) error {
 
-	err := XTReadDB().Model(&patient).Create(&patient).Error
+	err := XTWriteDB().Model(&patient).Create(&patient).Error
 	return err
 }
 

service/mobile_dialysis_service.go

@@ -4357,8 +4357,14 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 func UpdateStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
 
 	prepare := models.DialysisBeforePrepare{}
+	var err error
+	if count > 0 {
+		err = XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
+	}
+	if count <= 0 {
+		err = XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count, "status": 0}).Error
+	}
 
-	err := XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
 	return err
 }
 

service/new_warehouse_service.go

@@ -1497,11 +1497,14 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_number", deliver_number)
-		fmt.Println("out_count", out_count)
-		fmt.Println("cancel_count", cancel_count)
+		//fmt.Println("deliver_number", deliver_number)
+		//fmt.Println("out_count", out_count)
+		//fmt.Println("cancel_count", cancel_count)
+		//
+		//fmt.Println("出库数据", deliver_number)
+		//fmt.Println("出库流水---------------------", out_count, cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		if deliver_number > (out_count - cancel_count) {
+		if deliver_number >= (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 				WarehouseOutId:          warehouseout.ID,

service/patientmanage_service.go

@@ -1839,7 +1839,7 @@ func DeleteSummary(ids []string) error {
 
 func CreateHisSummary(summary *models.XtHospitalSummary) error {
 
-	err := XTReadDB().Create(&summary).Error
+	err := XTWriteDB().Create(&summary).Error
 	return err
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -85,26 +85,31 @@ func (PatientVM) TableName() string {
 }
 
 type DialysisOrderVM struct {
-	ID             int64           `gorm:"column:id" json:"id"`
-	DialysisDate   int64           `gorm:"column:dialysis_date" json:"dialysis_date"`
-	PatientID      int64           `gorm:"column:patient_id" json:"patient_id"`
-	Stage          int64           `gorm:"column:stage" json:"stage"`
-	BedID          int64           `gorm:"column:bed_id" json:"bed_id"`
-	StartNurse     int64           `gorm:"column:start_nurse" json:"start_nurse"`
-	FinishNurse    int64           `gorm:"column:finish_nurse" json:"finish_nurse"`
-	StartTime      int64           `gorm:"column:start_time" json:"start_time"`
-	EndTime        int64           `gorm:"column:end_time" json:"end_time"`
-	PunctureNurse  int64           `gorm:"column:puncture_nurse" json:"puncture_nurse"`
-	DeviceNumber   *DeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
-	Creator        int64           `gorm:"column:creator" json:"creator"`
-	Modifier       int64           `gorm:"column:modifier" json:"modifier"`
-	FinishCreator  int64           `gorm:"column:finish_creator" json:"finish_creator"`
-	FinishModifier int64           `gorm:"column:finish_modifier" json:"finish_modifier"`
-	SchedualType   int64           `gorm:"column:schedual_type" json:"schedual_type"`
-	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
-	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	QualityNurseId int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
-	Url            string          `gorm:"column:url" json:"url" form:"url"`
+	ID                 int64           `gorm:"column:id" json:"id"`
+	DialysisDate       int64           `gorm:"column:dialysis_date" json:"dialysis_date"`
+	PatientID          int64           `gorm:"column:patient_id" json:"patient_id"`
+	Stage              int64           `gorm:"column:stage" json:"stage"`
+	BedID              int64           `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse         int64           `gorm:"column:start_nurse" json:"start_nurse"`
+	FinishNurse        int64           `gorm:"column:finish_nurse" json:"finish_nurse"`
+	StartTime          int64           `gorm:"column:start_time" json:"start_time"`
+	EndTime            int64           `gorm:"column:end_time" json:"end_time"`
+	PunctureNurse      int64           `gorm:"column:puncture_nurse" json:"puncture_nurse"`
+	DeviceNumber       *DeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
+	Creator            int64           `gorm:"column:creator" json:"creator"`
+	Modifier           int64           `gorm:"column:modifier" json:"modifier"`
+	FinishCreator      int64           `gorm:"column:finish_creator" json:"finish_creator"`
+	FinishModifier     int64           `gorm:"column:finish_modifier" json:"finish_modifier"`
+	SchedualType       int64           `gorm:"column:schedual_type" json:"schedual_type"`
+	WashpipeNurse      int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	UserOrgId          int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	QualityNurseId     int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
+	Url                string          `gorm:"column:url" json:"url" form:"url"`
+	BloodAccessId      int64           `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
+	DialysisIrrigation string          `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisDialyszers string          `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	PunctureWay        string          `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
+	PunctureNeedle     string          `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
 }
 
 func (DialysisOrderVM) TableName() string {

service/schedule_service.go

@@ -111,7 +111,7 @@ func GetWeekScheduleOne(orgID int64, start, end int64, partionid int64, schedule
 	return
 }
 
-func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.Schedule, err error) {
+func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.ScheduleTwo, err error) {
 
 	db := readDb.Table("xt_schedule as s")
 	if len(schIds) > 0 {
@@ -154,7 +154,7 @@ func GetScheduleTotalCount(orgID int64, start, end int64, schIds []string, sched
 
 }
 
-func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.Schedule, err error) {
+func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.ScheduleTwo, err error) {
 
 	db := readDb.Table("xt_schedule as s")
 
@@ -496,14 +496,57 @@ type WeekSchedulePrintVM struct {
 	Mode         *models.TreatmentMode `gorm:"ForeignKey:ModeID" json:"mode"`
 }
 
+type WeekSchedulePrintPatients 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"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (WeekSchedulePrintPatients) TableName() string {
+	return "xt_patients"
+}
+
+type WeekSchedulePrintDeviceNumber struct {
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Number     string `gorm:"column:number" json:"number"`
+	GroupID    int64  `gorm:"column:group_id" json:"group_id"`
+	ZoneID     int64  `gorm:"column:zone_id" json:"zone_id"`
+	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
+}
+
+func (WeekSchedulePrintDeviceNumber) TableName() string {
+	return "xt_device_number"
+}
+
+type WeekSchedulePrintVMTwo struct {
+	ID             int64 `gorm:"column:id" json:"id"`
+	ZoneID         int64 `gorm:"column:partition_id" json:"zone_id"`
+	DeviceNumberID int64 `gorm:"column:bed_id" json:"device_number_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"`
+
+	Patient      *WeekSchedulePrintPatients     `gorm:"ForeignKey:PatientID" json:"patient"`
+	DeviceNumber *WeekSchedulePrintDeviceNumber `gorm:"ForeignKey:DeviceNumberID" json:"device_number"`
+	Zone         *models.DeviceZone             `gorm:"ForeignKey:ZoneID" json:"zone"`
+	Mode         *models.TreatmentMode          `gorm:"ForeignKey:ModeID" json:"mode"`
+}
+
 type PrintCount struct {
 	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
 	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week"`
 	Count        int64
 }
 
-func GetPrinitWeekSchedules(orgID int64, start, end int64) ([]*WeekSchedulePrintVM, error) {
-	var schedules []*WeekSchedulePrintVM
+func GetPrinitWeekSchedules(orgID int64, start, end int64) ([]*WeekSchedulePrintVMTwo, error) {
+	var schedules []*WeekSchedulePrintVMTwo
 	err := readDb.Table("xt_schedule as s").
 		Preload("Patient", "status = 1 and user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 and org_id = ?", orgID).
@@ -878,7 +921,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("SchedulesPatientsVM", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ? and user_org_id = ? ", scheduleDate, orgid).Preload("DialysisPrescription", "status = 1 and record_date =? and user_org_id = ?", scheduleDate, orgid).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
@@ -1186,7 +1229,7 @@ func GetSettingById(id int64) (*models.XtRemindPrintSetting, error) {
 
 func CreateSetting(setting *models.XtRemindPrintSetting) error {
 
-	err := XTReadDB().Create(&setting).Error
+	err := XTWriteDB().Create(&setting).Error
 	return err
 }
 

service/self_drug_service.go

@@ -1196,7 +1196,7 @@ func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo,
 	return info, err
 }
 
-func GetManufacturerListByKeyword(orgid int64, keyword string) (list []*models.Manufacturer, err error) {
+func GetManufacturerListByKeyword(orgid int64, keyword string) (list []*models.BloodManufacturer, err error) {
 
 	likeKey := "%" + keyword + "%"
 	db := XTReadDB().Model(&list).Where("status = 1")
@@ -1249,7 +1249,7 @@ func GetGoodWarehouseInfoByOrgId(orgid int64, storehouse_id int64) (info []*mode
 	return info, err
 }
 
-func GetGoodWarehouseInfoByOrgIdTwo(orgid int64) (info []*models.WarehousingInfo, err error) {
+func GetGoodWarehouseInfoByOrgIdTwo(orgid int64) (info []*models.GoodQueryNewWarehousingInfo, err error) {
 	db := XTReadDB().Model(&info).Where("is_check =1 and status =1")
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
@@ -1805,7 +1805,7 @@ func GetDrugNewQuery(orgId int64, storehouse_id int64, good_type int64, keyword
 	return drug, total, err
 }
 
-func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, keyword string, page int64, limit int64, ids []int64, goodIds []int64, startime int64, endtime int64) (drug []*models.NewBaseDrug, total int64, err error) {
+func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, keyword string, page int64, limit int64, ids []int64, goodIds []int64, startime int64, endtime int64) (drug []*models.NewBaseDrugOne, total int64, err error) {
 
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
@@ -1894,7 +1894,7 @@ func GetGoodInformationWarehouseInfo(good_id int64, orgid int64) (info []*models
 
 func UpdateGoodInformation(id int64, orgid int64, total_count int64) error {
 
-	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"total_count": total_count}).Error
+	err := XTWriteDB().Model(&models.GoodInfoTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"total_count": total_count}).Error
 	return err
 }
 
@@ -1904,7 +1904,7 @@ func GetBaseDrugName(orgid int64) (drug []*models.BaseDrugLibTwenty, err error)
 	return drug, err
 }
 
-func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWarehouseInfoTen, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and org_id = ? and is_check = 1 and (stock_max_number >0 or stock_min_number > 0) and status = 1", drugid, orgid).Find(&info).Error
 	return info, err
@@ -1912,7 +1912,7 @@ func GetDrugWarehouseInfoName(drugid int64, orgid int64) (info []*models.DrugWar
 
 func UpdateDrugById(id int64, orgid int64, limit_count int64, total_count int64) error {
 
-	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "total_count": total_count}).Error
+	err := XTWriteDB().Model(&models.BaseDrugLibTen{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_stock_limit_count": limit_count, "total_count": total_count}).Error
 	return err
 }
 

service/stock_service.go

@@ -3594,11 +3594,10 @@ func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error
 	return list, err
 }
 
-//func GetAllManufacturerListTX(orgid int64,tx *gorm.DB) (list []*models.Manufacturer, err error) {
-//
-//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
-//	return list, err
-//}
+func GetNewAllManufacturerList(orgid int64) (list []*models.BloodManufacturer, err error) {
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	return list, err
+}
 
 func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
 
@@ -3706,6 +3705,12 @@ func GetAllGoodType(orgid int64) (goodsType []*models.GoodsType, err error) {
 	return goodsType, err
 }
 
+func GetAllNewGoodType(orgid int64) (goodsType []*models.NewGoodsType, err error) {
+
+	err = XTReadDB().Model(&goodsType).Where("org_id = ? and status = 1", orgid).Find(&goodsType).Error
+	return goodsType, err
+}
+
 func GetDepartMentByName(name string, orgid int64) (*models.XtHisDepartment, error) {
 
 	var department models.XtHisDepartment
@@ -5642,7 +5647,7 @@ func GetLastGoodWarehouseOut(orgid int64) (models.WarehouseOut, error) {
 
 func CreateWarehouseInfo(info models.WarehousingInfo) error {
 
-	err := XTReadDB().Create(&info).Error
+	err := XTWriteDB().Create(&info).Error
 	return err
 }
 
@@ -8225,7 +8230,7 @@ func GetSettleOpenConfig(user_org_id int64) (*models.HisSettleStockConfig, error
 
 func CreateSettleOpenConfig(config models.HisSettleStockConfig) error {
 
-	err := XTReadDB().Create(&config).Error
+	err := XTWriteDB().Create(&config).Error
 	return err
 }