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/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id
+		subscibe.OrgId = 10341 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 15487 //4
+		adminUserInfo.CurrentOrgId = 10341 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3295  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -328,7 +328,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id小英9675或4
+		subscibe.OrgId = 10341 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,8 +338,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 15487 //4
+		adminUserInfo.CurrentOrgId = 10341 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3295  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -603,6 +603,7 @@ func (c *DialysisApiController) PostPrescription() {
 		}
 
 		err := service.AddSigleRecord(&prescription)
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
 		//清空key 值
@@ -4915,7 +4916,7 @@ func (this *DialysisApiController) GetPatientDialysisSolutionGroupList() {
 	goodType, _ := service.GetAllGoodType(orgId)
 	if config.IsOpen != 1 {
 		list, total, err := service.GetPatientDialysisSolutionGroupList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId, ids)
-		fmt.Println("list2232323223332323232", list)
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":     list,

controllers/dialysis_record_api_controller.go

@@ -412,6 +412,12 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 	lastDryWeightDislysis, getDryErr := service.GetLastDryWeight(adminInfo.CurrentOrgId, patientID)
 
 	lastOrder, _ := service.GetLastDilysisOrder(adminInfo.CurrentOrgId, patientID, date.Unix())
+
+	//统计表
+	dryWeightList, _ := service.GetPatientDryWeight(adminInfo.CurrentOrgId, patientID)
+
+	allDoctor, _ := service.GetAllDoctor(adminInfo.CurrentOrgId, adminInfo.CurrentAppId)
+
 	if getDryErr != nil {
 		this.ErrorLog("获取最后一条干体重失败:%v", getDryErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -466,6 +472,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"information":                 information,
 			"is_advice_open":              adviceConfig,
 			"lastOrder":                   lastOrder,
+			"dryWeightList":               dryWeightList,
+			"docList":                     allDoctor,
 		}
 		this.ServeSuccessJSON(returnData)
 
@@ -503,6 +511,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"information":                 information,
 			"is_advice_open":              adviceConfig,
 			"lastOrder":                   lastOrder,
+			"dryWeightList":               dryWeightList,
+			"docList":                     allDoctor,
 		}
 		this.ServeSuccessJSON(returnData)
 	}

controllers/his_api_controller.go

@@ -98,6 +98,318 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/test/get", &HisApiController{}, "get:GetTestOrder")
 
