历史排班

controllers/base_api_controller.go

@@ -71,9 +71,9 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 841
+		userAdmin.Id = 809
 		userAdmin.Mobile = "15717313968"
-		userAdmin.Id = 841 //4，809
+		userAdmin.Id = 809 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10340 //机构id 10344
+		subscibe.OrgId = 9671 //机构id 10344
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3467  //4
+		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3244 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -316,10 +316,9 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 841
+		userAdmin.Id = 809
 		userAdmin.Mobile = "15717313968"
-
-		userAdmin.Id = 841 //4，809
+		userAdmin.Id = 809 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -327,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10340 //机构id小英10344或4
+		subscibe.OrgId = 9671 //机构id小英10344或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,8 +336,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3467  //4
+		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3244 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/common_api_controller.go

@@ -740,6 +740,8 @@ func (this *CommonApiController) GetDialysislist() {
 
 	//按排班
 	scheduleCount, _ := service.GetScheduleModeIdCount(statime, entime, orgId, page, 1000)
+
+	scheduleList, _ := service.GetDialysisScheduleList(statime, entime, page, limit, orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -753,6 +755,7 @@ func (this *CommonApiController) GetDialysislist() {
 		"count":            count,
 		"modeIdCount":      modeIdCount,
 		"scheduleCount":    scheduleCount,
+		"scheduleList":     scheduleList,
 	})
 }
 

controllers/dialysis_api_controller.go

@@ -2127,6 +2127,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.AfterUrea = data.AfterUrea
 	assessment.PipCoagulation = data.PipCoagulation
 	assessment.AccumulatedBloodVolume = data.AccumulatedBloodVolume
+	assessment.TransfusionVolume = data.TransfusionVolume
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {

controllers/his_api_controller.go

@@ -3857,8 +3857,8 @@ func (c *HisApiController) DeletePrescription() {
 					if item.Type == 3 && item.IsOut == 1 {
 						good, _ := service.FindGoodInfoByIdTwo(item.ProjectId)
 						f_count, _ := strconv.ParseFloat(item.Count, 64)
-						good.Total = good.Total + f_count
-						service.UpdateGoodInfo(&good)
+						//good.Total = good.Total + f_count
+						//service.UpdateGoodInfo(&good)
 						operation_time := time.Now().Unix()
 						creater := c.GetAdminUserInfo().AdminUser.Id
 						//创建退库单
@@ -3975,6 +3975,21 @@ func (c *HisApiController) DeletePrescription() {
 								service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
 								//出库数量减少
 								service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, total_count)
+
+								//防止先出库 后开药的情况,查找当天是否出库完全
+								numberList, _ := service.GetHisPrescriptionNumberList(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
+								if len(numberList) == 0 {
+									infor, _ := service.GetWarehouseOutnfoByProjectId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
+
+									for _, item := range infor {
+										//退库数量
+										service.UpdateWarehouseInfoByProject(item.ProjectId, item.WarehouseInfotId, c.GetAdminUserInfo().CurrentOrgId, item.Count)
+									}
+
+									//清空数据表
+									service.UpdateWarehouseInfoByPatientId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
+
+								}
 							}
 
 							if info.Count < total_count {
@@ -4081,6 +4096,20 @@ func (c *HisApiController) DeletePrescription() {
 							//更新基础库库存
 							service.UpdateGoodInfoSumCountSix(item.ProjectId, flush_count, c.GetAdminUserInfo().CurrentOrgId)
 
+							//防止先出库 后开药的情况,查找当天是否出库完全
+							numberList, _ := service.GetHisPrescriptionNumberList(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
+							if len(numberList) == 0 {
+								infor, _ := service.GetWarehouseOutnfoByProjectId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
+
+								for _, item := range infor {
+									//退库数量
+									service.UpdateWarehouseInfoByProject(item.ProjectId, item.WarehouseInfotId, c.GetAdminUserInfo().CurrentOrgId, item.Count)
+								}
+
+								//清空数据表
+								service.UpdateWarehouseInfoByPatientId(item.ProjectId, item.RecordDate, c.GetAdminUserInfo().CurrentOrgId, item.PatientId)
+
+							}
 						}
 
 					}
@@ -4137,8 +4166,7 @@ func (c *HisApiController) DeletePrescription() {
 					for _, it := range goodList {
 						flush_count += it.StockCount
 					}
-					fmt.Println("历史出库数据", info.Count)
-					fmt.Println("出库数量", total_count)
+
 					if info.ID > 0 {
 						cancelStockInfo := models.CancelStockInfo{
 							GoodId:          item.ProjectId,
@@ -4184,7 +4212,6 @@ func (c *HisApiController) DeletePrescription() {
 									flush_count_one += it.StockCount
 								}
 								//查询该批次是否有退库数据
-								//flow, _ := service.GetWarehouseStockFlow(it.WarehouseInfotId, it.GoodId, c.GetAdminUserInfo().CurrentOrgId, it.PatientId, it.SysRecordTime)
 								creater := c.GetAdminUserInfo().AdminUser.Id
 
 								flow := models.VmStockFlow{
@@ -4222,48 +4249,10 @@ func (c *HisApiController) DeletePrescription() {
 								}
 								service.CreateStockFlowOne(flow)
 
-								//if flow.ID > 0 {
-								//	service.AddCountFlowOne(it.WarehouseInfotId, it.GoodId, c.GetAdminUserInfo().CurrentOrgId, it.PatientId, it.Count, it.SysRecordTime, flush_count_one)
-								//}
 							}
 
 						}
 
-						//flow := models.VmStockFlow{
-						//	WarehousingId:           info.WarehouseInfotId,
-						//	GoodId:                  item.ProjectId,
-						//	Number:                  info.Number,
-						//	LicenseNumber:           info.LicenseNumber,
-						//	Count:                   prescribingNumber,
-						//	UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-						//	PatientId:               item.PatientId,
-						//	SystemTime:              info.SysRecordTime,
-						//	ConsumableType:          7,
-						//	IsSys:                   0,
-						//	WarehousingOrder:        "",
-						//	WarehouseOutId:          info.WarehouseOutId,
-						//	WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-						//	IsEdit:                  0,
-						//	CancelStockId:           cancel.ID,
-						//	CancelOrderNumber:       cancel.OrderNumber,
-						//	Manufacturer:            manufacturer.ID,
-						//	Dealer:                  0,
-						//	Creator:                 c.GetAdminUserInfo().CurrentOrgId,
-						//	UpdateCreator:           0,
-						//	Status:                  1,
-						//	Ctime:                   time.Now().Unix(),
-						//	Mtime:                   0,
-						//	Price:                   info.Price,
-						//	WarehousingDetailId:     info.WarehouseInfotId,
-						//	WarehouseOutDetailId:    info.ID,
-						//	CancelOutDetailId:       cancelInfo.ID,
-						//	ProductDate:             info.ProductDate,
-						//	ExpireDate:              info.ExpiryDate,
-						//	StorehouseId:            houseConfig.StorehouseOutInfo,
-						//	OverCount:               flush_count,
-						//}
-						//service.CreateStockFlowOne(flow)
-
 						//退库数量增加
 						service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
 						//出库数量减少
@@ -4272,11 +4261,13 @@ func (c *HisApiController) DeletePrescription() {
 						//查询已出库数量
 						dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
 
+						//如果当前处方数量 小于 出库数量
 						if prescribingNumber < dialysisInfo.Count {
 							//改变数量
 							service.UpdateAutoGood(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId, item.ID, prescribingNumber)
 						}
 
+						//如果当前处方数量 大于或者等于出库数量
 						if prescribingNumber >= dialysisInfo.Count {
 							//删除出库表
 							service.DeleteAutoRedeceDetailTwenty(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId, item.ID)
@@ -4290,7 +4281,7 @@ func (c *HisApiController) DeletePrescription() {
 
 						//更新库存
 						msgerrkonde := service.UpdateSumGood(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, flush_count_one)
-						fmt.Println("msgerrkonde23332323", msgerrkonde)
+						fmt.Println("msgerrkonde", msgerrkonde)
 
 						//更新基础库库存
 						service.UpdateGoodInfoReduceSumCount(item.ProjectId, flush_count_one, c.GetAdminUserInfo().CurrentOrgId)

controllers/manage_api_controller.go

@@ -5402,9 +5402,9 @@ func (this *MachineApiController) GetObjectDisInfectionLongTime() {
 
 func (this *MachineApiController) GetInformationmanalist() {
 
-	//获取5月1日到5月27日的上机患者
+	//获取2022年8月1日到10月16日的上机患者
 
-	list, _ := service.GetDialysisOrderPatient(9538)
+	list, _ := service.GetDialysisOrderPatient(10101)
 
 	for _, dialysisOrder := range list {
 
@@ -5885,6 +5885,7 @@ func (this *MachineApiController) GetNewAirWayDisinfectList() {
 	}
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, total, err := service.GetNewAirWayDisinfectList(limit, page, startTime, endTime, orgId)
+	fmt.Println("lisitwoowowow", list)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1386,7 +1386,8 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	after_urea := c.GetString("after_urea")
 	pip_coagulation := c.GetString("pip_coagulation")
 	accumulated_blood_volume := c.GetString("accumulated_blood_volume")
-	fmt.Println("accumulated_blood_volume", accumulated_blood_volume)
+	transfusion_volume := c.GetString("transfusion_volume")
+
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1494,6 +1495,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		AfterUrea:                    after_urea,
 		PipCoagulation:               pip_coagulation,
 		AccumulatedBloodVolume:       accumulated_blood_volume,
+		TransfusionVolume:            transfusion_volume,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
@@ -3478,6 +3480,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.BreathingRate = "18"
 			record.SodiumConcentration = 140
 		}
+		//江成肾病医院
+		if adminUserInfo.Org.Id == 10517 {
+			record.SodiumConcentration = 138
+			record.DialysateTemperature = 36.5
+		}
 
 		err := service.CreateMonitor(&record)
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1659,22 +1659,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//
-				//if config.IsOpen == 1 && item.UserOrgId == 10188 {
-				//
-				//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-				//	//更新字典里面的库存
-				//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-				//	var sum_count int64
-				//	for _, its := range stockInfo {
-				//		if its.MaxUnit == medical.MaxUnit {
-				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-				//		}
-				//		sum_count += its.StockMaxNumber + its.StockMinNumber
-				//	}
-				//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-				//	//剩余库存
-				//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-				//}
+				if config.IsOpen == 1 && item.UserOrgId == 10028 {
+
+					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//更新字典里面的库存
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					var sum_count int64
+					for _, its := range stockInfo {
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
+					}
+					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					//剩余库存
+					service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+				}
 
 			}
 		}

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -56,17 +56,20 @@ func (this *NewManageApiController) GetDisInfectionTime() {
 				return
 			}
 			this.ServeSuccessJSON(map[string]interface{}{
-				"plan": infor.LongTime,
+				"plan":    infor.LongTime,
+				"planObj": plan,
 			})
 		} else if errcode == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"plan": plan.DisinfecTime,
+				"plan":    plan.DisinfecTime,
+				"planObj": plan,
 			})
 		}
 	} else if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"plan":       infomation.LongTime,
 			"infomation": infomation,
+			"planObj":    "",
 		})
 	}
 	//查询改设备是否有消毒计划

controllers/self_drug_api_congtroller.go

@@ -2762,10 +2762,30 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 			sum_total += item.StockCount
 		}
 		service.UpdateGoodInformation(it.ID, orgId, sum_total)