+	beego.Router("/api/batch/settleaccount", &HisApiController{}, "get:GetBatchSettleAccounts")
+
+}
+
+func (c *HisApiController) GetBatchSettleAccounts() {
+	order_ids := c.GetString("order_ids")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	adminUser := c.GetAdminUserInfo()
+	orders := strings.Split(order_ids, ",")
+	var newOrders []models.Orders
+	for _, item := range orders {
+		order, _ := service.GetHisOrderByIDTenOne(item)
+		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
+		orderInfos, _ := service.GetHisOrderInfoByNumberOne(order.Number)
+		orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
+		orderInfos = append(orderInfos, orderInfos_two...)
+		his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+		//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+		var diagnosis_ids []string
+		if his.ID > 0 {
+			diagnosis_ids = strings.Split(his.Diagnosis, ",")
+
+		} else {
+			diagnosis_ids = strings.Split(his_hospital.Diagnosis, ",")
+
+		}
+		patient, _ := service.GetPatientByIDTenTwo(adminUser.CurrentOrgId, order.PatientId)
+		var dia_config []*models.HisXtDiagnoseConfig
+		var name string
+		for _, item := range diagnosis_ids {
+			id, _ := strconv.ParseInt(item, 10, 64)
+			diagnosisConfig, _ := service.FindDiagnoseById(id)
+			dia_config = append(dia_config, diagnosisConfig)
+			if len(name) == 0 {
+				name = diagnosisConfig.ClassName
+
+			} else {
+				name = name + "," + diagnosisConfig.ClassName
+			}
+		}
+
+		var bedCostTotal float64 = 0         //床位总费
+		var bedCostSelfTotal float64 = 0     //床位自费
+		var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+		var bedSelfTotal float64 = 0         //床位部分项目自费
+		var bedInscpTotal float64 = 0        //床位部分项目自费
+
+		var operationCostTotal float64 = 0         //手术费
+		var operationCostSelfTotal float64 = 0     //手术费
+		var operationCostPartSelfTotal float64 = 0 //手术费
+		var operationSelfTotal float64 = 0         //床位部分项目自费
+		var operationInscpTotal float64 = 0        //床位部分项目自费
+
+		var otherCostTotal float64 = 0         //其他费用
+		var otherCostSelfTotal float64 = 0     //其他费用
+		var otherCostPartSelfTotal float64 = 0 //其他费用
+		var otherSelfTotal float64 = 0         //床位部分项目自费
+		var otherInscpTotal float64 = 0        //床位部分项目自费
+
+		var materialCostTotal float64 = 0         //材料费
+		var materialCostSelfTotal float64 = 0     //材料费
+		var materialCostPartSelfTotal float64 = 0 //材料费
+		var materialSelfTotal float64 = 0         //床位部分项目自费
+		var materialInscpTotal float64 = 0        //床位部分项目自费
+
+		var westernMedicineCostTotal float64 = 0         //西药费
+		var westernMedicineCostSelfTotal float64 = 0     //西药费
+		var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+		var westernMedicineSelfTotal float64 = 0         //床位部分项目自费
+		var westernMedicineInscpTotal float64 = 0        //床位部分项目自费
+
+		var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+		var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+		var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+		var chineseTraditionalSelfTotal float64 = 0                 //床位部分项目自费
+		var chineseTraditionalInscpTotal float64 = 0                //床位部分项目自费
+
+		var checkCostTotal float64 = 0         //检查费
+		var checkCostSelfTotal float64 = 0     //检查费
+		var checkCostPartSelfTotal float64 = 0 //检查费
+		var checkSelfTotal float64 = 0         //床位部分项目自费
+		var checkInscpTotal float64 = 0        //床位部分项目自费
+
+		var laboratoryCostTotal float64 = 0         //化验费
+		var laboratoryCostSelfTotal float64 = 0     //化验费
+		var laboratoryCostPartSelfTotal float64 = 0 //化验费
+		var laboratorySelfTotal float64 = 0         //床位部分项目自费
+		var laboratoryInscpTotal float64 = 0        //床位部分项目自费
+
+		var treatCostTotal float64 = 0         //治疗费用
+		var treatCostSelfTotal float64 = 0     //治疗费用
+		var treatCostPartSelfTotal float64 = 0 //治疗费用
+		var treatSelfTotal float64 = 0         //床位部分项目自费
+		var treatInscpTotal float64 = 0        //床位部分项目自费
+
+		decimal.DivisionPrecision = 2
+
+		for _, item := range orderInfos {
+			if item.MedChrgitmType == "01" { //床位费
+				bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				bedSelfTotal, _ = decimal.NewFromFloat(bedSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				bedInscpTotal, _ = decimal.NewFromFloat(bedInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+				if item.MedChrgitmType == "03" { //检查费
+					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+					laboratorySelfTotal, _ = decimal.NewFromFloat(laboratorySelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+					laboratoryInscpTotal, _ = decimal.NewFromFloat(laboratoryInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+				}
+			} else {
+
+				if item.MedChrgitmType == "03" { //检查费
+					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+					checkSelfTotal, _ = decimal.NewFromFloat(checkSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+					checkInscpTotal, _ = decimal.NewFromFloat(checkInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+				}
+
+			}
+
+			if item.MedChrgitmType == "04" { //化验费
+				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				laboratorySelfTotal, _ = decimal.NewFromFloat(laboratorySelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				laboratoryInscpTotal, _ = decimal.NewFromFloat(laboratoryInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+
+				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				treatSelfTotal, _ = decimal.NewFromFloat(treatSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				treatInscpTotal, _ = decimal.NewFromFloat(treatInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "06" { //手术费
+				operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				operationSelfTotal, _ = decimal.NewFromFloat(operationSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				operationInscpTotal, _ = decimal.NewFromFloat(operationInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "08" { //材料费
+				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				materialSelfTotal, _ = decimal.NewFromFloat(materialSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				materialInscpTotal, _ = decimal.NewFromFloat(materialInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "09" { //西药费
+				westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				westernMedicineSelfTotal, _ = decimal.NewFromFloat(westernMedicineSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				westernMedicineInscpTotal, _ = decimal.NewFromFloat(westernMedicineInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "11" { //中成费
+				chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				chineseTraditionalSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				chineseTraditionalInscpTotal, _ = decimal.NewFromFloat(chineseTraditionalInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+
+			if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				otherSelfTotal, _ = decimal.NewFromFloat(otherSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				otherInscpTotal, _ = decimal.NewFromFloat(otherInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+			}
+		}
+
+		miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+
+		printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+		charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
+
+		doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, his_hospital.Doctor)
+
+		roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+
+		var doctor_name string
+		if roles.ID == 0 {
+			doctor_name = "管理员"
+		} else {
+			doctor_name = roles.UserName
+		}
+
+		yiliao_leibie := ""
+
+		switch order.MedType {
+		case "11":
+			yiliao_leibie = "普通门诊"
+			break
+		case "12":
+			yiliao_leibie = "门诊挂号"
+			break
+		case "13":
+			yiliao_leibie = "急诊"
+			break
+		case "14":
+			yiliao_leibie = "门诊特殊病"
+			break
+		case "15":
+			yiliao_leibie = "门诊统筹"
+			break
+		case "16":
+			yiliao_leibie = "门诊慢性病"
+			break
+		case "21":
+			yiliao_leibie = "普通住院"
+			break
+		}
+		var newOrder models.Orders
+
+		newOrder.Diagnosis = name
+		newOrder.OrderInfos = orderInfos
+		newOrder.Number = order.MdtrtId
+		newOrder.Date = order.SettleAccountsDate
+		newOrder.ChargeAdmin = charge_admin
+		newOrder.PrintorAdmin = printor_admin
+		newOrder.Order = order
+		newOrder.BedCostTotal = bedCostTotal
+		newOrder.BedCostSelfTotal = bedCostSelfTotal
+		newOrder.BedCostPartSelfTotal = bedCostPartSelfTotal
+		newOrder.BedSelfTotal = bedSelfTotal
+		newOrder.BedInscpTotal = bedInscpTotal
+		newOrder.OperationCostTotal = operationCostTotal
+		newOrder.OperationCostSelfTotal = operationCostSelfTotal
+		newOrder.OperationCostPartSelfTotal = operationCostPartSelfTotal
+		newOrder.OperationSelfTotal = operationSelfTotal
+		newOrder.OperationInscpTotal = operationInscpTotal
+		newOrder.OtherCostTotal = otherCostTotal
+		newOrder.OtherCostSelfTotal = otherCostSelfTotal
+		newOrder.OtherCostPartSelfTotal = otherCostPartSelfTotal
+		newOrder.OtherSelfTotal = otherSelfTotal
+		newOrder.OtherInscpTotal = otherInscpTotal
+
+		newOrder.MaterialCostTotal = materialCostTotal
+		newOrder.MaterialCostSelfTotal = materialCostSelfTotal
+		newOrder.MaterialCostPartSelfTotal = materialCostPartSelfTotal
+		newOrder.MaterialSelfTotal = materialSelfTotal
+		newOrder.MaterialInscpTotal = materialInscpTotal
+
+		newOrder.WesternMedicineCostTotal = westernMedicineCostTotal
+		newOrder.WesternMedicineCostSelfTotal = westernMedicineCostSelfTotal
+		newOrder.WesternMedicineCostPartSelfTotal = westernMedicineCostPartSelfTotal
+		newOrder.WesternMedicineSelfTotal = westernMedicineSelfTotal
+		newOrder.WesternMedicineInscpTotal = westernMedicineInscpTotal
+
+		newOrder.ChineseTraditionalMedicineCostTotal = chineseTraditionalMedicineCostTotal
+		newOrder.ChineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostSelfTotal
+		newOrder.ChineseTraditionalMedicineCostPartSelfTotal = chineseTraditionalMedicineCostPartSelfTotal
+		newOrder.ChineseTraditionalSelfTotal = chineseTraditionalSelfTotal
+		newOrder.ChineseTraditionalInscpTotal = chineseTraditionalInscpTotal
+
+		newOrder.CheckCostTotal = checkCostTotal
+		newOrder.CheckCostSelfTotal = checkCostSelfTotal
+		newOrder.CheckCostPartSelfTotal = checkCostPartSelfTotal
+		newOrder.CheckSelfTotal = checkSelfTotal
+		newOrder.CheckInscpTotal = checkInscpTotal
+
+		newOrder.LaboratoryCostTotal = laboratoryCostTotal
+		newOrder.LaboratoryCostSelfTotal = laboratoryCostSelfTotal
+		newOrder.LaboratoryCostPartSelfTotal = laboratoryCostPartSelfTotal
+		newOrder.LaboratorySelfTotal = laboratorySelfTotal
+		newOrder.LaboratoryInscpTotal = laboratoryInscpTotal
+
+		newOrder.TreatCostTotal = treatCostTotal
+		newOrder.TreatCostSelfTotal = treatCostSelfTotal
+		newOrder.TreatCostPartSelfTotal = treatCostPartSelfTotal
+		newOrder.TreatSelfTotal = treatSelfTotal
+		newOrder.TreatInscpTotal = treatInscpTotal
+
+		newOrder.DoctorInfo = doctor_info
+		newOrder.DoctorName = doctor_name
+		newOrder.HealthCardNo = order.PsnNo
+		newOrder.YiliaoLeibie = yiliao_leibie
+		newOrder.Patient = patient
+		newOrder.OrgName = miConfig.OrgName
+		newOrder.OrgCode = miConfig.Code
+		newOrder.OrderNumber = order.Number
+		newOrder.HisPatient = his
+		newOrder.DiaConfig = dia_config
+
+		newOrders = append(newOrders, newOrder)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"orders": newOrders,
+	})
 }
 
 func (c *HisApiController) GetTestOrder() {
@@ -1328,7 +1640,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
 
-	fmt.Println("0230032032032032032032023---------------", pharmacyConfig.IsOpen)
 	//药品发药出库
 	if pharmacyConfig.IsOpen == 1 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
@@ -2698,6 +3009,7 @@ func (c *HisApiController) CreateHisPrescription() {
 		if drugOutConfig.IsOpen == 1 {
 			for _, item := range hisdoctorlist {
 				drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
+
 				// 查询该药品最后一次出库记录
 				druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
 
@@ -5572,7 +5884,7 @@ func (c *HisApiController) setAdviceTemplateWithJSON(advice *models.HisPrescript
 		day := int64(json["day"].(float64))
 		advice.Day = day
 	}
-
+	advice.FrequencyType = 1
 	return 0
 }
 
@@ -5627,6 +5939,8 @@ func (c *HisApiController) setProjectTemplateWithJSON(project *models.HisPrescri
 		unit, _ := json["unit"].(string)
 		project.Unit = unit
 	}
+	project.FrequencyType = 1
+
 	return 0
 }
 
@@ -5640,6 +5954,8 @@ func (c *HisApiController) GetHisOrderList() {
 	p_type, _ := c.GetInt64("p_type", 0)
 	sort_type, _ := c.GetInt64("sort_type", 0)
 	charge_type, _ := c.GetInt64("charge_type", 0)
+	sch_type, _ := c.GetInt64("sch_type", 0)
+	zone_type, _ := c.GetInt64("zone_type", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -5666,7 +5982,7 @@ func (c *HisApiController) GetHisOrderList() {
 
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type)
 
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
@@ -6208,12 +6524,6 @@ func (c *HisApiController) GetUploadInfo() {
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_ways := c.GetString("pay_ways")
 
-	cash_pay := c.GetString("cash_pay")
-	band_card_pay := c.GetString("band_card_pay")
-	wechat_pay := c.GetString("wechat_pay")
-	ali_pay := c.GetString("ali_pay")
-	jifen_pay := c.GetString("jifen_pay")
-
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
 	discount_price, _ := c.GetFloat("discount_price")
@@ -6234,6 +6544,12 @@ func (c *HisApiController) GetUploadInfo() {
 	reg_type, _ := c.GetInt64("p_type")
 	order_id, _ := c.GetInt64("order_id")
 
+	cash_pay := c.GetString("cash_pay")
+	wechat_pay := c.GetString("wechat_pay")
+	ali_pay := c.GetString("ali_pay")
+	jifen_pay := c.GetString("jifen_pay")
+	band_card_pay := c.GetString("band_card_pay")
+
 	dec_way := c.GetString("dec_way") //是否使用押金支付bool类型
 	tmp_decimal := c.GetString("tmp_decimal")
 	var decimal float64 //本次使用的押金
@@ -6261,10 +6577,7 @@ func (c *HisApiController) GetUploadInfo() {
 	}
 	tt, errs := strconv.ParseFloat(tmp_decimal, 64)
 	fmt.Println(errs)
-	//if errs != nil {
-	//	c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额错误")
-	//	return
-	//}
+
 	decimal = tt
 
 	his, _ := service.GetHisPatientByIdThreeTX(his_patient_id, tx)
@@ -6831,232 +7144,8 @@ func (c *HisApiController) GetUploadInfo() {
 			})
 
 		}
-	} else {
-		if tempOrder.IsPre > 0 {
-			allTotal := fmt.Sprintf("%.2f", tempOrder.MedfeeSumamt)
-			totals, _ := strconv.ParseFloat(allTotal, 64)
-			tempOrder.OrderStatus = 2
-			tempOrder.PayWay = pay_way
-			tempOrder.PayPrice = pay_price
-			tempOrder.PayCardNo = pay_card_no
-			tempOrder.DiscountPrice = discount_price
-			tempOrder.PreferentialPrice = preferential_price
-			tempOrder.RealityPrice = reality_price
-			tempOrder.FoundPrice = found_price
-			tempOrder.MedicalInsurancePrice = medical_insurance_price
-			tempOrder.PrivatePrice = private_price
-			tempOrder.FaPiaoCode = fapiao_code
-			tempOrder.FaPiaoNumber = fapiao_number
-			tempOrder.PType = 2
-			tempOrder.MedfeeSumamt = totals
-			tempOrder.Diagnosis = diagnosis_id
-			err = service.SaveHisOrder(&tempOrder)
-			err = service.UpdataOrderStatusTwo(tempOrder.Number, adminUser.CurrentOrgId)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
-				return
-			}
-			if err == nil {
-				houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
-				var goods []*models.DialysisBeforePrepareGoods
-				var newGoods []*models.NewDialysisBeforePrepareGoods
-				var infos []*models.HisDoctorAdviceInfo
-				var hisAdvice []*models.HisDoctorAdviceInfo
-				var newGoodOne []*models.NewDialysisBeforePrepareGoods
-				var infolist []*models.HisDoctorAdviceInfo
-				var oldGoods []*models.OldDialysisBeforePrepareGoods
-				for _, info := range prescriptions {
-					if info.Type == 1 {
-						infos = append(infos, info.HisDoctorAdviceInfo...)
-					}
-					if info.Type == 2 {
-						for _, sumItem := range info.HisPrescriptionProject {
-							if sumItem.Type == 3 {
-								var good models.DialysisBeforePrepareGoods
-								var newGood models.NewDialysisBeforePrepareGoods
-								good.GoodId = sumItem.GoodInfo.ID
-								good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-								count, _ := strconv.Atoi(sumItem.Count)
-								good.Count = int64(count)
-								good.StorehouseId = houseConfig.StorehouseOutInfo
-								good.ProjectId = sumItem.ID
-								goods = append(goods, &good)
-
-								newGood.GoodId = sumItem.GoodInfo.ID
-								newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-								count2, _ := strconv.Atoi(sumItem.Count)
-								newGood.Count = int64(count2)
-								newGood.StorehouseId = houseConfig.StorehouseOutInfo
-								newGood.ProjectId = sumItem.ID
-								newGoods = append(newGoods, &newGood)
-							}
-
-						}
-
-					}
-				}
-
-				settConfig, _ := service.GetSettleOpenConfigByOrgId(adminUser.CurrentOrgId)
-				if settConfig.IsOpen == 1 {
-
-					//判断库存的地方
-					for _, info := range prescriptions {
-						if info.Type == 1 {
-							infolist = append(infolist, info.HisDoctorAdviceInfo...)
-
-						}
-						if info.Type == 2 {
-							for _, sumItem := range info.HisPrescriptionProject {
-								if sumItem.Type == 3 {
-									var good models.DialysisBeforePrepareGoods
-									var newGood models.NewDialysisBeforePrepareGoods
-									var oldGood models.OldDialysisBeforePrepareGoods
-									good.GoodId = sumItem.GoodInfo.ID
-									good.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count, _ := strconv.Atoi(sumItem.Count)
-									good.Count = int64(count)
-									good.StorehouseId = houseConfig.StorehouseOutInfo
-									good.ProjectId = sumItem.ID
-									goods = append(goods, &good)
-
-									newGood.GoodId = sumItem.GoodInfo.ID
-									newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count2, _ := strconv.Atoi(sumItem.Count)
-									newGood.Count = int64(count2)
-									newGood.StorehouseId = houseConfig.StorehouseOutInfo
-									newGood.ProjectId = sumItem.ID
-									newGoods = append(newGoods, &newGood)
-
-									oldGood.GoodId = sumItem.GoodInfo.ID
-									oldGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count3, _ := strconv.Atoi(sumItem.Count)
-									oldGood.Count = int64(count3)
-									oldGood.StorehouseId = houseConfig.StorehouseOutInfo
-									oldGood.ProjectId = sumItem.ID
-									oldGood.RecordDate = sumItem.RecordDate
-
-									oldGoods = append(oldGoods, &oldGood)
-								}
-							}
-						}
-					}
-
-					for _, info := range prescriptionsOne {
-						if info.Type == 1 {
-							hisAdvice = append(hisAdvice, info.HisDoctorAdviceInfo...)
-						}
-
-						if info.Type == 2 {
-							for _, sumItem := range info.HisPrescriptionProject {
-								if sumItem.Type == 3 {
-									var newGood models.NewDialysisBeforePrepareGoods
-
-									newGood.GoodId = sumItem.GoodInfo.ID
-									newGood.GoodTypeId = sumItem.GoodInfo.GoodTypeId
-									count2, _ := strconv.Atoi(sumItem.Count)
-									newGood.Count = int64(count2)
-									newGood.StorehouseId = houseConfig.StorehouseOutInfo
-									newGood.ProjectId = sumItem.ID
-									newGoodOne = append(newGoodOne, &newGood)
-								}
-							}
-						}
-					}
-
-					//判断
-					for _, itemOne := range infos {
-						for _, itemTwo := range hisAdvice {
-							if itemOne.DrugId == itemTwo.DrugId {
-								itemTwo.Child = append(itemTwo.ChildDoctorAdvice, itemOne)
-							}
-						}
-					}
-
-					for _, itemTwo := range hisAdvice {
-						medical, _ := service.GetBaseDrugMedical(itemTwo.DrugId)
-						var sum_out_count int64
-						for _, itemThree := range itemTwo.Child {
-							var prescribing_number int64
-							stringPrescribingNumber := strconv.FormatFloat(itemThree.PrescribingNumber, 'f', -1, 64)
-							parseIntPrescribingNumber, _ := strconv.ParseInt(stringPrescribingNumber, 10, 64)
-							if itemThree.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-								prescribing_number = parseIntPrescribingNumber * medical.MinNumber
-							}
-							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-								prescribing_number = parseIntPrescribingNumber
-							}
-							if itemThree.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
-								prescribing_number = parseIntPrescribingNumber
-							}
-							sum_out_count += prescribing_number
-						}
-						houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.CurrentOrgId)
-						drugStockOut, _ := service.GetDrugSumOutCountByDrugId(itemTwo.DrugId, adminUser.CurrentOrgId, houseConfig.DrugStorehouseOut)
-
-						if sum_out_count > drugStockOut.FlushCount {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":  "2",
-								"drug": medical,
-							})
-							return
-						}
-					}
-
-					for _, itemOne := range newGoods {
-						for _, item := range newGoodOne {
-							if itemOne.ProjectId == item.ProjectId {
-								item.ChildNewDialysisBeforePrepareGoods = append(item.ChildNewDialysisBeforePrepareGoods, item)
-							}
-						}
-					}
-
-					for _, item := range newGoodOne {
-						var sum_out_count_one int64
-						good, _ := service.GetGoodInformationByGoodIdOne(item.GoodId)
-
-						for _, itemOne := range item.ChildNewDialysisBeforePrepareGoods {
-							sum_out_count_one += itemOne.Count
-						}
-						list, _ := service.GetStockGoodList(item.GoodId, adminUser.CurrentOrgId, houseConfig.StorehouseOutInfo)
-						fmt.Println("sum_out_count_one", sum_out_count_one)
-						fmt.Println("list.FlushCount", list.FlushCount)
-						if sum_out_count_one > list.FlushCount {
-							c.ServeSuccessJSON(map[string]interface{}{
-								"msg":  "3",
-								"good": good,
-							})
-							return
-						}
-					}
-					for _, item := range infolist {
-						service.HisDrugsDelivery(item.UserOrgId, adminUser.AdminUser.Id, item)
-					}
-					for _, item := range oldGoods {
-						dialyPrepareOne := models.DialysisBeforePrepare{
-							GoodTypeId:   item.GoodTypeId,
-							GoodId:       item.GoodId,
-							PatientId:    item.PatientId,
-							RecordDate:   item.RecordDate,
-							UserOrgId:    item.UserOrgId,
-							Count:        item.Count,
-							Ctime:        time.Now().Unix(),
-							Creater:      adminUser.AdminUser.Id,
-							CommdityCode: item.CommdityCode,
-							Status:       1,
-							StorehouseId: houseConfig.StorehouseOutInfo,
-						}
-						err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
-					}
-
-					service.ConsumablesDeliveryTotal(adminUser.CurrentOrgId, his.PatientId, his.RecordDate, goods, newGoods, adminUser.AdminUser.Id)
-				}
-
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "结算成功",
-				})
-			}
-		}
 	}
+
 }
 
 // 退款
@@ -9191,96 +9280,198 @@ func (c *HisApiController) CreateHisPrescriptionTemplate() {
 		return
 	}
 
-	err = service.CreateHisPrescriptionTemplate(template)
-	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-		if len(prescriptions) > 0 {
-			for _, item := range prescriptions {
-				items := item.(map[string]interface{})
-				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
-					utils.ErrorLog("type")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				types := int64(items["type"].(float64))
+	template_one, _ := service.GetHisPrescriptionTemplateByModeId(mode_id, patient_id, c.GetAdminUserInfo().CurrentOrgId)
 
-				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
-					utils.ErrorLog("med_type")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				med_type := strconv.Itoa(int(items["med_type"].(float64)))
+	//如果已经存在记录则删除处方
+	if template_one.ID > 0 {
+		ps, _ := service.GetHisPrescriptionInfoTemplates(template_one.ID, template_one.UserOrgId)
+		for _, item := range ps {
+			service.DelelteHisPrescriptionInfoTemplate(item.ID, item.UserOrgId)
+		}
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+						utils.ErrorLog("type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					types := int64(items["type"].(float64))
 
-				ctime := time.Now().Unix()
-				prescription := &models.HisPrescriptionInfoTemplate{
-					PatientId:   patient_id,
-					UserOrgId:   adminInfo.CurrentOrgId,
-					Ctime:       ctime,
-					Mtime:       ctime,
-					Type:        types,
-					Modifier:    adminInfo.AdminUser.Id,
-					Creator:     adminInfo.AdminUser.Id,
-					Status:      1,
-					PTemplateId: template.ID,
-					MedType:     med_type,
-				}
-				service.CreateHisPrescriptionInfoTemplate(prescription)
+					if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+						utils.ErrorLog("med_type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					med_type := strconv.Itoa(int(items["med_type"].(float64)))
 
-				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-					advices := items["advices"].([]interface{})
-					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 					ctime := time.Now().Unix()
-					mtime := ctime
-					if len(advices) > 0 {
-						for _, advice := range advices {
-							var s models.HisPrescriptionAdviceTemplate
-							s.PrescriptionId = prescription.ID
-							s.AdviceType = 2
-							s.StopState = 2
-							s.ExecutionState = 2
-							s.Status = 1
-							s.UserOrgId = adminInfo.CurrentOrgId
-							s.CreatedTime = ctime
-							s.UpdatedTime = mtime
-							s.PatientId = patient_id
-							errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
-							}
+					prescription := &models.HisPrescriptionInfoTemplate{
+						PatientId:   patient_id,
+						UserOrgId:   adminInfo.CurrentOrgId,
+						Ctime:       ctime,
+						Mtime:       ctime,
+						Type:        types,
+						Modifier:    adminInfo.AdminUser.Id,
+						Creator:     adminInfo.AdminUser.Id,
+						Status:      1,
+						PTemplateId: template_one.ID,
+						MedType:     med_type,
+					}
+					service.CreateHisPrescriptionInfoTemplate(prescription)
 
-							service.CreateHisPrescriptionAdviceTemplate(&s)
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+						ctime := time.Now().Unix()
+						mtime := ctime
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var s models.HisPrescriptionAdviceTemplate
+								s.PrescriptionId = prescription.ID
+								s.AdviceType = 2
+								s.StopState = 2
+								s.ExecutionState = 2
+								s.Status = 1
+								s.UserOrgId = adminInfo.CurrentOrgId
+								s.CreatedTime = ctime
+								s.UpdatedTime = mtime
+								s.PatientId = patient_id
+								errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+
+								service.CreateHisPrescriptionAdviceTemplate(&s)
 
+							}
 						}
 					}
+					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+						projects := items["project"].([]interface{})
+						if len(projects) > 0 {
+							for _, project := range projects {
+								var p models.HisPrescriptionProjectTemplate
+								p.PrescriptionId = prescription.ID
+								p.Ctime = time.Now().Unix()
+								p.Mtime = time.Now().Unix()
+								p.PatientId = patient_id
+								p.UserOrgId = adminInfo.CurrentOrgId
+								p.Status = 1
+								errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+								service.CreateHisPrescriptionProjectTemplate(&p)
+
+							}
+						}
+					}
+
 				}
-				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
-					projects := items["project"].([]interface{})
-					if len(projects) > 0 {
-						for _, project := range projects {
-							var p models.HisPrescriptionProjectTemplate
-							p.PrescriptionId = prescription.ID
-							p.Ctime = time.Now().Unix()
-							p.Mtime = time.Now().Unix()
-							p.PatientId = patient_id
-							p.UserOrgId = adminInfo.CurrentOrgId
-							p.Status = 1
-							errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "创建成功",
+				})
+			}
+		}
+
+	} else {
+		err = service.CreateHisPrescriptionTemplate(template)
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+						utils.ErrorLog("type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					types := int64(items["type"].(float64))
+
+					if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+						utils.ErrorLog("med_type")
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					med_type := strconv.Itoa(int(items["med_type"].(float64)))
+
+					ctime := time.Now().Unix()
+					prescription := &models.HisPrescriptionInfoTemplate{
+						PatientId:   patient_id,
+						UserOrgId:   adminInfo.CurrentOrgId,
+						Ctime:       ctime,
+						Mtime:       ctime,
+						Type:        types,
+						Modifier:    adminInfo.AdminUser.Id,
+						Creator:     adminInfo.AdminUser.Id,
+						Status:      1,
+						PTemplateId: template.ID,
+						MedType:     med_type,
+					}
+					service.CreateHisPrescriptionInfoTemplate(prescription)
+
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+						ctime := time.Now().Unix()
+						mtime := ctime
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var s models.HisPrescriptionAdviceTemplate
+								s.PrescriptionId = prescription.ID
+								s.AdviceType = 2
+								s.StopState = 2
+								s.ExecutionState = 2
+								s.Status = 1
+								s.UserOrgId = adminInfo.CurrentOrgId
+								s.CreatedTime = ctime
+								s.UpdatedTime = mtime
+								s.PatientId = patient_id
+								errcode := c.setAdviceTemplateWithJSON(&s, advice.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+
+								service.CreateHisPrescriptionAdviceTemplate(&s)
+
 							}
-							service.CreateHisPrescriptionProjectTemplate(&p)
+						}
+					}
+					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+						projects := items["project"].([]interface{})
+						if len(projects) > 0 {
+							for _, project := range projects {
+								var p models.HisPrescriptionProjectTemplate
+								p.PrescriptionId = prescription.ID
+								p.Ctime = time.Now().Unix()
+								p.Mtime = time.Now().Unix()
+								p.PatientId = patient_id
+								p.UserOrgId = adminInfo.CurrentOrgId
+								p.Status = 1
+								errcode := c.setProjectTemplateWithJSON(&p, project.(map[string]interface{}))
+								if errcode > 0 {
+									c.ServeFailJSONWithSGJErrorCode(errcode)
+									return
+								}
+								service.CreateHisPrescriptionProjectTemplate(&p)
 
+							}
 						}
 					}
+
 				}
 
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "创建成功",
+				})
 			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "创建成功",
-			})
 		}
 	}
 

controllers/his_charge_api_controller.go

@@ -299,6 +299,7 @@ func (c *HisChargeApiController) GetHisInspectionList() {
 	is_print, _ := c.GetInt64("is_print")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
+	tube_color, _ := c.GetInt64("tube_color")
 
 	adminUser := c.GetAdminUserInfo()
 
@@ -309,7 +310,21 @@ func (c *HisChargeApiController) GetHisInspectionList() {
 
 	}
 	record_time := startTime.Unix()
-	labels, total, err := service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword)
+	var labels []*models.HisLabelPrintInfo
+	var labels_two []*models.HisLabelPrintInfo
+
+	var total int64
+	var total_two int64
+	//var err error
+	if tube_color == 0 {
+		labels, total, err = service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+	} else {
+		labels, total, err = service.GetLabelPrintList(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+		labels_two, total_two, err = service.GetLabelPrintListTwo(page, limit, adminUser.CurrentOrgId, record_time, is_print, keyword, tube_color)
+		total = total + total_two
+		labels = append(labels, labels_two...)
+	}
+
 	if err == nil {
 
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/manage_api_controller.go

@@ -993,9 +993,19 @@ func (this *MachineApiController) SaveInformation() {
 	contagion := dataBody["contagion"].(string)
 	dialysis_mode := int64(dataBody["dialysis_mode"].(float64))
 	startDateStr := dataBody["start_time"].(string)
-	startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startDateStr)
+	var startDataUnix int64
+	if len(startDateStr) > 0 {
+		startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startDateStr)
+		startDataUnix = startDate.Unix()
+	}
+
 	endDateStr := dataBody["end_time"].(string)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endDateStr)
+	var endDateUnix int64
+	if len(endDateStr) > 0 {
+		endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", endDateStr)
+		endDateUnix = endDate.Unix()
+	}
+
 	dialysis_time := dataBody["dialysis_time"].(string)
 	hyperfiletration := dataBody["hyperfiltratio"].(float64)
 	weight_loss := dataBody["weight_loss"].(float64)
@@ -1018,9 +1028,19 @@ func (this *MachineApiController) SaveInformation() {
 	disinfection_residue := int64(dataBody["disinfection_residue"].(float64))
 	longtime := dataBody["longtime"].(string)
 	start_DateStr := dataBody["starttime"].(string)
-	start_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", start_DateStr)
+	var start_DateStr_Unix int64
+	if len(start_DateStr) > 0 {
+		start_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", start_DateStr)
+		start_DateStr_Unix = start_Date.Unix()
+	}
+
 	end_DateStr := dataBody["endtime"].(string)
-	end_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", end_DateStr)
+	var end_DateStr_Unix int64
+	if len(end_DateStr) > 0 {
+		end_Date, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", end_DateStr)
+		end_DateStr_Unix = end_Date.Unix()
+	}
+
 	dialysis_checked := int64(dataBody["dialysis_checked"].(float64))
 
 	dialysis_name := int64(dataBody["dialysis_name"].(float64))
@@ -1040,7 +1060,7 @@ func (this *MachineApiController) SaveInformation() {
 	sign_name := int64(dataBody["sign_name"].(float64))
 
 	information, errinfor := service.GetInformation(eid, startdate, orgid, classtype)
-	fmt.Print("errinfor", errinfor)
+
 	fmt.Print("information", information)
 
 	//获取该机器最后一次的透析次数
@@ -1061,8 +1081,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1081,8 +1101,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,
@@ -1116,8 +1136,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1136,8 +1156,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,
@@ -1178,8 +1198,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1198,8 +1218,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,
@@ -1233,8 +1253,8 @@ func (this *MachineApiController) SaveInformation() {
 				PatientId:             patient_time,
 				Contagion:             contagion,
 				DialysisMode:          dialysis_mode,
-				StartTime:             startDate.Unix(),
-				EndTime:               endDate.Unix(),
+				StartTime:             startDataUnix,
+				EndTime:               endDateUnix,
 				DialysisHour:          dialysis_time,
 				Hyperfiltratio:        hyperfiletration,
 				WeightLoss:            weight_loss,
@@ -1253,8 +1273,8 @@ func (this *MachineApiController) SaveInformation() {
 				DisinfectionStatus:    disinfection_status,
 				DisinfectionResidue:   disinfection_residue,
 				LongTime:              longtime,
-				DisinfecStartime:      start_Date.Unix(),
-				DisinfecEndtime:       end_Date.Unix(),
+				DisinfecStartime:      start_DateStr_Unix,
+				DisinfecEndtime:       end_DateStr_Unix,
 				DialysisChecked:       dialysis_checked,
 				DialysisName:          dialysis_name,
 				Norms:                 norms,
@@ -2018,83 +2038,78 @@ func (this *MachineApiController) SaveRepair() {
 	loc, _ := time.LoadLocation("Local")
 	adminUserInfo := this.GetAdminUserInfo()
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
+
 	addmacher, _ := service.GetBedId(id)
 	OrgID := adminUserInfo.CurrentOrgId
-	fmt.Println("orgid", OrgID)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
 	gua_date := dataBody["guarantee_date"].(string)
-	fmt.Println("保修日期", gua_date)
+
 	inLocation, _ := time.ParseInLocation(timeLayout+" 15:04:05", gua_date+" 00:00:00", loc)
 	guaDate := inLocation.Unix()
-	fmt.Println("保修日期", guaDate)
 
 	startDateStr := dataBody["start_time"].(string)
-	fmt.Println("出发时间", startDateStr)
+
 	startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startDateStr)
-	fmt.Println("触发事件", startDate.Unix())
 
 	arriveDateStr := dataBody["arrive_time"].(string)
-	fmt.Println("到达时间", arriveDateStr)
+
 	arriveDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", arriveDateStr)
-	fmt.Println("到达时间", arriveDate.Unix())
 
 	finishDateStr := dataBody["finish_time"].(string)
-	fmt.Println("完成时间", finishDateStr)
+
 	finishDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", finishDateStr)
-	fmt.Println("完成时间", finishDate.Unix())
 
 	totaldistance := dataBody["total_distance"].(string)
-	fmt.Println("总公里输", totaldistance)
 
 	failurestate := int64(dataBody["failure_stage"].(float64))
-	fmt.Println("故事范式阶段", failurestate)
 
 	codeInformation := dataBody["code_information"].(string)
-	fmt.Println("故事提示信息及代码", codeInformation)
 
 	faultdescription := dataBody["fault_description"].(string)
-	fmt.Println("故障描述", faultdescription)
 
 	causeAnalysis := dataBody["cause_analysis"].(string)
-	fmt.Println("原因分析", causeAnalysis)
 
 	treatmentprocess := dataBody["treatment_process"].(string)
-	fmt.Println("处理过程", treatmentprocess)
 
 	images := dataBody["images"].(string)
-	fmt.Println("上传图片", images)
 
 	exclude := int64(dataBody["exclude"].(float64))
-	fmt.Println("故障是否排除", exclude)
 
 	reason := dataBody["reason"].(string)
-	fmt.Println("原因", reason)
 
 	imageName := dataBody["imageName"].(string)
 
+	function_accessories_inspection := dataBody["function_accessories_inspection"].(string)
+
+	other_information := dataBody["other_information"].(string)
+
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
 	repair := models.DeviceRepair{
-		BedId:            addmacher.BedId,
-		EquitmentId:      id,
-		GuaranteeDate:    guaDate,
-		StartTime:        startDate.Unix(),
-		ArriveTime:       arriveDate.Unix(),
-		FinishTime:       finishDate.Unix(),
-		TotalDistance:    totaldistance,
-		FailureStage:     failurestate,
-		FaultDescription: faultdescription,
-		CauseAnalysis:    causeAnalysis,
-		TreatmentProcess: treatmentprocess,
-		Images:           images,
-		Exclude:          exclude,
-		Reason:           reason,
-		Status:           1,
-		UserOrgId:        OrgID,
-		Ctime:            time.Now().Unix(),
-		CodeInformation:  codeInformation,
-		ImageName:        imageName,
+		BedId:                         addmacher.BedId,
+		EquitmentId:                   id,
+		GuaranteeDate:                 guaDate,
+		StartTime:                     startDate.Unix(),
+		ArriveTime:                    arriveDate.Unix(),
+		FinishTime:                    finishDate.Unix(),
+		TotalDistance:                 totaldistance,
+		FailureStage:                  failurestate,
+		FaultDescription:              faultdescription,
+		CauseAnalysis:                 causeAnalysis,
+		TreatmentProcess:              treatmentprocess,
+		Images:                        images,
+		Exclude:                       exclude,
+		Reason:                        reason,
+		Status:                        1,
+		UserOrgId:                     OrgID,
+		Ctime:                         time.Now().Unix(),
+		CodeInformation:               codeInformation,
+		ImageName:                     imageName,
+		FunctionAccessoriesInspection: function_accessories_inspection,
+		OtherInformation:              other_information,
+		AdminUserId:                   admin_user_id,
 	}
 	err = service.CreateRepair(&repair)
 	if err != nil {
@@ -2111,27 +2126,38 @@ func (this *MachineApiController) GetAllRepair() {
 	page, _ := this.GetInt64("page")
 	adminUser := this.GetAdminUserInfo()
 	orgID := adminUser.CurrentOrgId
+	appId := adminUser.CurrentAppId
 	repair, total, err := service.GetAllRepair(orgID, limit, page)
+
+	addmacher, _ := service.GetAllMachineByOrgId(orgID)
+
+	docList, _ := service.GetAllDoctor(orgID, appId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"repair": repair,
-		"total":  total,
+		"repair":     repair,
+		"total":      total,
+		"macherList": addmacher,
+		"docList":    docList,
 	})
 }
 
 func (this *MachineApiController) EditRepair() {
 	id, _ := this.GetInt64("id")
-	fmt.Println("id", id)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	repair, err := service.EditRepair(id)
+	docList, _ := service.GetAllDoctor(orgId, appId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"repair": repair,
+		"repair":  repair,
+		"docList": docList,
 	})
 }
 
@@ -2194,21 +2220,30 @@ func (this *MachineApiController) UpdateRepair() {
 	fmt.Println("原因", reason)
 
 	imageName := dataBody["image_name"].(string)
+
+	function_accessories_inspection := dataBody["function_accessories_inspection"].(string)
+
+	other_information := dataBody["other_information"].(string)
+
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
 	deviceRepair := models.DeviceRepair{
-		GuaranteeDate:    guaDate,
-		StartTime:        startDate.Unix(),
-		ArriveTime:       arriveDate.Unix(),
-		FinishTime:       finishDate.Unix(),
-		TotalDistance:    totaldistance,
-		FailureStage:     failurestate,
-		FaultDescription: faultdescription,
-		CauseAnalysis:    causeAnalysis,
-		TreatmentProcess: treatmentprocess,
-		Images:           images,
-		Exclude:          exclude,
-		Reason:           reason,
-		CodeInformation:  codeInformation,
-		ImageName:        imageName,
+		GuaranteeDate:                 guaDate,
+		StartTime:                     startDate.Unix(),
+		ArriveTime:                    arriveDate.Unix(),
+		FinishTime:                    finishDate.Unix(),
+		TotalDistance:                 totaldistance,
+		FailureStage:                  failurestate,
+		FaultDescription:              faultdescription,
+		CauseAnalysis:                 causeAnalysis,
+		TreatmentProcess:              treatmentprocess,
+		Images:                        images,
+		Exclude:                       exclude,
+		Reason:                        reason,
+		CodeInformation:               codeInformation,
+		ImageName:                     imageName,
+		FunctionAccessoriesInspection: function_accessories_inspection,
+		OtherInformation:              other_information,
+		AdminUserId:                   admin_user_id,
 	}
 	err = service.UpdateRepair(id, OrgID, &deviceRepair)
 	if err != nil {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -674,7 +674,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
 				evaluation.Remark = lastPredialysisEvaluation.Remark
 				if adminUserInfo.Org.Id == 10318 {
-					evaluation.Remark = "患者已确认无发热，无流行病学接触史"
+					evaluation.Remark = ""
 				}
 				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10447 {
 					evaluation.BreathingRate = "20"

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1772,7 +1772,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				}
 
 				if schedulePatient.ScheduleType == 2 {
-					advice.StartTime = recordDate.Unix() + 11*60*60
+					advice.StartTime = recordDate.Unix() + 10*60*60
 				}
 			}
 			// 抗凝剂名称
@@ -2804,9 +2804,12 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			//针对肇庆三鹤血液透析中心
 
-			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
+			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10440 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
+			}
 
+			if adminUserInfo.Org.Id == 10469 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 60 / float64(totalMin))
 			}
 
 			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
@@ -2819,9 +2822,11 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = value
 			}
 
-			//针对医师汇
-			if adminUserInfo.Org.Id == 10471 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration*60/float64(totalMin)*1000) / 1000
+			//针对
+			if adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 3877 {
+
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 		}
 	}
@@ -3407,7 +3412,7 @@ func (c *DialysisAPIController) PostSolution() {
 			}
 
 			if schedulePatient.ScheduleType == 2 {
-				advice.StartTime = recordDate.Unix() + 11*60*60
+				advice.StartTime = recordDate.Unix() + 10*60*60
 			}
 		}
 		// 抗凝剂名称
@@ -3644,6 +3649,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	_, evaluation := service.FindPredialysisEvaluationByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
 	fmt.Println(evaluation)
+
 	if prescription.ID > 0 {
 
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
@@ -3688,21 +3694,25 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10469 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10471 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
+			if adminInfo.Org.Id == 10469 {
+
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 60 / 1000 / float64(totalMin) * 1000)
+
+				record.UltrafiltrationRate = ultrafiltration_rate
 
-				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
 			if adminInfo.Org.Id == 10471 {
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
+
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+
 			}
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
@@ -4289,9 +4299,9 @@ func (c *DialysisAPIController) GetLongAdviceOne() {
 		var advice_three []*models.DoctorAdvice
 
 		advices, err := service.GetLastLongAdviceByGroupNo(adminUserInfo.Org.Id, patient_id, theStartTime)
-		fmt.Println("advices++++++++++++++++", advices)
+
 		advices_two, err := service.GetLastLongAdviceByGroupNoThree(adminUserInfo.Org.Id, patient_id, theStartTime)
-		fmt.Println("advices_two------------------------", advices_two)
+
 		for _, advice := range advices {
 			if advice.FrequencyType == 3 {
 				t := time.Now()
@@ -5733,6 +5743,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 					commdity_code := items["commdity_code"].(string)
+
 					fmt.Println(commdity_code)
 
 					prepareGoods := &models.DialysisBeforePrepareGoods{
@@ -6081,11 +6092,10 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 				}
 
-				fmt.Println("lnet---------------------------", len(outbefor))
 				if len(outbefor) > 0 {
 					//出库
 					for _, item := range outbefor {
-						fmt.Println("出库ID", item.GoodId)
+
 						var last_total int64
 						//1.查看该患者该耗材型号最后一次出库数量
 						goodInfoOne, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
@@ -6142,7 +6152,6 @@ func (c *DialysisAPIController) EditConsumables() {
 							//1.查看该患者该耗材型号最后一次出库数量
 							goodInfoTwo, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
 
-							fmt.Println("count2323323222323wi", item.Count)
 							prepare := models.DialysisBeforePrepare{
 								UserOrgId:    adminInfo.Org.Id,
 								PatientId:    patient_id,
@@ -6200,6 +6209,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						Creater:      adminInfo.AdminUser.Id,
 						Status:       1,
 						StorehouseId: houseConfig.StorehouseOutInfo,
+						ProjectId:    it.ProjectId,
 					}
 					//删除准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, it.GoodId, it.GoodTypeId)
@@ -7936,9 +7946,68 @@ func (this *DialysisAPIController) ExectionMobileAdvice() {
 							if config.IsOpen != 1 {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									service.HisDrugsDelivery(orgId, creater, &advice)
+									if orgId == 3877 || orgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(advice.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             orgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "透析医嘱页面出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              0,
+													Prescribingnumber:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											this.ServeSuccessJSON(map[string]interface{}{
+												"msg":  "2",
+												"drug": medical,
+												"ids":  ids,
+											})
+											return
+
+										}
+									}
 								}
 								if pharmacyConfig.IsOpen != 1 {
 									service.HisDrugsDelivery(orgId, creater, &advice)
+									if orgId == 3877 || orgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(advice.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             orgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "透析医嘱页面出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              0,
+													Prescribingnumber:     advice.PrescribingNumber,
+													PrescribingNumberUnit: advice.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											this.ServeSuccessJSON(map[string]interface{}{
+												"msg":  "2",
+												"drug": medical,
+												"ids":  ids,
+											})
+											return
+										}
+									}
 								}
 
 								//更新字典里面的库存

controllers/mobile_api_controllers/patient_api_controller.go

@@ -685,7 +685,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
 
 		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.Org.Id)
-		fmt.Println("drugStockConfig.IsOpen32232323232", drugStockConfig.IsOpen)
+
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
@@ -701,7 +701,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if isHasWay {
 					var total int64
 					var prescribing_number_total int64
-					fmt.Println("advicesssssssssssssssss", len(advices))
+
 					for _, item := range advices {
 						if item.Way == 1 {
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -1075,6 +1075,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			item.ExecutionState = 1
 			item.ExecutionStaff = adminInfo.AdminUser.Id
 			item.ExecutionTime = theTime.Unix()
+			item.IsMobile = 1
 			err = service.SaveHisDoctorAdvice(item)
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
@@ -1104,6 +1105,39 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				for _, item := range advices {
 					//查询改药品信息
 					medical, _ := service.GetBaseDrugMedical(item.DrugId)
+
+					//判断单位是否合格
+					if item.PrescribingNumberUnit != medical.MaxUnit && item.PrescribingNumberUnit != medical.MinUnit {
+						//查询该药品是否有出库记录
+						flowMap, _ := service.GetDrugFLowByAdviceById(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate)
+						if len(flowMap) == 0 {
+							errs := service.UpdateHisAdviceById(item.ID)
+							if errs != nil {
+								drugError := models.XtDrugError{
+									UserOrgId:             adminInfo.Org.Id,
+									DrugId:                item.DrugId,
+									RecordDate:            item.AdviceDate,
+									PatientId:             item.PatientId,
+									Remark:                "单位不统一,执行失败",
+									Status:                1,
+									Ctime:                 time.Now().Unix(),
+									Mtime:                 0,
+									SumCount:              0,
+									Prescribingnumber:     item.PrescribingNumber,
+									PrescribingNumberUnit: item.PrescribingNumberUnit,
+								}
+								service.CreateDrugError(drugError)
+							}
+						}
+						advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "7",
+							"advice": advice,
+							"ids":    ids,
+						})
+						return
+					}
+
 					//查询这个患者这个患者这个药已经出库的所有数量
 					advicelist, _ := service.GetAllHisDoctorAdviceById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
 					drugoutlist, _ := service.GetAllDrugFlowById(item.DrugId, item.PatientId, item.AdviceDate, item.UserOrgId)
@@ -1132,6 +1166,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 					if total_count == drug_count {
+
 						advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "1",
@@ -1172,6 +1207,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						if medical.IsUse == 1 {
 
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+								drugError := models.XtDrugError{
+									UserOrgId:             adminInfo.Org.Id,
+									DrugId:                item.DrugId,
+									RecordDate:            item.AdviceDate,
+									PatientId:             item.PatientId,
+									Remark:                "零用药品库存不足",
+									Status:                1,
+									Ctime:                 time.Now().Unix(),
+									Mtime:                 0,
+									SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+									Prescribingnumber:     advice.PrescribingNumber,
+									PrescribingNumberUnit: advice.PrescribingNumberUnit,
+								}
+								service.CreateDrugError(drugError)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -1181,7 +1230,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 						}
 						if medical.IsUse != 1 {
+
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+								drugError := models.XtDrugError{
+									UserOrgId:             adminInfo.Org.Id,
+									DrugId:                item.DrugId,
+									RecordDate:            item.AdviceDate,
+									PatientId:             item.PatientId,
+									Remark:                "药品库存不足",
+									Status:                1,
+									Ctime:                 time.Now().Unix(),
+									Mtime:                 0,
+									SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+									Prescribingnumber:     advice.PrescribingNumber,
+									PrescribingNumberUnit: advice.PrescribingNumberUnit,
+								}
+								service.CreateDrugError(drugError)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "3",
 									"advice": advice,
@@ -1190,6 +1254,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								return
 							}
 							if prescribing_number_total > total {
+								drugError := models.XtDrugError{
+									UserOrgId:             adminInfo.Org.Id,
+									DrugId:                item.DrugId,
+									RecordDate:            item.AdviceDate,
+									PatientId:             item.PatientId,
+									Remark:                "出库数量大于库存",
+									Status:                1,
+									Ctime:                 time.Now().Unix(),
+									Mtime:                 0,
+									SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+									Prescribingnumber:     advice.PrescribingNumber,
+									PrescribingNumberUnit: advice.PrescribingNumberUnit,
+								}
+								service.CreateDrugError(drugError)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "2",
 									"advice": advice,
@@ -1208,9 +1286,71 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								if config.IsOpen != 1 {
 									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 										service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+
+										if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 10265 {
+											//查询该药品是否有出库记录
+											flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+											if len(flowMap) == 0 {
+												errs := service.UpdateHisAdviceById(advice.ID)
+												if errs != nil {
+													drugError := models.XtDrugError{
+														UserOrgId:             adminInfo.Org.Id,
+														DrugId:                item.DrugId,
+														RecordDate:            item.AdviceDate,
+														PatientId:             item.PatientId,
+														Remark:                "出库记录为空,更新执行人失败",
+														Status:                1,
+														Ctime:                 time.Now().Unix(),
+														Mtime:                 0,
+														SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+														Prescribingnumber:     advice.PrescribingNumber,
+														PrescribingNumberUnit: advice.PrescribingNumberUnit,
+													}
+													service.CreateDrugError(drugError)
+												}
+												c.ServeSuccessJSON(map[string]interface{}{
+													"msg":    "6",
+													"advice": advice,
+													"ids":    ids,
+												})
+												return
+											}
+										}
 									}
 									if pharmacyConfig.IsOpen != 1 {
+
 										service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+										if adminInfo.Org.Id == 3877 || adminInfo.Org.Id == 10265 {
+											//查询该药品是否有出库记录
+											flowMap, _ := service.GetDrugFLowByAdviceById(advice.DrugId, advice.PatientId, advice.UserOrgId, advice.AdviceDate)
+
+											if len(flowMap) == 0 {
+
+												errs := service.UpdateHisAdviceById(advice.ID)
+												if errs != nil {
+													drugError := models.XtDrugError{
+														UserOrgId:             adminInfo.Org.Id,
+														DrugId:                item.DrugId,
+														RecordDate:            item.AdviceDate,
+														PatientId:             item.PatientId,
+														Remark:                "出库记录为空,更新执行人失败",
+														Status:                1,
+														Ctime:                 time.Now().Unix(),
+														Mtime:                 0,
+														SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+														Prescribingnumber:     advice.PrescribingNumber,
+														PrescribingNumberUnit: advice.PrescribingNumberUnit,
+													}
+													service.CreateDrugError(drugError)
+												}
+												c.ServeSuccessJSON(map[string]interface{}{
+													"msg":    "6",
+													"advice": advice,
+													"ids":    ids,
+												})
+												return
+											}
+										}
 									}
 
 									//更新字典里面的库存
@@ -1230,6 +1370,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 						}
 					}
+
 					//
 					//if config.IsOpen == 1 && item.UserOrgId == 10088 {
 					//

controllers/patient_api_controller.go

@@ -1323,7 +1323,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		adviceName, _ := adviceNameM["advice_name"].(string)
-		fmt.Println("adviceceNMAE--------------------------------", adviceName)
+
 		if len(adviceName) == 0 {
 			utils.ErrorLog("len(advice_name) == 0")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1418,9 +1418,22 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		}
 
 		remark, _ := adviceNameM["remark"].(string)
-		fmt.Println("哦哦撒搜哦搜搜哦remark-----------------------------------", remark)
+
 		advice.Remark = remark
 
+		if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 9671 {
+			if advice.PrescribingNumber == 0 {
+				advice.PrescribingNumber = 1
+			}
+			//查询该患者今日有没有双人核对
+			check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.CurrentOrgId, patientInfo.ID, advice.AdviceDate)
+			fmt.Println("chek", check)
+			if check.ID > 0 {
+				advice.Checker = check.Modifier
+				advice.CheckState = 1
+				advice.CheckTime = time.Now().Unix()
+			}
+		}
 		if adviceType == 1 {
 
 			if adviceNameM["frequency_type"] != nil || reflect.TypeOf(adviceNameM["frequency_type"]).String() == "float64" {
@@ -1448,6 +1461,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 				}
 				advice.PushStartTime = startTime
 			}
+
 		}
 
 		if adviceNameM["children"] != nil && reflect.TypeOf(adviceNameM["children"]).String() == "string" {
@@ -2368,6 +2382,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					if medical.IsUse == 1 {
+						drugError := models.XtDrugError{
+							UserOrgId:             item.UserOrgId,
+							DrugId:                item.DrugId,
+							RecordDate:            item.AdviceDate,
+							PatientId:             item.PatientId,
+							Remark:                "电脑端零用药品",
+							Status:                1,
+							Ctime:                 time.Now().Unix(),
+							Mtime:                 0,
+							SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+							Prescribingnumber:     item.PrescribingNumber,
+							PrescribingNumberUnit: item.PrescribingNumberUnit,
+						}
+						service.CreateDrugError(drugError)
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "1",
 							"advice": advice,
@@ -2376,6 +2404,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 					if medical.IsUse != 1 {
 						if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+							drugError := models.XtDrugError{
+								UserOrgId:             item.UserOrgId,
+								DrugId:                item.DrugId,
+								RecordDate:            item.AdviceDate,
+								PatientId:             item.PatientId,
+								Remark:                "电脑端药品库存不足",
+								Status:                1,
+								Ctime:                 time.Now().Unix(),
+								Mtime:                 0,
+								SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+								Prescribingnumber:     item.PrescribingNumber,
+								PrescribingNumberUnit: item.PrescribingNumberUnit,
+							}
+							service.CreateDrugError(drugError)
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "3",
 								"advice": advice,
@@ -2384,6 +2426,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if prescribing_number_total > total {
+							drugError := models.XtDrugError{
+								UserOrgId:             item.UserOrgId,
+								DrugId:                item.DrugId,
+								RecordDate:            item.AdviceDate,
+								PatientId:             item.PatientId,
+								Remark:                "电脑端出库数量大于总库存",
+								Status:                1,
+								Ctime:                 time.Now().Unix(),
+								Mtime:                 0,
+								SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+								Prescribingnumber:     item.PrescribingNumber,
+								PrescribingNumberUnit: item.PrescribingNumberUnit,
+							}
+							service.CreateDrugError(drugError)
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "2",
 								"advice": advice,
@@ -2400,10 +2456,66 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
+									if item.UserOrgId == 3877 || item.UserOrgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(item.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             item.UserOrgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+													Prescribingnumber:     item.PrescribingNumber,
+													PrescribingNumberUnit: item.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											c.ServeSuccessJSON(map[string]interface{}{
+												"msg":    "6",
+												"advice": advice,
+											})
+											return
+										}
+									}
 								}
 								//不通过药房发药
 								if pharmacyConfig.IsOpen != 1 {
 									service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+									if item.UserOrgId == 3877 || item.UserOrgId == 10265 {
+										//查询该药品是否有出库记录
+										flowMap, _ := service.GetDrugFLowByAdviceById(item.DrugId, item.PatientId, item.UserOrgId, item.AdviceDate)
+										if len(flowMap) == 0 {
+											errs := service.UpdateHisAdviceById(item.ID)
+											if errs != nil {
+												drugError := models.XtDrugError{
+													UserOrgId:             item.UserOrgId,
+													DrugId:                item.DrugId,
+													RecordDate:            item.AdviceDate,
+													PatientId:             item.PatientId,
+													Remark:                "出库记录为空,更新执行人失败",
+													Status:                1,
+													Ctime:                 time.Now().Unix(),
+													Mtime:                 0,
+													SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+													Prescribingnumber:     item.PrescribingNumber,
+													PrescribingNumberUnit: item.PrescribingNumberUnit,
+												}
+												service.CreateDrugError(drugError)
+											}
+											c.ServeSuccessJSON(map[string]interface{}{
+												"msg":    "6",
+												"advice": advice,
+											})
+											return
+										}
+									}
 								}
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)

controllers/pharmacy_controller.go

@@ -90,7 +90,7 @@ func (this *PharmacyController) TodayNumber() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10215 && orgid != 10387 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 {
 		//查询表里当天的数据
 		var wtotal int
 		wtotal, err = service.GetTodayPharmacy(stime, etime, orgid, 1)
@@ -116,7 +116,7 @@ func (this *PharmacyController) TodayNumber() {
 		return
 	}
 
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10215 || orgid == 10387 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 {
 		var wtotal int
 		var itotal int
 		//查找出库数量
@@ -165,7 +165,7 @@ func (this *PharmacyController) IssuedDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 || orgid == 10215 {
+	if orgid == 10164 || orgid == 3877 || orgid == 10188 || orgid == 10217 || orgid == 9671 || orgid == 10387 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
@@ -189,7 +189,7 @@ func (this *PharmacyController) IssuedDrug() {
 		})
 	}
 
-	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 && orgid != 10215 {
+	if orgid != 10164 && orgid == 3877 && orgid != 10188 && orgid != 10217 && orgid != 9671 && orgid != 10387 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 1, keyword)
@@ -245,7 +245,7 @@ func (this *PharmacyController) WaitingDrug() {
 		etime = stime + 86399
 	}
 
-	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 && orgid != 10215 {
+	if orgid != 9671 && orgid != 10188 && orgid != 10217 && orgid != 3877 && orgid != 10164 && orgid != 10387 {
 		//查询表里当天的数据
 		var flist []*models.TmpPatient
 		flist, err = service.GetTodayDrug(stime, etime, orgid, 0, keyword)
@@ -269,7 +269,7 @@ func (this *PharmacyController) WaitingDrug() {
 	}
 
 	//当天已发药的人数
-	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 || orgid == 10215 {
+	if orgid == 9671 || orgid == 10188 || orgid == 10217 || orgid == 3877 || orgid == 10164 || orgid == 10387 {
 
 		//获取排班班次
 		schedule, _ := service.GetSchedulePatientId(stime, etime, orgid, shift, partition)
@@ -370,7 +370,6 @@ func (this *PharmacyController) DispensingMedicine() {
 		for _, item := range advicelist {
 			//查询改药品信息
 			medical, _ := service.GetBaseDrugMedical(item.DrugId)
-			//通过药房发药
 			if medical.IsPharmacy == 1 {
 				houseConfig, _ := service.GetAllStoreHouseConfig(orgid)
 				//查询该药品是否有库存
@@ -390,8 +389,7 @@ func (this *PharmacyController) DispensingMedicine() {
 					total = list.Count*medical.MinNumber + list.StockMinNumber
 					prescribing_number_total = count
 				}
-				fmt.Println("总库存", total)
-				fmt.Println("出库数量", prescribing_number_total)
+
 				if medical.IsUse != 1 {
 					//如果出库数量大于库存数量
 					if prescribing_number_total > total {
@@ -409,11 +407,29 @@ func (this *PharmacyController) DispensingMedicine() {
 	}
 
 	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
+
+	if orgid == 10387 || orgid == 3877 {
+		advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
+		if len(advicelist) > 0 {
+			for _, item := range advicelist {
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(item.DrugId)
+				if medical.IsPharmacy == 1 {
+					flow, _ := service.GetFlow(item.DrugId, item.AdviceDate, orgid, item.PatientId)
+					if len(flow) > 0 {
+						service.UpdateAdviceFlow(item.ID)
+					}
+				}
+			}
+
+		}
+	}
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
 		return
 	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": "操作成功",
 	})

controllers/public_api_controller.go

@@ -62,35 +62,35 @@ func PublicApiRegistRouters() {
 	beego.Router("/api/public/handlestockdata", &PublicApiController{}, "get:HandleStockData")
 	beego.Router("/api/public/handlecomdata", &PublicApiController{}, "get:HandleComData")
 	beego.Router("/hello", &PublicApiController{}, "get:HandleComData")
-
 	beego.Router("/handel", &PublicApiController{}, "get:HandleHIS")
-
 	beego.Router("/groupno", &PublicApiController{}, "get:HandleGroupNo")
-
 	beego.Router("/handle10215", &PublicApiController{}, "get:Handle10215")
-
 	beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
-
 	beego.Router("/handelHis", &PublicApiController{}, "get:HandleHisTwo")
-
 	beego.Router("/handelProject", &PublicApiController{}, "get:HandleProject")
-
 	beego.Router("/handelsettledata", &PublicApiController{}, "get:HandleSettleData")
-
 	beego.Router("/handelhispatient", &PublicApiController{}, "get:HandleHisPatient")
-
 	//beego.Router("/handelOrder", &PublicApiController{}, "get:HandleOrder")
-
 	beego.Router("/handleExportData", &PublicApiController{}, "get:HandleExportAllData")
-
 	beego.Router("/handleExportData10138", &PublicApiController{}, "get:HandleExportData10138")
 
 	beego.Router("/handleData10265", &PublicApiController{}, "get:HandleData10265")
 
 	beego.Router("/handleData10106", &PublicApiController{}, "get:HandleData10106")
+	beego.Router("/handleData10318", &PublicApiController{}, "get:HandleData10318")
+
+	beego.Router("/handleOne", &PublicApiController{}, "get:HandleOne")
 
 	beego.Router("/handelschedule", &PublicApiController{}, "get:HandleSchedule")
-	beego.Router("/handelscheduleTwo", &PublicApiController{}, "get:HandleScheduleTwo")
+	//beego.Router("/handelscheduleTwo", &PublicApiController{}, "get:HandleScheduleTwo")
+	//
+	//
+	//
+	//beego.Router("/handelhispatienttwo", &PublicApiController{}, "get:HandleHisPatientTwo")
+
+	//beego.Router("/handleorderinfo", &PublicApiController{}, "get:HandleOrderInfoData")
+	//
+	//beego.Router("/hande10138", &PublicApiController{}, "get:HandleOrderInfoData10138")
 
 }
 
@@ -113,41 +113,61 @@ func (c *PublicApiController) HandleSchedule() {
 
 }
 
-func (c *PublicApiController) HandleScheduleTwo() {
-	models, _ := service.GetAllSchMode()
-	for _, item := range models {
-		if item.Mode == 1 {
-			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
-			thisTime := time.Now()
-			_, theWeek := thisTime.ISOWeek()
-			templates[0].Week = theWeek
-			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
-		} else if item.Mode == 2 {
-			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
-			now := time.Now()
-			nextSecWeek := now.AddDate(0, 0, 14)
-			nextWeek := now.AddDate(0, 0, 7)
-			if item.ExecuteTimes%2 == 0 { //下第二周生成的是
-				templates[0].Week = service.GetWeeks(nextWeek.Format("2006-01-02 15:04:05"))
-				templates[1].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
-				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
-				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
-
-			} else if item.ExecuteTimes%2 == 1 {
-				templates[0].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
-				templates[1].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
-				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
-				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
-
-			}
+func (c *PublicApiController) HandleOne() {
+	//fmt.Println("~~~~~~")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
 
-		}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
 	}
-
+	startRecordDateTime := startTime.Unix()
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+	}
+	endRecordDateTime := endTime.Unix()
+	orders, _ := service.GetHisOrderDetailOne(startRecordDateTime, endRecordDateTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": orders,
+	})
 }
 
-func (c *PublicApiController) HandleHisPatient() {
+//func (c *PublicApiController) HandleScheduleTwo() {
+//	models, _ := service.GetAllSchMode()
+//	for _, item := range models {
+//		if item.Mode == 1 {
+//			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
+//			thisTime := time.Now()
+//			_, theWeek := thisTime.ISOWeek()
+//			templates[0].Week = theWeek
+//			service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+//		} else if item.Mode == 2 {
+//			templates, _ := service.GetOrgPatientScheduleTemplateIDs(item.OrgID)
+//			now := time.Now()
+//			nextSecWeek := now.AddDate(0, 0, 14)
+//			nextWeek := now.AddDate(0, 0, 7)
+//			if item.ExecuteTimes%2 == 0 { //下第二周生成的是
+//				templates[0].Week = service.GetWeeks(nextWeek.Format("2006-01-02 15:04:05"))
+//				templates[1].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+//				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+//				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+//
+//			} else if item.ExecuteTimes%2 == 1 {
+//				templates[0].Week = service.GetWeeks(nextSecWeek.Format("2006-01-02 15:04:05"))
+//				templates[1].Week = service.GetWeeks(nextWeek.Format("2006-01-02 15:04:05"))
+//				service.UpdateTemplateItemWeek(templates[0].OrgID, templates[0].ID, int8(templates[0].Week))
+//				service.UpdateTemplateItemWeek(templates[1].OrgID, templates[1].ID, int8(templates[1].Week))
+//
+//			}
+//
+//		}
+//	}
+//
+//}
 
+func (c *PublicApiController) HandleHisPatient() {
 	ps, _ := service.GetHisPatient11111(10215)
 	for _, item := range ps {
 		var rf []*ResultFiveT
@@ -193,7 +213,7 @@ func (c *PublicApiController) HandleHisPatient() {
 		}
 
 		if len(insutypes) == 0 {
-			insutype = "310"
+			insutype = "390"
 		}
 		for _, item := range rf {
 			if item.Insutype == insutype {
@@ -206,6 +226,24 @@ func (c *PublicApiController) HandleHisPatient() {
 	}
 }
 
+//func (c *PublicApiController) HandleHisPatientTwo() {
+//
+//	ps, _ := service.GetHisPatient2222(10188)
+//	for _, item := range ps {
+//		var rf []*ResultFiveT
+//		json.Unmarshal([]byte(item.Iinfo), &rf)
+//		var insuplc_admdvs string
+//
+//		for _, subItem := range rf {
+//			if subItem.Insutype == item.Insutype {
+//				insuplc_admdvs = subItem.InsuplcAdmdvs
+//			}
+//		}
+//		item.InsuplcAdmdvs = insuplc_admdvs
+//		service.SaveHPtWO(item)
+//	}
+//}
+
 func (c *PublicApiController) HandleSettleData() {
 	orders, _ := service.GetHisOrderDetailThree()
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -243,8 +281,6 @@ func (c *PublicApiController) HandleData10106() {
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 
-	start_time = "2022-11-01"
-	end_time = "2022-11-30"
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -266,6 +302,31 @@ func (c *PublicApiController) HandleData10106() {
 	})
 }
 
+func (c *PublicApiController) HandleData10318() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	fmt.Println(startRecordDateTime)
+	fmt.Println(endRecordDateTime)
+
+	orders, _ := service.GetHisOrderDetail10318(startRecordDateTime, endRecordDateTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order": orders,
+	})
+}
+
 func (c *PublicApiController) HandleProject() {
 	prescriptions := service.GetAllProjectPrescription()
 	for _, item := range prescriptions {
@@ -2316,3 +2377,38 @@ func (c *PublicApiController) HandleData10265() {
 	}
 
 }
+
+//func (c *PublicApiController) HandleOrderInfoData() {
+//	orders, _ := service.GetHisOrderInfoDetail()
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"info": orders,
+//	})
+//}
+//
+//func (c *PublicApiController)HandleOrderInfoData10138(){
+//	start_time := c.GetString("start_time")
+//	end_time := c.GetString("end_time")
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+//	if err != nil {
+//
+//	}
+//	startRecordDateTime := startTime.Unix()
+//	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+//	if err != nil {
+//
+//	}
+//	endRecordDateTime := endTime.Unix()
+//	orders, _ := service.GetHisAllPatientOrder(startRecordDateTime,endRecordDateTime)
+//	for _, item := range orders{
+//		for _, subItem := range item.HisOrder10138{
+//			info, _ := service.GetHisOrderInfoDetail10138(subItem.Number)
+//			subItem.VmHisOrderInfo9504 = info
+//		}
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"info": orders,
+//	})
+//
+//}

controllers/self_drug_api_congtroller.go

@@ -3664,70 +3664,141 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 		ids = append(ids, it.ID)
 	}
 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
-	list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
-	for _, item := range list {
+	if orgId == 10265 {
+		list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
-		//获取期初结余
-		low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+		for _, item := range list {
 
-		item.GoodStartFlowInfo = low
+			//获取期初结余
+			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
 
-		//获取期末结余
-		flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+			item.GoodStartFlowInfo = low
 
-		item.GoodEndFlowInfo = flow
+			//获取期末结余
+			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
 
-		//获取期间增加
-		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
-		for _, it := range goodWarehouseInfoList {
-			item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
-		}
+			item.GoodEndFlowInfo = flow
 
-		//获取本期增加
-		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
-		for _, it := range WarehouseInfoFlowList {
-			item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
-		}
-		//获取本期减少
-		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
-		for _, it := range reduceWarehouseInfoList {
-			item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
-		}
+			//获取期间增加
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range goodWarehouseInfoList {
+				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
+			}
 
-		//获取期中减少退库
-		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
-		for _, it := range lowInfo {
-			item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+			//获取本期增加
+			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			for _, it := range WarehouseInfoFlowList {
+				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
+			}
+			//获取本期减少
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range reduceWarehouseInfoList {
+				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
+			}
+
+			//获取期中减少退库
+			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			for _, it := range lowInfo {
+				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+			}
+			//
+			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			for _, it := range outInfo {
+				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+			}
+
+			//期中盘盈
+			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			for _, it := range profit {
+				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+			}
+			//期中盘亏
+			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			for _, it := range losses {
+				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+			}
 		}
-		//
-		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
-		for _, it := range outInfo {
-			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+			return
 		}
 
-		//期中盘盈
-		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
-		for _, it := range profit {
-			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+			"total":            total,
+		})
+	}
+
+	if orgId != 10265 {
+		list, total, err := service.GetGoodNewPurchaseStockQueryOne(good_type, keyword, page, limit, orgId, ids, goodIds)
+
+		for _, item := range list {
+
+			//获取期初结余
+			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+
+			item.GoodStartFlowInfo = low
+
+			//获取期末结余
+			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+
+			item.GoodEndFlowInfo = flow
+
+			//获取期间增加
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range goodWarehouseInfoList {
+				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
+			}
+
+			//获取本期增加
+			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			for _, it := range WarehouseInfoFlowList {
+				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
+			}
+			//获取本期减少
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range reduceWarehouseInfoList {
+				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
+			}
+
+			//获取期中减少退库
+			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			for _, it := range lowInfo {
+				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+			}
+			//
+			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			for _, it := range outInfo {
+				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+			}
+
+			//期中盘盈
+			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			for _, it := range profit {
+				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+			}
+			//期中盘亏
+			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			for _, it := range losses {
+				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+			}
 		}
-		//期中盘亏
-		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
-		for _, it := range losses {
-			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+			return
 		}
-	}
 
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
-		return
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+			"total":            total,
+		})
 	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list":             list,
-		"manufacturerList": manufacturerList,
-		"total":            total,
-	})
 }
 
 func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {

controllers/stock_in_api_controller.go

@@ -7546,36 +7546,38 @@ func (this *StockManagerApiController) ReturnCheckWarehouseInfo() {
 			return
 		}
 	}
-	for _, item := range list {
-
-		//扣减数量
-		service.UpdateWarehouseInfoByIdListTwo(item.WarehousingCount, item.ID)
-
-		//删除流水
-		service.UpdateWarehouseInfoFlow(item.ID)
-
-		goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
-		var flush_count int64
-		for _, it := range goodList {
-			flush_count += it.StockCount
-		}
-
-		//扣减数量
-		service.UpdateGoodInCount(item.WarehousingCount, item.OrgId, item.GoodId, item.StorehouseId, flush_count)
+	//for _, item := range list {
+	//
+	//	//扣减数量
+	//	service.UpdateWarehouseInfoByIdListTwo(item.WarehousingCount, item.ID)
+	//
+	//	//删除流水
+	//	service.UpdateWarehouseInfoFlow(item.ID)
+	//
+	//	goodList, _ := service.GetSumGoodList(orgId, item.StorehouseId, item.GoodId)
+	//	var flush_count int64
+	//	for _, it := range goodList {
+	//		flush_count += it.StockCount
+	//	}
+	//
+	//	//扣减数量
+	//	service.UpdateGoodInCount(item.WarehousingCount, item.OrgId, item.GoodId, item.StorehouseId, flush_count)
+	//
+	//	//查询默认仓库
+	//	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+	//	//查询该耗材剩余多少库存
+	//	stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
+	//	var sum_count int64
+	//	var sum_in_count int64
+	//	for _, it := range stockList {
+	//		sum_count += it.StockCount
+	//		sum_in_count += it.WarehousingCount
+	//	}
+	//	service.UpdateGoodInfoAddSumCount(item.GoodId, sum_count, orgId, sum_in_count)
+	//}
+	//err := service.ReturnCheckWarehouseInfo(warehousing_info_id)
 
-		//查询默认仓库
-		storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-		//查询该耗材剩余多少库存
-		stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId)
-		var sum_count int64
-		var sum_in_count int64
-		for _, it := range stockList {
-			sum_count += it.StockCount
-			sum_in_count += it.WarehousingCount
-		}
-		service.UpdateGoodInfoAddSumCount(item.GoodId, sum_count, orgId, sum_in_count)
-	}
-	err := service.ReturnCheckWarehouseInfo(warehousing_info_id)
+	err := service.UpdateWarehouseInfoMap(list, warehousing_info_id, orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg": "反审核成功!",

models/device_models.go

@@ -871,27 +871,30 @@ type DeviceRepairs struct {
 }
 
 type DeviceRepair struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	GuaranteeDate    int64  `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
-	StartTime        int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	ArriveTime       int64  `gorm:"column:arrive_time" json:"arrive_time" form:"arrive_time"`
-	FinishTime       int64  `gorm:"column:finish_time" json:"finish_time" form:"finish_time"`
-	TotalDistance    string `gorm:"column:total_distance" json:"total_distance" form:"total_distance"`
-	FailureStage     int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
-	FaultDescription string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
-	CauseAnalysis    string `gorm:"column:cause_analysis" json:"cause_analysis" form:"cause_analysis"`
-	TreatmentProcess string `gorm:"column:treatment_process" json:"treatment_process" form:"treatment_process"`
-	Images           string `gorm:"column:images" json:"images" form:"images"`
-	Exclude          int64  `gorm:"column:exclude" json:"exclude" form:"exclude"`
-	Reason           string `gorm:"column:reason" json:"reason" form:"reason"`
-	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64  `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId        int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	BedId            int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	EquitmentId      int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
-	CodeInformation  string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	ImageName        string `gorm:"column:image_name" json:"image_name" form:"image_name"`
+	ID                            int64  `gorm:"column:id" json:"id" form:"id"`
+	GuaranteeDate                 int64  `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
+	StartTime                     int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	ArriveTime                    int64  `gorm:"column:arrive_time" json:"arrive_time" form:"arrive_time"`
+	FinishTime                    int64  `gorm:"column:finish_time" json:"finish_time" form:"finish_time"`
+	TotalDistance                 string `gorm:"column:total_distance" json:"total_distance" form:"total_distance"`
+	FailureStage                  int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription              string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CauseAnalysis                 string `gorm:"column:cause_analysis" json:"cause_analysis" form:"cause_analysis"`
+	TreatmentProcess              string `gorm:"column:treatment_process" json:"treatment_process" form:"treatment_process"`
+	Images                        string `gorm:"column:images" json:"images" form:"images"`
+	Exclude                       int64  `gorm:"column:exclude" json:"exclude" form:"exclude"`
+	Reason                        string `gorm:"column:reason" json:"reason" form:"reason"`
+	Ctime                         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                        int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId                     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	BedId                         int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId                   int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	CodeInformation               string `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	ImageName                     string `gorm:"column:image_name" json:"image_name" form:"image_name"`
+	FunctionAccessoriesInspection string `gorm:"column:function_accessories_inspection" json:"function_accessories_inspection" form:"function_accessories_inspection"`
+	OtherInformation              string `gorm:"column:other_information" json:"other_information" form:"other_information"`
+	AdminUserId                   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (DeviceRepair) TableName() string {

models/dialysis.go

@@ -1241,6 +1241,7 @@ type HisDoctorAdvice struct {
 	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsMobile              int64              `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 }
 
 func (HisDoctorAdvice) TableName() string {

models/drug_stock.go

@@ -709,3 +709,22 @@ type DrugWarehouseOutInfoNight struct {
 func (DrugWarehouseOutInfoNight) TableName() string {
 	return "xt_drug_warehouse_out_info"
 }
+
+type XtDrugError 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"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_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"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	Prescribingnumber     float64 `gorm:"column:prescribingnumber" json:"prescribingnumber" form:"prescribingnumber"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	SumCount              int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+}
+
+func (XtDrugError) TableName() string {
+	return "xt_drug_error"
+}

models/his_models.go

@@ -261,6 +261,7 @@ type HisDoctorAdviceInfo struct {
 	ExecutionFrequencyId  int64                  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	Child                 []*HisDoctorAdviceInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
 	IsSettle              int64                  `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	IsMobile              int64                  `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -1064,8 +1065,7 @@ type HisOrder struct {
 	Patients               Patients               `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient             HisPatient             `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
 	HisHospitalCheckRecord HisHospitalCheckRecord `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_hospital_patient"`
-
-	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
+	HisPrescriptionInfo    HisPrescriptionInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
 
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
@@ -2576,3 +2576,84 @@ type ExportHisPrescription struct {
 func (ExportHisPrescription) TableName() string {
 	return "his_prescription"
 }
+
+type Orders struct {
+	BedCostPartSelfTotal                        float64                `json:"bedCostPartSelfTotal"`
+	BedCostSelfTotal                            float64                `json:"bedCostSelfTotal"`
+	BedCostTotal                                float64                `json:"bedCostTotal"`
+	BedInscpTotal                               float64                `json:"bedInscpTotal"`
+	BedSelfTotal                                float64                `json:"bedSelfTotal"`
+	ChargeAdmin                                 UserAdminRole          `json:"charge_admin"`
+	CheckCostPartSelfTotal                      float64                `json:"checkCostPartSelfTotal"`
+	CheckCostSelfTotal                          float64                `json:"checkCostSelfTotal"`
+	CheckCostTotal                              float64                `json:"checkCostTotal"`
+	CheckInscpTotal                             float64                `json:"checkInscpTotal"`
+	CheckSelfTotal                              float64                `json:"checkSelfTotal"`
+	ChineseTraditionalInscpTotal                float64                `json:"chineseTraditionalInscpTotal"`
+	ChineseTraditionalMedicineCostPartSelfTotal float64                `json:"chineseTraditionalMedicineCostPartSelfTotal"`
+	ChineseTraditionalMedicineCostSelfTotal     float64                `json:"chineseTraditionalMedicineCostSelfTotal"`
+	ChineseTraditionalMedicineCostTotal         float64                `json:"chineseTraditionalMedicineCostTotal"`
+	ChineseTraditionalSelfTotal                 float64                `json:"chineseTraditionalSelfTotal"`
+	Date                                        int64                  `json:"date"`
+	DiaConfig                                   []*HisXtDiagnoseConfig `json:"dia_config"`
+	Diagnosis                                   string                 `json:"diagnosis"`
+	DoctorInfo                                  UserAdminRole          `json:"doctor_info"`
+	DoctorName                                  string                 `json:"doctor_name"`
+	HealthCardNo                                string                 `json:"health_card_no"`
+
+	LaboratoryCostPartSelfTotal      float64            `json:"laboratoryCostPartSelfTotal"`
+	LaboratoryCostSelfTotal          float64            `json:"laboratoryCostSelfTotal"`
+	LaboratoryCostTotal              float64            `json:"laboratoryCostTotal"`
+	LaboratoryInscpTotal             float64            `json:"laboratoryInscpTotal"`
+	LaboratorySelfTotal              float64            `json:"laboratorySelfTotal"`
+	MaterialCostPartSelfTotal        float64            `json:"materialCostPartSelfTotal"`
+	MaterialCostSelfTotal            float64            `json:"materialCostSelfTotal"`
+	MaterialCostTotal                float64            `json:"materialCostTotal"`
+	MaterialInscpTotal               float64            `json:"materialInscpTotal"`
+	MaterialSelfTotal                float64            `json:"materialSelfTotal"`
+	Number                           string             `json:"number"`
+	OperationCostPartSelfTotal       float64            `json:"operationCostPartSelfTotal"`
+	OperationCostSelfTotal           float64            `json:"operationCostSelfTotal"`
+	OperationCostTotal               float64            `json:"operationCostTotal"`
+	OperationInscpTotal              float64            `json:"operationInscpTotal"`
+	OperationSelfTotal               float64            `json:"operationSelfTotal"`
+	Order                            HisOrder           `json:"order"`
+	OrderInfos                       []*HisOrderInfoTwo `json:"order_infos"`
+	OrderNumber                      string             `json:"order_number"`
+	OrgCode                          string             `json:"org_code"`
+	OrgName                          string             `json:"org_name"`
+	OtherCostPartSelfTotal           float64            `json:"otherCostPartSelfTotal"`
+	OtherCostSelfTotal               float64            `json:"otherCostSelfTotal"`
+	OtherCostTotal                   float64            `json:"otherCostTotal"`
+	OtherInscpTotal                  float64            `json:"otherInscpTotal"`
+	OtherSelfTotal                   float64            `json:"otherSelfTotal"`
+	Patient                          PatientTwos        `json:"patient"`
+	PrintorAdmin                     UserAdminRole      `json:"printor_admin"`
+	TreatCostPartSelfTotal           float64            `json:"treatCostPartSelfTotal"`
+	TreatCostSelfTotal               float64            `json:"treatCostSelfTotal"`
+	TreatCostTotal                   float64            `json:"treatCostTotal"`
+	TreatInscpTotal                  float64            `json:"treatInscpTotal"`
+	TreatSelfTotal                   float64            `json:"treatSelfTotal"`
+	WesternMedicineCostPartSelfTotal float64            `json:"westernMedicineCostPartSelfTotal"`
+	WesternMedicineCostSelfTotal     float64            `json:"westernMedicineCostSelfTotal"`
+	WesternMedicineCostTotal         float64            `json:"westernMedicineCostTotal"`
+	WesternMedicineInscpTotal        float64            `json:"westernMedicineInscpTotal"`
+	WesternMedicineSelfTotal         float64            `json:"westernMedicineSelfTotal"`
+	YiliaoLeibie                     string             `json:"yiliao_leibie"`
+	HisPatient                       HisPatient         `json:"his"`
+}
+
+type PatientTwos 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"`
+	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Phone        int64  `gorm:"column:phone" json:"phone" form:"phone"`
+	Gender       int64  `gorm:"column:gender" json:"gender" form:"gender"`
+}
+
+func (PatientTwos) TableName() string {
+	return "xt_patients"
+}

service/data.go

@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-//GetPatientList 返回患者的列表
+// GetPatientList 返回患者的列表
 func GetConfigList(orgID int64) (dataconfig interface{}, err error) {
 	var configList []*models.Dataconfig
 
@@ -296,45 +296,45 @@ func FindeInspectionByOrgId(orgid int64) (xtquality []*models.XtCheckConfigurati
 }
 
 func BatchInsertFiledConfig(org_id int64) (err error) {
-	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 0 AND is_show = 1", org_id).Error
+	err = XTWriteDB().Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 0 AND is_show = 1", org_id).Error
 	return
 }
 
 func BatchInsertQualityControl(org_id int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 1", org_id).Error
+	err = XTWriteDB().Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 1", org_id).Error
 	return
 }
 
 func BathInsertQualityControlTwo(org_id int64) (err error) {
-	err = readDb.Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 0", org_id).Error
+	err = XTWriteDB().Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0 and is_status = 0", org_id).Error
 	return
 }
 
 func BatchInspectionConfiguration(orgid int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO xt_check_configuration(user_org_id,inspection_major,inspection_frequency,sort,created_time,status) SELECT ?,inspection_major,inspection_frequency,sort,created_time,status FROM xt_check_configuration where user_org_id = 0", orgid).Error
+	err = XTWriteDB().Exec("INSERT INTO xt_check_configuration(user_org_id,inspection_major,inspection_frequency,sort,created_time,status) SELECT ?,inspection_major,inspection_frequency,sort,created_time,status FROM xt_check_configuration where user_org_id = 0", orgid).Error
 	return
 }
 
 func ShowFiledConfig(org_id int64, isShow int, is_write int, id int64) (err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"create_time": time.Now().Unix(), "update_time": time.Now().Unix(), "is_show": isShow, "is_write": is_write}).Error
+	err = XTWriteDB().Model(&models.FiledConfig{}).Where("org_id = ? AND id = ?", org_id, id).Updates(map[string]interface{}{"create_time": time.Now().Unix(), "update_time": time.Now().Unix(), "is_show": isShow, "is_write": is_write}).Error
 	return
 }
 
 func FindSysDialysisFiledByOrgId() (filedConfig []*models.FiledConfig, err error) {
-	err = readDb.Model(&models.FiledConfig{}).Where("org_id =? AND id in (11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262)", 0).Find(&filedConfig).Error
+	err = XTWriteDB().Model(&models.FiledConfig{}).Where("org_id =? AND id in (11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262)", 0).Find(&filedConfig).Error
 	return
 }
 
 func BatchInsertFiledSystemConfig(org_id int64) (err error) {
-	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442", org_id).Error
+	err = XTWriteDB().Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442", org_id).Error
 	return
 }
 
 func BatchInsertDoctorSchedule(orgid int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO sgj_xt.xt_doctor_schedules(user_org_id,class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute) SELECT ?, class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute FROM xt_doctor_schedules WHERE user_org_id = 0", orgid).Error
+	err = XTWriteDB().Exec("INSERT INTO sgj_xt.xt_doctor_schedules(user_org_id,class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute) SELECT ?, class_name,class_attributes,timeone_start,timeone_type,timeone_end,timetwo_start,timetwo_type,timetwo_end,work_time,remarks,status,ctime,minute FROM xt_doctor_schedules WHERE user_org_id = 0", orgid).Error
 	return
 }
 

service/dialysis_service.go

@@ -357,7 +357,7 @@ func ExecBatchDoctorAdvice(patient_id int64, orgid int64, ids []string, creater
 }
 
 func ExceHidDoctorAdviceById(m *models.HisDoctorAdviceInfo, id int64, patientId int64) error {
-	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+	err := writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND (id = ? Or parent_id=?)  AND status = 1 ", patientId, id, id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1, "is_mobile": 2}).Error
 	return err
 }
 
@@ -1988,7 +1988,7 @@ func GetHisMobileAdviceList(orgid int64, ids []string) (advice []*models.HisDoct
 func ExectionMobileAdvice(orgid int64, ids []string, execution_time int64, execution_staff int64) error {
 
 	advice := models.HisDoctorAdvice{}
-	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1}).Error
+	err := XTWriteDB().Model(&advice).Where("user_org_id = ? and id in(?) and status = 1", orgid, ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_staff": execution_staff, "execution_state": 1, "is_mobile": 3}).Error
 	return err
 }
 

service/dialysis_solution_service.go

@@ -94,7 +94,7 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
-	fmt.Println("idArray23233223323232233232", len(idArray))
+
 	if len(idArray) >= 1 {
 		db = db.Where("xt_schedule.id in(?)", idArray)
 	}

service/drug_pharmacy_management_service.go

@@ -1647,3 +1647,10 @@ func GetPharmacyConfig(orgid int64) (models.PharmacyConfig, error) {
 
 	return config, err
 }
+
+func CreateDrugError(drugError models.XtDrugError) error {
+
+	err := XTWriteDB().Create(&drugError).Error
+
+	return err
+}

service/his_charge_service.go

@@ -240,7 +240,7 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 	return
 }
 
-func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisLabelPrintInfo{})
 	if is_print > 0 {
@@ -251,7 +251,31 @@ func GetLabelPrintList(page int64, limit int64, user_org_id int64, record_time i
 		db = db.Where("patient_name Like ?", keywors)
 
 	}
-	err = db.Where("user_org_id = ? AND record_date = ? AND status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
+	if tube_color > 0 {
+		db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?", tube_color)
+		//db = db.Joins("Right join xt_his_project as pro on pro.id = his_label_print_info.project_id AND his_label_print_info.item_id = 0 and  his_label_print_info.project_id > 0 and pro.status = 1 and pro.tube_color = ?",tube_color)
+	}
+
+	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
+	return
+}
+func GetLabelPrintListTwo(page int64, limit int64, user_org_id int64, record_time int64, is_print int64, keywors string, tube_color int64) (labels []*models.HisLabelPrintInfo, total int64, err error) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisLabelPrintInfo{})
+	if is_print > 0 {
+		db = db.Where("is_print = ?", is_print)
+	}
+	if len(keywors) > 0 {
+		keywors = "%" + keywors + "%"
+		db = db.Where("patient_name Like ?", keywors)
+
+	}
+	if tube_color > 0 {
+		//db = db.Joins("Right join xt_his_project_team as team on team.id = his_label_print_info.item_id AND his_label_print_info.item_id <> 0 and team.status = 1 and team.tube_color = ?",tube_color)
+		db = db.Joins("Right join xt_his_project as pro on pro.id = his_label_print_info.project_id AND his_label_print_info.item_id = 0 and  his_label_print_info.project_id > 0 and pro.status = 1 and pro.tube_color = ?", tube_color)
+	}
+
+	err = db.Where("his_label_print_info.user_org_id = ? AND his_label_print_info.record_date = ? AND his_label_print_info.status = 1 ", user_org_id, record_time).Count(&total).Offset(offset).Limit(limit).Find(&labels).Error
 	return
 }
 

service/his_config_service.go

@@ -40,6 +40,10 @@ func SaveHisPrescriptionTemplate(template *models.HisPrescriptionTemplate) (err
 	return
 
 }
+func GetHisPrescriptionInfoTemplates(p_id int64, user_org_id int64) (p []*models.HisPrescriptionInfoTemplate, err error) {
+	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND p_template_id = ?", user_org_id, p_id).Find(&p).Error
+	return
+}
 
 func DelelteHisPrescriptionInfoTemplate(id int64, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionInfoTemplate{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error

service/his_service.go

@@ -968,7 +968,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -981,6 +981,19 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 		db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id  AND patient.name like ? AND patient.user_org_id = ?", keywords, user_org_id)
 
 	}
+	if sch_type > 0 && zone_type > 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.schedule_type = ? AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.partition_id = ? AND sch.status  = 1", sch_type, start_time_timestamp, end_time_timestamp, zone_type)
+	}
+	if sch_type > 0 && zone_type == 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.schedule_type = ? AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.status = 1", sch_type, start_time_timestamp, end_time_timestamp)
+	}
+	if sch_type == 0 && zone_type > 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id  AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.partition_id = ? AND sch.status = 1", start_time_timestamp, end_time_timestamp, zone_type)
+	}
+
+	//if zone_type > 0 {
+	//	db = db.Joins("join xt_schedule sch_two on sch_two.schedule_date = his_order.settle_accounts_date AND sch_two.patient_id = his_order.patient_id AND sch_two.partition_id = ?", zone_type)
+	//}
 
 	if sort_type == 1 {
 		if start_time_timestamp != 0 {
@@ -990,7 +1003,6 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 			db = db.Where("his_order.settle_accounts_date<=?", end_time_timestamp)
 		}
 	} else {
-
 		if len(start_time) != 0 {
 			db = db.Where("his_order.setl_time>=?", start_time+" 00:00:00")
 		}
@@ -1534,7 +1546,10 @@ func GetMobileCallHisPrescriptions(start_time int64, end_time int64, org_id int6
 
 	return
 }
-
+func GetHisPatientByNumber(number string) (his models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("number = ? AND status = 1", number).First(&his).Error
+	return
+}
 func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
 	return
@@ -1607,6 +1622,12 @@ func GetPatientByIDTwo(orgID int64, patientID int64) (Patients, error) {
 	return patient, err
 }
 
+func GetPatientByIDTenTwo(orgID int64, patientID int64) (models.PatientTwos, error) {
+	var patient models.PatientTwos
+	err := readDb.Model(&models.PatientTwos{}).Where("id = ? and user_org_id=? and status=1", patientID, orgID).First(&patient).Error
+	return patient, err
+}
+
 func GetHisPrescriptionByPatientID(patientID int64, orgID int64) (info models.HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND patient_id = ? AND status = 1", orgID, patientID).Preload("XtHisDepartment", "status = 1").Last(&info).Error
 	return
@@ -2726,3 +2747,8 @@ func UpdatePatientDialysisOrder(patient_id int64, url string) error {
 	err := XTWriteDB().Model(&models.XtPatients{}).Where("id =? and status=1", patient_id).Updates(map[string]interface{}{"url": url}).Error
 	return err
 }
+
+func GetHisOrderByIDTenOne(order_id string) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
+	return
+}

service/manage_service.go

@@ -647,7 +647,7 @@ func EditRepair(id int64) (models.DeviceRepair, error) {
 
 func UpdateRepair(id int64, orgid int64, repair *models.DeviceRepair) error {
 
-	err := writeUserDb.Model(&repair).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"guarantee_date": repair.GuaranteeDate, "start_time": repair.StartTime, "arrive_time": repair.ArriveTime, "finish_time": repair.FinishTime, "total_distance": repair.TotalDistance, "failure_stage": repair.FailureStage, "fault_description": repair.FaultDescription, "cause_analysis": repair.CauseAnalysis, "treatment_process": repair.TreatmentProcess, "images": repair.Images, "exclude": repair.Exclude, "reason": repair.Reason, "code_information": repair.CodeInformation, "image_name": repair.ImageName, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&repair).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"guarantee_date": repair.GuaranteeDate, "start_time": repair.StartTime, "arrive_time": repair.ArriveTime, "finish_time": repair.FinishTime, "total_distance": repair.TotalDistance, "failure_stage": repair.FailureStage, "fault_description": repair.FaultDescription, "cause_analysis": repair.CauseAnalysis, "treatment_process": repair.TreatmentProcess, "images": repair.Images, "exclude": repair.Exclude, "reason": repair.Reason, "code_information": repair.CodeInformation, "image_name": repair.ImageName, "mtime": time.Now().Unix(), "function_accessories_inspection": repair.FunctionAccessoriesInspection, "other_information": repair.OtherInformation, "admin_user_id": repair.AdminUserId}).Error
 	return err
 }
 

service/mobile_dialysis_service.go

@@ -7236,3 +7236,10 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 
 	return vms, err
 }
+
+func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPatientDryweight, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id asc").Limit(6).Find(&weight).Error
+
+	return weight, err
+}

service/new_warehouse_service.go

@@ -1261,6 +1261,20 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 // 药品自动出库 递归方式
 func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
 
+	drugError := models.XtDrugError{
+		UserOrgId:             orgID,
+		DrugId:                advice.DrugId,
+		RecordDate:            advice.AdviceDate,
+		PatientId:             advice.PatientId,
+		Remark:                "进入出库页面",
+		Status:                1,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 0,
+		SumCount:              0,
+		Prescribingnumber:     advice.PrescribingNumber,
+		PrescribingNumberUnit: advice.PrescribingNumberUnit,
+	}
+	CreateDrugError(drugError)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -1306,28 +1320,39 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
-
+		drugError := models.XtDrugError{
+			UserOrgId:             orgID,
+			DrugId:                advice.DrugId,
+			RecordDate:            advice.AdviceDate,
+			PatientId:             advice.PatientId,
+			Remark:                "查询库存报错",
+			Status:                1,
+			Ctime:                 time.Now().Unix(),
+			Mtime:                 0,
+			SumCount:              0,
+			Prescribingnumber:     advice.PrescribingNumber,
+			PrescribingNumberUnit: advice.PrescribingNumberUnit,
+		}
+		CreateDrugError(drugError)
 		return err
 	}
-	// 将该批次的剩余库存数量转换为拆零数量
+
 	// 将该批次的剩余库存数量转换为拆零数量
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
-		//fmt.Println("进来1")
+
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-		//fmt.Println("剩余库存1", stock_number)
+
 	}
 	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
-		//fmt.Println("进来2")
+
 		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
-		//fmt.Println("剩余库存2", stock_number)
+
 	}
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
-		//fmt.Println("进来3")
+
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-		//fmt.Println("剩余库存3", stock_number)
+
 	}
-	//fmt.Println("剩余库存23333333333333333333333333333wo", stock_number)
-	//fmt.Println("出库数量2333333333333333333333333333333333333wo", deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -1367,10 +1392,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		warehouse.Mtime = time.Now().Unix()
 
-		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
-		fmt.Println("max_number232232332232322wo", maxNumber)
-		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
-
 		if warehouse.StockMinNumber < minNumber {
 
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
@@ -1416,6 +1437,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		//扣减库存数据
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
+			drugError := models.XtDrugError{
+				UserOrgId:             orgID,
+				DrugId:                advice.DrugId,
+				RecordDate:            advice.AdviceDate,
+				PatientId:             advice.PatientId,
+				Remark:                "扣减库存失败",
+				Status:                1,
+				Ctime:                 time.Now().Unix(),
+				Mtime:                 0,
+				SumCount:              0,
+				Prescribingnumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			}
+			CreateDrugError(drugError)
 			return errThree
 		}
 
@@ -1464,6 +1499,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		if lastDrugOutInfo.ID == 0 {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建出库单失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
 				return errOne
 			}
 		}
@@ -1478,6 +1527,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			if deliver_number != his_count {
 				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
 				if errThree != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "更新出库单失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 					return errThree
 				}
 			}
@@ -1497,12 +1560,6 @@ 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)
-		//fmt.Println("出库流水---------------------", out_count, cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number >= (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
@@ -1536,9 +1593,43 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 			}
 
-			CreateDrugFlowOne(drugflow)
+			errThreeTy := CreateDrugFlowOne(drugflow)
+
+			if errThreeTy != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建流水失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 			//出库数量相加
-			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+			errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
+			if errThreeTys != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "出库数量相加失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 
 		}
 
@@ -1570,7 +1661,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			_, errCode := FindDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 			if errCode == gorm.ErrRecordNotFound {
-				AddSigleDrugCancelStock(&cancelStock)
+				errCode := AddSigleDrugCancelStock(&cancelStock)
+				if errCode != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "创建退库单失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
+				}
 			}
 			lastDrugCancelStock, _ := FindLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 
@@ -1602,7 +1709,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				StorehouseId:     storeConfig.DrugStorehouseOut,
 				IsCheck:          1,
 			}
-			CreatedCancelStock(cancelStockInfo)
+			errCodes := CreatedCancelStock(cancelStockInfo)
+			if errCodes != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建退库单失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 			flow := models.DrugFlow{
 				WarehousingId:           warehouse.ID,
 				DrugId:                  warehouse.DrugId,
@@ -1640,9 +1763,57 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
 			}