+
+		//stockListTwo, _ := service.GetGoodStockCountList(orgId, it.ID)
+		//if len(stockListTwo) > 0 {
+		//	for _, item := range stockListTwo {
+		//		var over_count int64
+		//		over_count = item.StockInCount - item.FlushCount
+		//		service.UpdateGoodListCount(item.UserOrgId, over_count, item.GoodId, item.StorehouseId)
+		//
+		//	}
+		//}
+		//
+		//stockListOne, _ := service.GetGoodStockCountList(orgId, it.ID)
+		//if len(stockListOne) > 0 {
+		//	for _, item := range stockListOne {
+		//		var over_count int64
+		//		over_count = item.StockOutCount + item.StockCancelCount
+		//		service.UpdateGoodListCountOne(item.UserOrgId, over_count, item.GoodId, item.StorehouseId)
+		//	}
+		//}
+
 	}
 
 	var ids []int64
-	//var goodIds []int64
+
 	manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
 	for _, it := range manufacturerList {
 		ids = append(ids, it.ID)
@@ -3419,6 +3439,24 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 		stockInt, _ := strconv.ParseInt(it.DrugStockLimit, 10, 64)
 		limit_count = stockInt * it.MinNumber
 		service.UpdateDrugById(it.ID, orgId, limit_count, sum_count)
+
+		//druglist, _ := service.GetDrugCountMapList(it.ID, orgId)
+		//if len(druglist) > 0 {
+		//	for _, item := range druglist {
+		//		var over_count int64
+		//		over_count = item.SumInCount - item.FlushCount
+		//		service.UpdateDrugStockInCount(item.DrugId, item.StorehouseId, over_count, item.UserOrgId)
+		//	}
+		//}
+
+		//druglistOne, _ := service.GetDrugCountMapList(it.ID, orgId)
+		//if len(druglistOne) > 0 {
+		//	for _, item := range druglistOne {
+		//		var over_count int64
+		//		over_count = item.SumOutCount + item.SumCancelCount
+		//		service.UpdateDrugStockInCountOne(item.DrugId, item.StorehouseId, over_count, item.UserOrgId)
+		//	}
+		//}
 	}
 
 	for _, it := range manufacturerList {

controllers/sign_api_controller.go

@@ -662,7 +662,8 @@ func (this *SignApiController) CreateSdkSendInformation() {
 
 func (this *SignApiController) SavePdfInformation() {
 
-	information, orderId := service.SavePdfInformation()
+	information, pdfBase64 := service.SavePdfInformation()
+	informationOne := service.ToCheckInformation(pdfBase64)
 
 	maprequest := make(map[string]interface{})
 
@@ -674,11 +675,12 @@ func (this *SignApiController) SavePdfInformation() {
 	maprequest["signTitle"] = "举报合同"
 
 	//file := "C:/Users/28169/Desktop/2.pdf"
-	file := "/swspan/gopath/src/XT_New/static/2.pdf"
+	file := "/swspan/gopath/src/XT_New/static/6.pdf"
 
 	fileBytes, _ := ioutil.ReadFile(file) // 读取file
 
 	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
+
 	//文件获取方式
 	maprequest["fileType"] = 1
 
@@ -710,34 +712,68 @@ func (this *SignApiController) SavePdfInformation() {
 
 	keywordSignControls := make([]map[string]interface{}, 0)
 
+	//预冲者样式
 	inputArrOne := make(map[string]interface{})
-
 	inputArrOne["sealName"] = "1"
-	inputArrOne["keyword"] = ""
+	inputArrOne["keyword"] = "医生签名"
 	inputArrOne["pages"] = "0"
 	inputArrOne["offsetX"] = "100"
 	inputArrOne["offsetY"] = "100"
 
 	keywordSignControls = append(keywordSignControls, inputArrOne)
 
-	stepStamper["keywordSignControls"] = keywordSignControls
-
-	crossSignControls := make([]map[string]interface{}, 0)
-
-	inputArrTwo := make(map[string]interface{})
-	inputArrTwo["sealName"] = "2"
-	inputArrTwo["positionX"] = "100"
-	inputArrTwo["positionY"] = "100"
-	crossSignControls = append(crossSignControls, inputArrTwo)
-
-	stepStamper["crossSignControls"] = crossSignControls
+	//穿刺者样式
+	//inputArr := make(map[string]interface{})
+	//inputArr["sealName"] = "2"
+	//inputArr["keyword"] = "治疗护士"
+	//inputArr["pages"] = "1"
+	//inputArr["offsetX"] = "100"
+	//inputArr["offsetY"] = "0"
+	//
+	//keywordSignControls = append(keywordSignControls, inputArr)
+	//
+	////上机者
+	//inputArrSix := make(map[string]interface{})
+	//inputArrSix["sealName"] = "3"
+	//inputArrSix["keyword"] = "核对护士"
+	//inputArrSix["pages"] = "1"
+	//inputArrSix["offsetX"] = "100"
+	//inputArrSix["offsetY"] = "0"
+	//
+	//keywordSignControls = append(keywordSignControls, inputArrSix)
+	//
+	//stepStamper["keywordSignControls"] = keywordSignControls
+	//
+	////医生签名
+	//inputArrSeven := make(map[string]interface{})
+	//inputArrSeven["sealName"] = "4"
+	//inputArrSeven["keyword"] = "医生签名"
+	//inputArrSeven["pages"] = "1"
+	//inputArrSeven["offsetX"] = "100"
+	//inputArrSeven["offsetY"] = "0"
+	//
+	//keywordSignControls = append(keywordSignControls, inputArrSeven)
+	//
+	//stepStamper["keywordSignControls"] = keywordSignControls
 
+	//crossSignControls := make([]map[string]interface{}, 0)
+	//
+	//inputArrTwo := make(map[string]interface{})
+	//inputArrTwo["sealName"] = "1"
+	//inputArrTwo["positionX"] = "0"
+	//inputArrTwo["positionY"] = "0"
+	//inputArrTwo["pages"] = "0"
+	//crossSignControls = append(crossSignControls, inputArrTwo)
+	//
+	//stepStamper["crossSignControls"] = crossSignControls
+	//
 	xySignControls := make([]map[string]interface{}, 0)
 
 	inputArrThree := make(map[string]interface{})
-	inputArrThree["sealName"] = "2"
+	inputArrThree["sealName"] = "1"
 	inputArrThree["positionX"] = "100"
-	inputArrThree["positionY"] = "100"
+	inputArrThree["positionY"] = "0"
+	inputArrThree["pages"] = "0"
 
 	xySignControls = append(xySignControls, inputArrThree)
 
@@ -747,54 +783,148 @@ func (this *SignApiController) SavePdfInformation() {
 
 	seals := make([]map[string]interface{}, 0)
 
+	//预冲者
 	sealImagesList := make(map[string]interface{})
-
-	fileOne := "/swspan/gopath/src/XT_New/static/seal.jpg"
-
-	fileBytesOne, _ := ioutil.ReadFile(fileOne) // 读取file
-
+	fileOne := "/swspan/gopath/src/XT_New/static/huangzihui.jpg"
+	fileBytesOne, _ := ioutil.ReadFile(fileOne)                          // 读取file
 	contractBase64One := base64.StdEncoding.EncodeToString(fileBytesOne) // 加密成base64字符串
 	sealImagesList["sealBase64"] = contractBase64One
-	sealImagesList["width"] = "100"
-	sealImagesList["height"] = "100"
+	//控制签名的大小
+	sealImagesList["width"] = "50"
+	sealImagesList["height"] = "50"
 	sealImagesList["verticalAlign"] = "middle"
 
 	sealTextsList := make(map[string]interface{})
-	sealTextsList["text"] = "2"
+	sealTextsList["text"] = "2023年8月8日"
 	sealTextsList["fontSize"] = "100"
-	sealTextsList["fontColor"] = "100"
+	sealTextsList["fontColor"] = "#333333"
 	sealTextsList["isTextArea"] = true
 	sealTextsList["textAlign"] = 0
-	sealTextsList["width"] = 300
-	sealTextsList["height"] = 300
+	sealTextsList["width"] = 150
+	sealTextsList["height"] = 20
 
 	sealsObj := make(map[string]interface{})
-
-	sealsObj["sealWidth"] = "300"
-	sealsObj["sealHeight"] = "300"
-	sealsObj["sealName"] = 1
+	sealsObj["sealWidth"] = "150"
+	sealsObj["sealHeight"] = "150"
+	sealsObj["sealName"] = "1"
 	sealsObj["sealImage"] = sealImagesList
 	sealsObj["sealText"] = sealTextsList
-
 	seals = append(seals, sealsObj)
+
+	//穿刺者
+	//sealImagesListOne := make(map[string]interface{})
+	//
+	//fileTwo := "/swspan/gopath/src/XT_New/static/huangjunji.jpg"
+	//
+	//fileBytesTwo, _ := ioutil.ReadFile(fileTwo) // 读取file
+	//
+	//contractBase64Two := base64.StdEncoding.EncodeToString(fileBytesTwo) // 加密成base64字符串
+	//sealImagesListOne["sealBase64"] = contractBase64Two
+	////控制签名的大小
+	//sealImagesListOne["width"] = "50"
+	//sealImagesListOne["height"] = "50"
+	//sealImagesListOne["verticalAlign"] = "middle"
+	//
+	//sealTextsListOne := make(map[string]interface{})
+	//sealTextsListOne["text"] = "2023年8月8日"
+	//sealTextsListOne["fontSize"] = "100"
+	//sealTextsListOne["fontColor"] = "100"
+	//sealTextsListOne["isTextArea"] = true
+	//sealTextsListOne["textAlign"] = 0
+	//sealTextsListOne["width"] = 150
+	//sealTextsListOne["height"] = 20
+	//
+	//sealsObjOne := make(map[string]interface{})
+	//
+	//sealsObjOne["sealWidth"] = "150"
+	//sealsObjOne["sealHeight"] = "150"
+	//sealsObjOne["sealName"] = "2"
+	//sealsObjOne["sealImage"] = sealImagesListOne
+	//sealsObjOne["sealText"] = sealTextsListOne
+	//seals = append(seals, sealsObjOne)
+	//间隔签名
+
+	//上机者
+	//sealImagesListTwo := make(map[string]interface{})
+	//fileThree := "/swspan/gopath/src/XT_New/static/jianfeixia.jpg"
+	//fileBytesThree, _ := ioutil.ReadFile(fileThree)                          // 读取file
+	//contractBase64Three := base64.StdEncoding.EncodeToString(fileBytesThree) // 加密成base64字符串
+	//sealImagesListTwo["sealBase64"] = contractBase64Three
+	////控制签名的大小
+	//sealImagesListTwo["width"] = "50"
+	//sealImagesListTwo["height"] = "50"
+	//sealImagesListTwo["verticalAlign"] = "middle"
+	//
+	//sealTextsListTwo := make(map[string]interface{})
+	//sealTextsListTwo["text"] = "2023年8月8日"
+	//sealTextsListTwo["fontSize"] = "100"
+	//sealTextsListTwo["fontColor"] = "100"
+	//sealTextsListTwo["isTextArea"] = true
+	//sealTextsListTwo["textAlign"] = 0
+	//sealTextsListTwo["width"] = 150
+	//sealTextsListTwo["height"] = 20
+	//
+	//sealsObjTwo := make(map[string]interface{})
+	//
+	//sealsObjTwo["sealWidth"] = "150"
+	//sealsObjTwo["sealHeight"] = "150"
+	//sealsObjTwo["sealName"] = "3"
+	//sealsObjTwo["sealImage"] = sealImagesListTwo
+	//sealsObjTwo["sealText"] = sealTextsListTwo
+	//seals = append(seals, sealsObjTwo)
+
+	//医生签名
+	//sealImagesListThree := make(map[string]interface{})
+	//fileFour := "/swspan/gopath/src/XT_New/static/jianfeixia.jpg"
+	//fileBytesFour, _ := ioutil.ReadFile(fileFour)                          // 读取file
+	//contractBase64Tour := base64.StdEncoding.EncodeToString(fileBytesFour) // 加密成base64字符串
+	//sealImagesListThree["sealBase64"] = contractBase64Tour
+	////控制签名的大小
+	//sealImagesListThree["width"] = "50"
+	//sealImagesListThree["height"] = "50"
+	//sealImagesListThree["verticalAlign"] = "middle"
+	//
+	//sealTextsListThree := make(map[string]interface{})
+	//sealTextsListThree["text"] = "2023年8月8日"
+	//sealTextsListThree["fontSize"] = "100"
+	//sealTextsListThree["fontColor"] = "100"
+	//sealTextsListThree["isTextArea"] = true
+	//sealTextsListThree["textAlign"] = 0
+	//sealTextsListThree["width"] = 150
+	//sealTextsListThree["height"] = 20
+	//
+	//sealsObjThree := make(map[string]interface{})
+	//
+	//sealsObjThree["sealWidth"] = "150"
+	//sealsObjThree["sealHeight"] = "150"
+	//sealsObjThree["sealName"] = "4"
+	//sealsObjThree["sealImage"] = sealImagesListThree
+	//sealsObjThree["sealText"] = sealTextsListThree
+	//seals = append(seals, sealsObjThree)
+
 	maprequest["seals"] = seals
 
 	maprequest["isUserWishes"] = true
 	maprequest["phone"] = "13318464642"
 	maprequest["verificationCode"] = "18888888888"
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"maprequest":  maprequest,
-		"information": information,
-		"orderId":     orderId,
+
+		"information":    information,
+		"orderId":        pdfBase64,
+		"informationOne": informationOne,
+		"maprequest":     maprequest,
 	})
 
 }
 
 func (this *SignApiController) ToCheckInformation() {
 
-	information := service.ToCheckInformation()
+	information, pdfBase64 := service.SavePdfInformation()
+	informationOne := service.ToCheckInformation(pdfBase64)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"information": information,
+		"information":    information,
+		"informationOne": informationOne,
 	})
 }

models/common_models.go

@@ -483,6 +483,28 @@ type BloodDialysisOrder struct {
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 }
 
+type BloodDialysisOrderSchedule 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"`
+	DialysisMachineName string `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	Name                string `gorm:"column:name" json:"name" form:"name"`
+	DialysisNo          string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	IdCardNo            string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	TotalDialysis       int64  `gorm:"column:total_dialysis" json:"total_dialysis" form:"total_dialysis"`
+	UserSysBeforeCount  int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+}
+
 type TreatDialysisOrder struct {
 	Date string `json:"date"`
 }

models/dialysis.go

@@ -654,6 +654,7 @@ type AssessmentAfterDislysis struct {
 	AfterUrea                       string  `gorm:"column:after_urea" json:"after_urea" form:"after_urea"`
 	PipCoagulation                  string  `gorm:"column:pip_coagulation" json:"pip_coagulation" form:"pip_coagulation"`
 	AccumulatedBloodVolume          string  `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	TransfusionVolume               string  `gorm:"column:transfusion_volume" json:"transfusion_volume" form:"transfusion_volume"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {

service/common_service.go

@@ -512,6 +512,23 @@ func GetDialysisList(startime int64, endtime int64, page int64, limit int64, org
 
 }
 
+func GetDialysisScheduleList(startime int64, endtime int64, page int64, limit int64, orgid int64) (order []*models.BloodDialysisOrderSchedule, err error) {
+
+	db := XTReadDB().Table("xt_schedule as o").Where("o.status = 1")
+
+	if orgid > 0 {
+		db = db.Where("o.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("o.schedule_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("o.schedule_date<=?", endtime)
+	}
+	err = db.Group("o.patient_id,o.mode_id").Select("o.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("join  xt_patients as p on p.id = o.patient_id").Where("o.status = 1").Scan(&order).Error
+	return order, err
+}
+
 func GetAllDialysisList(startime int64, endtime int64, orgid int64) (order []*models.BloodDialysisOrder, err error) {
 
 	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status = 1")

service/manage_center_service.go

@@ -441,7 +441,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 	info, _ := GetDrugAutoWarehouseOutEight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
 	list, _ := GetDrugAutoWarehouseOutNight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
 
-	fmt.Println("lsit233323232323233232332wo", list)
 	storeHouseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	//退库
 	drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
@@ -449,8 +448,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 	//如果剩余数量 + 退库数量 < 总入库数量
 	if len(list) > 0 {
 		for _, its := range list {
-			fmt.Println("its,23322323323223232332wo", its.WarehouseInfoId)
-
 			//查询该批次病人该药品出库数据
 			infos, _ := GetDrugAutoWarehouseOutTen(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID, its.WarehouseInfoId)
 			fmt.Println("info2332323232332233223wo", infos.Count)
@@ -492,12 +489,8 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				sum_count = druginfo.WarehousingCount
 			}
 
-			fmt.Println("//剩余数量", over_count)
-			fmt.Println("该批出出库数量3223323232wo", out_count)
-			fmt.Println("g该批次总库存wowowoowow", sum_count)
 			if (over_count + out_count) <= sum_count {
 				if its.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-					fmt.Print("itscoutn233232223999wi", its.Count)
 					//退库
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: its.Count,
@@ -511,7 +504,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 
 				}
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-					fmt.Print("itscoutn999888", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}
@@ -524,7 +516,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				}
 
 				if its.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-					fmt.Print("itscoutnwohhhhwhw", its.Count)
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: its.Count,
 					}

service/manage_service.go

@@ -1818,7 +1818,7 @@ func GetObjectDisInfectionLongTime(user_org_id int64) (list []*models.XtNewObjec
 
 func GetDialysisOrderPatient(org_id int64) (order []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and dialysis_date>=? and dialysis_date<=? and status =1", org_id, 1672502400, 1675094400).Find(&order).Error
+	err = XTReadDB().Where("user_org_id = ? and dialysis_date>=? and dialysis_date<=? and status =1", org_id, 1667232000, 1669737600).Find(&order).Error
 
 	return order, err
 }

service/new_warehouse_service.go

@@ -1520,7 +1520,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
-		if orgID != 10188 && orgID != 10217 && orgID != 3877 && orgID != 9671 {
+		if orgID != 10188 && orgID != 10217 && orgID != 3877 {
 			warehouseOutInfo := &models.DrugWarehouseOutInfo{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 				WarehouseOutId:          warehouseout.ID,
@@ -1554,6 +1554,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			//查询今日该药品该患者是否有出库数据
 			lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+			fmt.Println("以色列---------------------------------------", lastDrugOutInfo.ID)
 			if lastDrugOutInfo.ID == 0 {
 				errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 				if errOne != nil {
@@ -1574,7 +1575,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				}
 			}
 			if lastDrugOutInfo.ID > 0 {
-
+				fmt.Println("wowowowowowwwwwwwwwwwwwwwwwwwwwwwww")
 				//删除在新增
 				UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
 
@@ -1605,7 +1606,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		if deliver_number_one-(out_count-cancel_count) >= 0 {
 			if (deliver_number_one - out_count - cancel_count) != 0 {
 
-				if orgID == 10217 || orgID == 10188 || orgID == 3877 || orgID == 9671 {
+				if orgID == 10217 || orgID == 10188 || orgID == 3877 {
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseout.ID,

service/self_drug_service.go

@@ -1945,6 +1945,21 @@ func UpdateGoodInformation(id int64, orgid int64, total_count int64) error {
 	return err
 }
 
+func UpdateGoodListCount(user_org_id int64, over_count int64, good_id int64, sotrehouse_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtGoodStockCount{}).Where("status=1 and user_org_id =? and good_id =? and storehouse_id=?", user_org_id, good_id, sotrehouse_id).Update(map[string]interface{}{"stock_out_count": over_count}).Error
+
+	return err
+
+}
+
+func UpdateGoodListCountOne(user_org_id int64, over_count int64, good_id int64, storehouse_id int64) error {
+
+	err = XTWriteDB().Model(&models.XtGoodStockCount{}).Where("status=1 and user_org_id =? and good_id = ? and storehouse_id = ?", user_org_id, good_id, storehouse_id).Update(map[string]interface{}{"stock_act_out_count": over_count}).Error
+	return err
+
+}
+
 func GetBaseDrugName(orgid int64) (drug []*models.BaseDrugLibTwenty, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&drug).Error
@@ -2924,3 +2939,28 @@ func GetDrugInventoryWarehouseInfoList(org_id int64, storehouse_id int64) (info
 	err = XTReadDB().Model(&info).Where("status = 1 and storehouse_id = ? and is_check = 1 and org_id = ? and (stock_max_number >0 or stock_min_number >0)", storehouse_id, org_id).Preload("XtBaseDrug", "status= 1").Order("drug_id").Find(&info).Error
 	return info, err
 }
+
+func GetGoodStockCountList(user_org_id int64, good_id int64) (stock []*models.XtGoodStockCount, err error) {
+
+	err = XTReadDB().Where("user_org_id =? and status=1 and good_id = ?", user_org_id, good_id).Find(&stock).Error
+
+	return stock, err
+}
+
+func GetDrugCountMapList(drug_id int64, user_org_id int64) (drug []*models.XtDrugStockCount, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and user_org_id =? and status=1", drug_id, user_org_id).Find(&drug).Error
+	return drug, err
+}
+
+func UpdateDrugStockInCount(drugId int64, storehouseId int64, over_count int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDrugStockCount{}).Where("drug_id =? and storehouse_id =? and status=1 and user_org_id =?", drugId, storehouseId, user_org_id).Update(map[string]interface{}{"sum_out_count": over_count}).Error
+	return err
+}
+
+func UpdateDrugStockInCountOne(drugId int64, storehouseId int64, over_count int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDrugStockCount{}).Where("drug_id =? and storehouse_id =? and status=1 and user_org_id =?", drugId, storehouseId, user_org_id).Update(map[string]interface{}{"sum_act_out_count": over_count}).Error
+	return err
+}

service/sign_service.go

@@ -1674,11 +1674,12 @@ func SavePdfInformation() (string, string) {
 	maprequest["signTitle"] = "举报合同"
 
 	//file := "C:/Users/28169/Desktop/2.pdf"
-	file := "/swspan/gopath/src/XT_New/static/2.pdf"
+	file := "/swspan/gopath/src/XT_New/static/6.pdf"
 
 	fileBytes, _ := ioutil.ReadFile(file) // 读取file
 
 	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
+
 	//文件获取方式
 	maprequest["fileType"] = 1
 
@@ -1710,75 +1711,197 @@ func SavePdfInformation() (string, string) {
 
 	keywordSignControls := make([]map[string]interface{}, 0)
 
+	//预冲者样式
 	inputArrOne := make(map[string]interface{})
-
 	inputArrOne["sealName"] = "1"
-	inputArrOne["keyword"] = "王志文"
+	inputArrOne["keyword"] = "杨姣"
 	inputArrOne["pages"] = "0"
-	inputArrOne["offsetX"] = "100"
-	inputArrOne["offsetY"] = "100"
+	inputArrOne["offsetX"] = "50"
+	inputArrOne["offsetY"] = "0"
 
 	keywordSignControls = append(keywordSignControls, inputArrOne)
 
-	stepStamper["keywordSignControls"] = keywordSignControls
-
-	crossSignControls := make([]map[string]interface{}, 0)
-
-	inputArrTwo := make(map[string]interface{})
-	inputArrTwo["sealName"] = "1"
-	inputArrTwo["positionX"] = "100"
-	inputArrTwo["positionY"] = "100"
-	inputArrTwo["pages"] = "0"
-	crossSignControls = append(crossSignControls, inputArrTwo)
-
-	stepStamper["crossSignControls"] = crossSignControls
-
-	xySignControls := make([]map[string]interface{}, 0)
-
-	inputArrThree := make(map[string]interface{})
-	inputArrThree["sealName"] = "1"
-	inputArrThree["positionX"] = "100"
-	inputArrThree["positionY"] = "100"
-	inputArrThree["pages"] = "0"
+	//穿刺者样式
+	//inputArr := make(map[string]interface{})
+	//inputArr["sealName"] = "2"
+	//inputArr["keyword"] = "治疗护士"
+	//inputArr["pages"] = "1"
+	//inputArr["offsetX"] = "100"
+	//inputArr["offsetY"] = "0"
+	//
+	//keywordSignControls = append(keywordSignControls, inputArr)
+	//
+	////上机者
+	//inputArrSix := make(map[string]interface{})
+	//inputArrSix["sealName"] = "3"
+	//inputArrSix["keyword"] = "核对护士"
+	//inputArrSix["pages"] = "1"
+	//inputArrSix["offsetX"] = "100"
+	//inputArrSix["offsetY"] = "0"
+	//
+	//keywordSignControls = append(keywordSignControls, inputArrSix)
+	//
 
-	xySignControls = append(xySignControls, inputArrThree)
+	////医生签名
+	//inputArrSeven := make(map[string]interface{})
+	//inputArrSeven["sealName"] = "4"
+	//inputArrSeven["keyword"] = "医生签名"
+	//inputArrSeven["pages"] = "1"
+	//inputArrSeven["offsetX"] = "100"
+	//inputArrSeven["offsetY"] = "0"
+	//
+	//keywordSignControls = append(keywordSignControls, inputArrSeven)
+	//
+	//stepStamper["keywordSignControls"] = keywordSignControls
+	stepStamper["keywordSignControls"] = keywordSignControls
+	//
 
-	stepStamper["xySignControls"] = xySignControls
+	//crossSignControls := make([]map[string]interface{}, 0)
+	//
+	//inputArrTwo := make(map[string]interface{})
+	//inputArrTwo["sealName"] = "1"
+	//inputArrTwo["positionX"] = "0"
+	//inputArrTwo["positionY"] = "0"
+	//inputArrTwo["pages"] = "0"
+	//crossSignControls = append(crossSignControls, inputArrTwo)
+	//
+	//stepStamper["crossSignControls"] = crossSignControls
+	//
+	//xySignControls := make([]map[string]interface{}, 0)
+	//
+	//inputArrThree := make(map[string]interface{})
+	//inputArrThree["sealName"] = "1"
+	//inputArrThree["positionX"] = "100"
+	//inputArrThree["positionY"] = "0"
+	//inputArrThree["pages"] = "0"
+	//
+	//xySignControls = append(xySignControls, inputArrThree)
+	//
+	//stepStamper["xySignControls"] = xySignControls
 
 	maprequest["stepStamper"] = stepStamper
 
 	seals := make([]map[string]interface{}, 0)
 
+	//预冲者
 	sealImagesList := make(map[string]interface{})
-
-	fileOne := "/swspan/gopath/src/XT_New/static/seal.jpg"
-
-	fileBytesOne, _ := ioutil.ReadFile(fileOne) // 读取file
-
+	fileOne := "/swspan/gopath/src/XT_New/static/huangzihui.jpg"
+	fileBytesOne, _ := ioutil.ReadFile(fileOne)                          // 读取file
 	contractBase64One := base64.StdEncoding.EncodeToString(fileBytesOne) // 加密成base64字符串
 	sealImagesList["sealBase64"] = contractBase64One
-	sealImagesList["width"] = "100"
-	sealImagesList["height"] = "100"
+	//控制签名的大小
+	sealImagesList["width"] = "50"
+	sealImagesList["height"] = "50"
 	sealImagesList["verticalAlign"] = "middle"
 
 	sealTextsList := make(map[string]interface{})
-	sealTextsList["text"] = "2"
+	sealTextsList["text"] = "2023年8月8日"
 	sealTextsList["fontSize"] = "100"
-	sealTextsList["fontColor"] = "100"
+	sealTextsList["fontColor"] = "#333333"
 	sealTextsList["isTextArea"] = true
 	sealTextsList["textAlign"] = 0
-	sealTextsList["width"] = 300
-	sealTextsList["height"] = 300
+	sealTextsList["width"] = 150
+	sealTextsList["height"] = 20
 
 	sealsObj := make(map[string]interface{})
-
-	sealsObj["sealWidth"] = "300"
-	sealsObj["sealHeight"] = "300"
+	sealsObj["sealWidth"] = "150"
+	sealsObj["sealHeight"] = "150"
 	sealsObj["sealName"] = "1"
 	sealsObj["sealImage"] = sealImagesList
 	sealsObj["sealText"] = sealTextsList
-
 	seals = append(seals, sealsObj)
+
+	//穿刺者
+	//sealImagesListOne := make(map[string]interface{})
+	//
+	//fileTwo := "/swspan/gopath/src/XT_New/static/huangjunji.jpg"
+	//
+	//fileBytesTwo, _ := ioutil.ReadFile(fileTwo) // 读取file
+	//
+	//contractBase64Two := base64.StdEncoding.EncodeToString(fileBytesTwo) // 加密成base64字符串
+	//sealImagesListOne["sealBase64"] = contractBase64Two
+	////控制签名的大小
+	//sealImagesListOne["width"] = "50"
+	//sealImagesListOne["height"] = "50"
+	//sealImagesListOne["verticalAlign"] = "middle"
+	//
+	//sealTextsListOne := make(map[string]interface{})
+	//sealTextsListOne["text"] = "2023年8月8日"
+	//sealTextsListOne["fontSize"] = "100"
+	//sealTextsListOne["fontColor"] = "100"
+	//sealTextsListOne["isTextArea"] = true
+	//sealTextsListOne["textAlign"] = 0
+	//sealTextsListOne["width"] = 150
+	//sealTextsListOne["height"] = 20
+	//
+	//sealsObjOne := make(map[string]interface{})
+	//
+	//sealsObjOne["sealWidth"] = "150"
+	//sealsObjOne["sealHeight"] = "150"
+	//sealsObjOne["sealName"] = "2"
+	//sealsObjOne["sealImage"] = sealImagesListOne
+	//sealsObjOne["sealText"] = sealTextsListOne
+	//seals = append(seals, sealsObjOne)
+	//间隔签名
+
+	//上机者
+	//sealImagesListTwo := make(map[string]interface{})
+	//fileThree := "/swspan/gopath/src/XT_New/static/jianfeixia.jpg"
+	//fileBytesThree, _ := ioutil.ReadFile(fileThree)                          // 读取file
+	//contractBase64Three := base64.StdEncoding.EncodeToString(fileBytesThree) // 加密成base64字符串
+	//sealImagesListTwo["sealBase64"] = contractBase64Three
+	////控制签名的大小
+	//sealImagesListTwo["width"] = "50"
+	//sealImagesListTwo["height"] = "50"
+	//sealImagesListTwo["verticalAlign"] = "middle"
+	//
+	//sealTextsListTwo := make(map[string]interface{})
+	//sealTextsListTwo["text"] = "2023年8月8日"
+	//sealTextsListTwo["fontSize"] = "100"
+	//sealTextsListTwo["fontColor"] = "100"
+	//sealTextsListTwo["isTextArea"] = true
+	//sealTextsListTwo["textAlign"] = 0
+	//sealTextsListTwo["width"] = 150
+	//sealTextsListTwo["height"] = 20
+	//
+	//sealsObjTwo := make(map[string]interface{})
+	//
+	//sealsObjTwo["sealWidth"] = "150"
+	//sealsObjTwo["sealHeight"] = "150"
+	//sealsObjTwo["sealName"] = "3"
+	//sealsObjTwo["sealImage"] = sealImagesListTwo
+	//sealsObjTwo["sealText"] = sealTextsListTwo
+	//seals = append(seals, sealsObjTwo)
+
+	//医生签名
+	//sealImagesListThree := make(map[string]interface{})
+	//fileFour := "/swspan/gopath/src/XT_New/static/jianfeixia.jpg"
+	//fileBytesFour, _ := ioutil.ReadFile(fileFour)                          // 读取file
+	//contractBase64Tour := base64.StdEncoding.EncodeToString(fileBytesFour) // 加密成base64字符串
+	//sealImagesListThree["sealBase64"] = contractBase64Tour
+	////控制签名的大小
+	//sealImagesListThree["width"] = "50"
+	//sealImagesListThree["height"] = "50"
+	//sealImagesListThree["verticalAlign"] = "middle"
+	//
+	//sealTextsListThree := make(map[string]interface{})
+	//sealTextsListThree["text"] = "2023年8月8日"
+	//sealTextsListThree["fontSize"] = "100"
+	//sealTextsListThree["fontColor"] = "100"
+	//sealTextsListThree["isTextArea"] = true
+	//sealTextsListThree["textAlign"] = 0
+	//sealTextsListThree["width"] = 150
+	//sealTextsListThree["height"] = 20
+	//
+	//sealsObjThree := make(map[string]interface{})
+	//
+	//sealsObjThree["sealWidth"] = "150"
+	//sealsObjThree["sealHeight"] = "150"
+	//sealsObjThree["sealName"] = "4"
+	//sealsObjThree["sealImage"] = sealImagesListThree
+	//sealsObjThree["sealText"] = sealTextsListThree
+	//seals = append(seals, sealsObjThree)
+
 	maprequest["seals"] = seals
 
 	maprequest["isUserWishes"] = true
@@ -1825,24 +1948,24 @@ func SavePdfInformation() (string, string) {
 	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 	}
-	var orderId string
-	//orderId = respJSON["data"].(map[string]interface{})["orderId"].(string)
-	//fmt.Println("str", orderId)
-	return str, orderId
+	var pdfBase64 string
+	pdfBase64 = respJSON["data"].(map[string]interface{})["pdfBase64"].(string)
+
+	return str, pdfBase64
 }
 
-func ToCheckInformation() string {
+func ToCheckInformation(contractBase64 string) string {
 
 	var url string
 
 	url = "http://localhost:8890/sdk/pdf/verify"
 	maprequest := make(map[string]interface{})
 
-	file := "/swspan/gopath/src/XT_New/static/2.pdf"
-
-	fileBytes, _ := ioutil.ReadFile(file) // 读取file
-
-	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
+	//file := "/swspan/gopath/src/XT_New/static/a.pdf"
+	//
+	//fileBytes, _ := ioutil.ReadFile(file) // 读取file
+	//
+	//contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
 
 	maprequest["fileType"] = 1
 

service/stock_service.go

@@ -2912,39 +2912,77 @@ func FloatRound(f float64, n int) float64 {
 }
 
 func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (list []*models.WarehouseOutInfo, total int64, err error) {
-	db := readDb.Model(&models.WarehouseOutInfo{})
-	db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.is_check = 1 AND xt_warehouse_out_info.good_id <> 0 AND xt_warehouse_out_info.count <> 0 ", orgId)
 
-	if len(keywords) > 0 {
-		likeKey := "%" + keywords + "%"
-		db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
-		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_warehouse_out.creater")
-		db = db.Joins("join xt_good_information on xt_good_information.id = xt_warehouse_out_info.good_id")
+	if orgId == 9671 {
+		db := readDb.Model(&models.WarehouseOutInfo{})
+		db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.is_check = 1 AND xt_warehouse_out_info.good_id <> 0 AND xt_warehouse_out_info.count <> 0  AND xt_warehouse_out_info.sys_record_time>=? AND xt_warehouse_out_info.sys_record_time<=?", orgId, startTime, endTime)
+
+		if len(keywords) > 0 {
+			likeKey := "%" + keywords + "%"
+			db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
+			db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_warehouse_out.creater")
+			db = db.Joins("join xt_good_information on xt_good_information.id = xt_warehouse_out_info.good_id")
 
-		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out_info.warehouse_out_order_number LIKE ?  OR xt_good_information.specification_name LIKE ?  OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_warehouse_out_info.id")
+			db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out_info.warehouse_out_order_number LIKE ?  OR xt_good_information.specification_name LIKE ?  OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_warehouse_out_info.id")
+		} else {
+			db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
+		}
+
+		if manufacturer > 0 {
+			db = db.Joins("join xt_warehouse_out as wa on wa.id = xt_warehouse_out_info.warehouse_out_id AND wa.manufacturer =?", manufacturer)
+		}
+
+		if order_type > 0 {
+			db = db.Where("xt_warehouse_out_info.type = ?", order_type)
+		}
+
+		if storehouse_id > 0 {
+			db = db.Where("xt_warehouse_out_info.storehouse_id = ?", storehouse_id)
+		}
+
+		db = db.Preload("WarehouseOut", "status = 1 AND org_id = ?", orgId)
+		db = db.Preload("WarehousingInfoNight", "status=1 and org_id = ?", orgId)
+		db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
+		db = db.Count(&total)
+		offset := (page - 1) * limit
+		err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out_info.id desc").Find(&list).Error
+		return
 	} else {
-		db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
-	}
+		db := readDb.Model(&models.WarehouseOutInfo{})
+		db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.is_check = 1 AND xt_warehouse_out_info.good_id <> 0 AND xt_warehouse_out_info.count <> 0 ", orgId)
 
-	if manufacturer > 0 {
-		db = db.Joins("join xt_warehouse_out as wa on wa.id = xt_warehouse_out_info.warehouse_out_id AND wa.manufacturer =?", manufacturer)
-	}
+		if len(keywords) > 0 {
+			likeKey := "%" + keywords + "%"
+			db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
+			db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_warehouse_out.creater")
+			db = db.Joins("join xt_good_information on xt_good_information.id = xt_warehouse_out_info.good_id")
 
-	if order_type > 0 {
-		db = db.Where("xt_warehouse_out_info.type = ?", order_type)
-	}
+			db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out_info.warehouse_out_order_number LIKE ?  OR xt_good_information.specification_name LIKE ?  OR xt_good_information.good_name LIKE ?", likeKey, likeKey, likeKey, likeKey).Group("xt_warehouse_out_info.id")
+		} else {
+			db = db.Joins("join xt_warehouse_out on xt_warehouse_out.id = xt_warehouse_out_info.warehouse_out_id AND xt_warehouse_out.warehouse_out_time >=? AND xt_warehouse_out.warehouse_out_time<= ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.org_id = ?", startTime, endTime, orgId)
+		}
 
-	if storehouse_id > 0 {
-		db = db.Where("xt_warehouse_out_info.storehouse_id = ?", storehouse_id)
+		if manufacturer > 0 {
+			db = db.Joins("join xt_warehouse_out as wa on wa.id = xt_warehouse_out_info.warehouse_out_id AND wa.manufacturer =?", manufacturer)
+		}
+
+		if order_type > 0 {
+			db = db.Where("xt_warehouse_out_info.type = ?", order_type)
+		}
+
+		if storehouse_id > 0 {
+			db = db.Where("xt_warehouse_out_info.storehouse_id = ?", storehouse_id)
+		}
+
+		db = db.Preload("WarehouseOut", "status = 1 AND org_id = ?", orgId)
+		db = db.Preload("WarehousingInfoNight", "status=1 and org_id = ?", orgId)
+		db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
+		db = db.Count(&total)
+		offset := (page - 1) * limit
+		err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out_info.id desc").Find(&list).Error
+		return
 	}
 
-	db = db.Preload("WarehouseOut", "status = 1 AND org_id = ?", orgId)
-	db = db.Preload("WarehousingInfoNight", "status=1 and org_id = ?", orgId)
-	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
-	db = db.Count(&total)
-	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out_info.id desc").Find(&list).Error
-	return
 }
 
 func GetStockOutDetailTotal(orgId int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (err error, totalPrice float64) {
@@ -3884,9 +3922,7 @@ func UpdateAutoGood(orgid int64, patient_id int64, recordtime int64, goodid int6
 
 	err = XTWriteDB().Model(models.BloodAutomaticReduceDetail{}).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ?", orgid, patient_id, recordtime, goodid).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
 	err = XTWriteDB().Model(models.WarehouseOutInfo{}).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
-	//err = XTWriteDB().Model(models.WarehouseOutInfo{}).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).UpdateColumn("over_count", gorm.Expr("over_count + ?", count)).Error
 	err = XTWriteDB().Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? and patient_id = ? and record_date = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
-	//err = XTWriteDB().Model(&models.VmStockFlow{}).Where("user_org_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1 and project_id = ?", orgid, patient_id, recordtime, goodid, project_id).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
 	return err
 }
 
@@ -6997,14 +7033,14 @@ func FindStockSettingById(orgid int64) (models.XtStockSetting, error) {
 	return setting, err
 }
 
-func GetAutoStockOutById(good_id, record_date int64, orgid int64, patient_id int64) (models.BloodAutomaticReduceDetail, error) {
+func GetAutoStockOutById(good_id int64, record_date int64, orgid int64, patient_id int64) (models.BloodAutomaticReduceDetail, error) {
 
 	detail := models.BloodAutomaticReduceDetail{}
 	err := XTReadDB().Where("good_id = ? and record_time = ? and org_id = ? and status = 1 and patient_id = ?", good_id, record_date, orgid, patient_id).Find(&detail).Error
 	return detail, err
 }
 
-func GetAutoWarehouseOutList(good_id, record_date int64, orgid int64, patient_id int64) (models.WarehouseOutInfoNight, error) {
+func GetAutoWarehouseOutList(good_id int64, record_date int64, orgid int64, patient_id int64) (models.WarehouseOutInfoNight, error) {
 
 	detail := models.WarehouseOutInfoNight{}
 	err := XTReadDB().Where("good_id = ? and sys_record_time = ? and org_id = ? and status = 1 and patient_id = ?", good_id, record_date, orgid, patient_id).Find(&detail).Error
@@ -8649,3 +8685,32 @@ func FindFirstWarehousingInfoByStockThree(good_id int64, storehouse_id int64) (i
 
 	return info, err
 }
+
+func GetHisPrescriptionNumberList(project_id int64, record_date int64, orgid int64, patient_id int64) (list []*models.HisPrescriptionProject, err error) {
+
+	err = readDb.Where("project_id = ? and record_date =? and user_org_id =? and status =1 and patient_id = ?", project_id, record_date, orgid, patient_id).Find(&list).Error
+
+	return list, err
+}
+
+func GetWarehouseOutnfoByProjectId(project_id int64, record_date int64, orgid int64, patient_id int64) (infor []*models.WarehouseOutInfo, err error) {
+
+	err = readDb.Where("good_id =? and sys_record_time = ? and org_id = ? and patient_id = ? and status=1", project_id, record_date, orgid, patient_id).Find(&infor).Error
+	return infor, err
+}
+
+func UpdateWarehouseInfoByPatientId(project_id int64, record_date int64, orgid int64, patient_id int64) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	err := XTWriteDB().Model(&info).Where("good_id = ? and sys_record_time = ? and org_id = ? and status =1 and patient_id = ?", project_id, record_date, orgid, patient_id).Updates(map[string]interface{}{"status": 0}).Error
+	return info, err
+}
+
+func UpdateWarehouseInfoByProject(good_id int64, id int64, user_org_id int64, count int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+
+	err := XTWriteDB().Where("id = ? and good_id = ? and org_id = ? and status= 1", id, good_id, user_org_id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+
+	return info, err
+}