-			CreateDrugFlowOne(flow)
-			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
-			ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			errCodeflow := CreateDrugFlowOne(flow)
+			if errCodeflow != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "退库流水创建失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+			errCodesum := AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
+			if errCodesum != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "增加退库数量失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+			errCodereduce := ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			if errCodereduce != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "减少出库数量失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 		}
 
 		//查询是否存在数据
@@ -1664,6 +1835,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
+			drugError := models.XtDrugError{
+				UserOrgId:             orgID,
+				DrugId:                advice.DrugId,
+				RecordDate:            advice.AdviceDate,
+				PatientId:             advice.PatientId,
+				Remark:                "新增自动出库表失败",
+				Status:                1,
+				Ctime:                 time.Now().Unix(),
+				Mtime:                 0,
+				SumCount:              0,
+				Prescribingnumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			}
+			CreateDrugError(drugError)
 			return errTwo
 		}
 		return nil
@@ -1705,6 +1890,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
 
 		if errThree != nil {
+			drugError := models.XtDrugError{
+				UserOrgId:             orgID,
+				DrugId:                advice.DrugId,
+				RecordDate:            advice.AdviceDate,
+				PatientId:             advice.PatientId,
+				Remark:                "第二批次扣减库存失败",
+				Status:                1,
+				Ctime:                 time.Now().Unix(),
+				Mtime:                 0,
+				SumCount:              0,
+				Prescribingnumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			}
+			CreateDrugError(drugError)
 			return errThree
 		}
 		//查询剩余库存
@@ -1749,9 +1948,22 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		//查询是否存在出库数据
 		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
 		if errCode == gorm.ErrRecordNotFound {
-			fmt.Println("j你俩3233223323232323233wo")
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建出库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
 				return errOne
 			}
 		}
@@ -1768,6 +1980,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			if deliver_number != his_count {
 				errThree := UpdateSingleDrugWarehouseOutInfoSix(advice.PatientId, advice.AdviceDate, orgID, warehouseOutInfo, advice.ID)
 				if errThree != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "更新出库表失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 					return errThree
 				}
 			}
@@ -1795,11 +2021,42 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		if errcodeThree == gorm.ErrRecordNotFound {
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次新增自动出库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
 				return errTwo
 			}
 		}
 		if errcodeThree == nil {
-			UpdateDrugAutoReduceRecordInfo(advice.PatientId, advice.RecordDate, advice.DrugId, details)
+			errThreeauto := UpdateDrugAutoReduceRecordInfo(advice.PatientId, advice.RecordDate, advice.DrugId, details)
+			if errThreeauto != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次更新自动出库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+
 		}
 
 		var out_count int64
@@ -1855,9 +2112,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 		}
 
-		fmt.Println("libai", out_count)
-		fmt.Println("cancel", cancel_count)
-		fmt.Println("deliver_number", deliver_number)
 		if deliver_number < (out_count - cancel_count) {
 			operation_time := time.Now().Unix()
 
@@ -1884,7 +2138,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			_, errCode := FindDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 			if errCode == gorm.ErrRecordNotFound {
-				AddSigleDrugCancelStock(&cancelStock)
+				errCodeCancel := AddSigleDrugCancelStock(&cancelStock)
+				if errCodeCancel != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "第二批次新增流水表失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
+				}
 			}
 			lastDrugCancelStock, _ := FindLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 
@@ -1916,7 +2186,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				StorehouseId:     storeConfig.DrugStorehouseOut,
 				IsCheck:          1,
 			}
-			CreatedCancelStock(cancelStockInfo)
+			errCodeCancel := CreatedCancelStock(cancelStockInfo)
+			if errCodeCancel != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次创建自动退库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 			flow := models.DrugFlow{
 				WarehousingId:           warehouse.ID,
 				DrugId:                  warehouse.DrugId,
@@ -1954,11 +2240,59 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
 			}
-			CreateDrugFlowOne(flow)
+			errCodeFlows := CreateDrugFlowOne(flow)
+			if errCodeFlows != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次创建自动退库流水表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 
 			//退库数量增加
-			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
-			ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			errCodeFlows = AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
+			if errCodeFlows != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次创建自动退库流水表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+			errCodereduce := ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			if errCodereduce != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次减少库存表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 		}
 
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作

service/patient_schedule_template_service.go

@@ -444,22 +444,22 @@ func UpdateScheduleTemplate(orgID int64, template_id int64,
 	//	}
 	//}
 
-	if orgID != 9671 && orgID != 10340 {
-		if shouldUpdateNextWeekSchedules {
-			nextWeek := now.AddDate(0, 0, 7)
-			if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
-				tx.Rollback()
-				return updateErr
-			}
-		}
-		if shouldUpdateNextSecondWeekSchedules {
-			nextWeek := now.AddDate(0, 0, 14)
-			if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
-				tx.Rollback()
-				return updateErr
-			}
-		}
-	}
+	//if orgID != 9671 && orgID != 10340 {
+	//	if shouldUpdateNextWeekSchedules {
+	//		nextWeek := now.AddDate(0, 0, 7)
+	//		if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//			tx.Rollback()
+	//			return updateErr
+	//		}
+	//	}
+	//	if shouldUpdateNextSecondWeekSchedules {
+	//		nextWeek := now.AddDate(0, 0, 14)
+	//		if updateErr := _updateWeekSchedules(tx, orgID, nextWeek, addTemplateItems, delTemplateItems, changeTemplateItems, devicesMap); updateErr != nil {
+	//			tx.Rollback()
+	//			return updateErr
+	//		}
+	//	}
+	//}
 
 	tx.Commit()
 	return nil
@@ -909,7 +909,7 @@ func GetSchTemplatePatientList(orgID int64) ([]*SchTemplatePatient, error) {
 }
 
 func UpdateTemplateItemWeek(orgID int64, id int64, week_time int8) {
-	readDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"week": week_time})
+	writeDb.Model(&models.PatientScheduleTemplateId{}).Where("org_id = ? AND status = 1 AND id = ? ", orgID, id).Updates(map[string]interface{}{"week": week_time})
 	return
 }
 

service/pharmacy_service.go

@@ -2021,3 +2021,14 @@ func FindeHisAdviceDocAdvice(orgid int64, patient_id int64, stime int64, etime i
 
 	return advice, err
 }
+
+func GetFlow(drug_id int64, system_time int64, org_id int64, patient_id int64) (flow []*models.DrugFlow, err error) {
+
+	err = XTWriteDB().Where("drug_id = ? and system_time =? and user_org_id = ? and status = 1 and patient_id =?", drug_id, system_time, org_id, patient_id).Find(&flow).Error
+	return flow, err
+}
+
+func UpdateAdviceFlow(id int64) error {
+	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ? and status = 1 and is_medicine =0", id).Update(map[string]interface{}{"is_medicine": 1}).Error
+	return err
+}

service/self_drug_service.go

@@ -2599,6 +2599,29 @@ func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	return goodinfo, total, err
 }
 
+func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
+
+	db := XTReadDB().Model(&goodinfo).Where("status = 1")
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	if good_type > 0 {
+		db = db.Where("good_type_id = ?", good_type)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", goodIds)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&goodinfo).Error
+
+	return goodinfo, total, err
+}
+
 func GetStartLastFLow(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
 
 	flwo := models.VmStockFlowTwenty{}

service/stock_service.go

@@ -8521,3 +8521,83 @@ func UpdateDeleteAutoGood(good_id int64, record_date int64, patient_id int64) er
 	err = XTWriteDB().Model(&models.DialysisBeforePrepare{}).Where("good_id = ? and record_date = ? and patient_id = ?", good_id, record_date, patient_id).Updates(map[string]interface{}{"status": 1}).Error
 	return err
 }
+
+func UpdateWarehouseInfoMap(list []*models.WarehousingInfo, warehousing_info_id int64, orgId int64) error {
+
+	tx := XTWriteDB().Begin()
+
+	for _, item := range list {
+
+		err := tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", item.ID).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", item.WarehousingCount)).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+		err = tx.Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", item.ID).Update(map[string]interface{}{"is_check": 2}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		err = tx.Model(models.VmStockFlow{}).Where("warehousing_detail_id =  ?", item.ID).Update(map[string]interface{}{"status": 0, "is_check": 2}).Error
+
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		var goodList []*models.WarehousingInfo
+		err = tx.Where("org_id = ? and storehouse_id = ? and good_id = ? and status =1  and is_check = 1", orgId, item.StorehouseId, item.GoodId).Find(&goodList).Error
+
+		var flush_count int64
+		for _, it := range goodList {
+			flush_count += it.StockCount
+		}
+
+		err = tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and good_id  = ? and storehouse_id = ? and status = 1", item.OrgId, item.GoodId, item.StorehouseId).UpdateColumn("stock_in_count", gorm.Expr("stock_in_count - ?", item.WarehousingCount)).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+		err = tx.Model(&models.XtGoodStockCount{}).Where("user_org_id = ? and good_id = ? and storehouse_id = ? and status = 1", item.OrgId, item.GoodId, item.StorehouseId).Update(map[string]interface{}{"flush_count": flush_count}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		storeHouseConfig := models.XtStorehouseConfig{}
+		err = tx.Where("user_org_id = ? and status = 1", orgId).First(&storeHouseConfig).Error
+
+		var stockList []*models.WarehousingInfo
+		//查询该耗材剩余多少库存
+		err = tx.Where("good_id = ? and storehouse_id = ? and org_id = ? and status = 1 and is_check = 1", item.GoodId, storeHouseConfig.StorehouseOutInfo, orgId).Find(&stockList).Error
+
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range stockList {
+			sum_count += it.StockCount
+			sum_in_count += it.WarehousingCount
+		}
+
+		err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", item.GoodId, orgId).Update(map[string]interface{}{"sum_count": sum_count}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+		err = tx.Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", item.GoodId, orgId).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+	}
+	err := tx.Model(&models.Warehousing{}).Where("id = ? and status = 1", warehousing_info_id).Update(map[string]interface{}{"is_check": 2}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	err = tx.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? and status = 1", warehousing_info_id).Update(map[string]interface{}{"is_check": 2}).Error
+	tx.Commit()
+	return err
+
+}

service/warhouse_service.go

@@ -483,6 +483,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 	// 2.判断当天当前机构有没有创建出库单，没有则创建
 	// 3.创建出库流程
 	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+
 	isHasWay := false
 	record_time := int64(0)
 	isHasWay = true
@@ -491,6 +492,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 	if isHasWay {
 		//判断当天当前机构有没有创建出库单，没有则创建
 		out, err := FindDrugStockOutByIsSys(orgID, 1, record_time)
+
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		if err == gorm.ErrRecordNotFound {
 			timeStr := time.Now().Format("2006-01-02")
@@ -7475,3 +7477,15 @@ func UpdateAutomaticReduce(patient_id int64, record_date int64, good_id int64, p
 	err := XTWriteDB().Model(&models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time =? and good_id = ? and project_id = ? and status = 1", patient_id, record_date, good_id, project_id).Update(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetDrugFLowByAdviceById(drug_id int64, patient_id int64, user_org_id int64, advice_date int64) (outInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and patient_id = ? and org_id = ? and sys_record_time = ? and status= 1", drug_id, patient_id, user_org_id, advice_date).Find(&outInfo).Error
+	return outInfo, err
+}
+
+func UpdateHisAdviceById(id int64) error {
+
+	err := XTWriteDB().Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", id).Updates(map[string]interface{}{"execution_time": "", "execution_staff": "", "execution_state": 2}).Error
+	return err
+}