医保对接

controllers/dialysis_record_api_controller.go

@@ -761,7 +761,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 {
+				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 36 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院

controllers/drug_stock_api_contorller.go

@@ -488,7 +488,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 		Manufacturer:     manufacturer_id,
 	}
 
-	service.EditDrugWarehousing(warehousing)
+	service.EditDrugWarehousingOne(warehousing, id)
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -541,8 +541,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				var productDates int64
 				var expiryDates int64
 
-				fmt.Println()
-
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
 					expiryDates = 0
 				} else {
@@ -592,6 +590,19 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				id := int64(items["id"].(float64))
 
+				if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "float64" {
+					utils.ErrorLog("dealer")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				dealer := int64(items["dealer"].(float64))
+
+				if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "float64" {
+					utils.ErrorLog("manufacturer")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				manufacturer := int64(items["manufacturer"].(float64))
 				if id == 0 {
 					warehouseInfo := &models.DrugWarehouseInfo{
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -608,8 +619,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						Remark:           remark,
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
 						RetailPrice:      retail_price,
 						RetailTotalPrice: retail_price_total,
 					}
@@ -632,8 +643,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						Remark:           remark,
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
 						RetailPrice:      retail_price,
 						RetailTotalPrice: retail_price_total,
 					}
@@ -1417,7 +1428,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					sys_record_time := int64(items["sys_record_time"].(float64))
 
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
-						ID:                      id,
+						ID: id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						DrugId:                  drug_id,

controllers/gobal_config_api_controller.go

@@ -79,6 +79,12 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/drugstock/getdrugoutdetail", &GobalConfigApiController{}, "get:GetDrugOutDetail")
 
 	beego.Router("/api/drugstock/getdrugcanceldetail", &GobalConfigApiController{}, "get:GetDrugCancelDetail")
+
+	beego.Router("/api/monitor/open", &GobalConfigApiController{}, "get:AddMonitorOpen")
+	beego.Router("/api/monitor/getmonitorconfig", &GobalConfigApiController{}, "Get:GetMonitorConfig")
+	beego.Router("/api/order/addorderconfig", &GobalConfigApiController{}, "Get:AddOrderConfig")
+	beego.Router("/api/order/getorderconfig", &GobalConfigApiController{}, "Get:GetOrderConfig")
+
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1603,3 +1609,94 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 		"total": total,
 	})
 }
+
+func (c *GobalConfigApiController) AddMonitorOpen() {
+
+	is_open, _ := c.GetInt64("is_open")
+	fmt.Println("is_open22222222", is_open)
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	config := models.XtMonitorConfig{
+		IsOpen:    is_open,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+	}
+	//查询该机构是否存在
+	_, errcode := service.GetMonitorConfigById(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.AddMonitorOpen(&config)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"config": config,
+		})
+	} else if errcode == nil {
+		err := service.UpdateMonitorOpen(orgId, &config)
+		fmt.Println("err", err)
+	}
+
+}
+
+func (c *GobalConfigApiController) GetMonitorConfig() {
+
+	userInfo := c.GetAdminUserInfo()
+	orgId := userInfo.CurrentOrgId
+
+	config, err := service.GetMonitorConfig(orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+
+}
+
+func (c *GobalConfigApiController) AddOrderConfig() {
+
+	is_open, _ := c.GetInt64("is_open")
+	fmt.Println("344555555555555", is_open)
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	config := models.XtOrderConfig{
+		IsOpen:    is_open,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+	}
+	//查询
+	_, errcode := service.GetOrderConfigById(orgId)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.AddOrderConfig(&config)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"config": config,
+		})
+	} else if errcode == nil {
+
+		err := service.UpdateOrderConfig(orgId, &config)
+		fmt.Println("2222", err)
+	}
+
+}
+
+func (c *GobalConfigApiController) GetOrderConfig() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	config, err := service.GetOrderConfig(orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}

controllers/his_api_controller.go

@@ -84,6 +84,7 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/incomestatistics/get", &HisApiController{}, "get:GetIncomeStatisticsData")
 
+	beego.Router("/api/postprojectinformation", &HisApiController{}, "post:PostProjectInformation")
 }
 
 func (c *HisApiController) Sscard() {
@@ -3082,3 +3083,451 @@ func (this *HisApiController) GetIncomeStatisticsData() {
 	}
 
 }
+
+func (c *HisApiController) PostProjectInformation() {
+	adminUser := c.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		return
+	}
+	utils.ErrorLog("%v", dataBody)
+	var projectList []*models.HisProject
+	var total_goods []interface{}
+	tempProjects := dataBody["projects"].([]interface{})
+	fmt.Println("666666666666", tempProjects)
+	total_goods = tempProjects
+	for index, projectMap := range tempProjects {
+
+		projectM := projectMap.(map[string]interface{})
+
+		var project models.HisProject
+		if projectM["project_name"] == nil || reflect.TypeOf(projectM["project_name"]).String() != "string" {
+			utils.ErrorLog("project_name")
+			return
+		}
+
+		project_name, _ := projectM["project_name"].(string)
+		if len(project_name) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    6,
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的项目名称不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		project.ProjectName = project_name
+
+		prices := projectM["price"].(string)
+
+		price, _ := strconv.ParseFloat(prices, 64)
+		if price <= 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    6,
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的零价不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		project.Price = price
+
+		if projectM["unit"] == nil || reflect.TypeOf(projectM["unit"]).String() != "string" {
+			utils.ErrorLog("unit_id")
+			return
+		}
+
+		unit := projectM["unit"].(string)
+		if len(unit) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    6,
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的单位不能为空或内容与系统不匹配",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+		project.Unit = unit
+
+		cost_classify := projectM["cost_classify"].(string)
+		if len(cost_classify) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    6,
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的费用类别不能为空或内容与系统不匹配",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+		var costClassify = "费用类别"
+		var cost_classify_id int64
+
+		costClassifyConfig, _ := service.GetDrugDataConfig(0, costClassify)
+
+		if len(cost_classify) != 0 {
+			_, errcode := service.IsExistDicConfig(costClassifyConfig.ID, cost_classify, orgId)
+			if errcode == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       costClassifyConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           cost_classify,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+		}
+
+		costClassList, _ := service.GetParentDataConfig(costClassifyConfig.ID, orgId)
+
+		for _, it := range costClassList {
+			if cost_classify == it.Name {
+				cost_classify_id = int64(it.Value)
+			}
+		}
+		project.CostClassify = cost_classify_id
+
+		executive_section := projectM["executive_section"].(string)
+		if len(executive_section) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    6,
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的费用类别不能为空或内容与系统不匹配",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		if len(executive_section) != 0 {
+			//查找科室是否有内容
+			_, errcodedepart := service.GetDepartMentByName(executive_section, orgId)
+			if errcodedepart == gorm.ErrRecordNotFound {
+				department := models.XtHisDepartment{
+					Name:        executive_section,
+					Status:      1,
+					UserOrgId:   adminUser.CurrentOrgId,
+					CreatedTime: time.Now().Unix(),
+				}
+				service.CreateDePartment(&department)
+			}
+		}
+		var executive_section_id int64
+		departMentList, _ := service.GetAllDepartMent(orgId)
+		for _, it := range departMentList {
+			if executive_section == it.Name {
+				executive_section_id = it.ID
+			}
+		}
+		project.ExecutiveSection = executive_section_id
+
+		medical_coverage := projectM["medical_coverage"].(string)
+		fmt.Println("3333333333333", medical_coverage)
+		if len(medical_coverage) == 0 { //名字为空则生成一条导入错误日志
+			err_log := models.ExportErrLog{
+				LogType:    6,
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的费用类别不能为空",
+				Status:     1,
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: time.Now().Unix(),
+			}
+			service.CreateExportErrLog(&err_log)
+			continue
+		}
+
+		var medicalCoverage = "医保等级"
+		var medical_coverage_id int64
+
+		medicalCoverageConfig, _ := service.GetDrugDataConfig(0, medicalCoverage)
+		if len(medical_coverage) != 0 {
+
+			_, errormedicalcoverage := service.IsExistDicConfig(medicalCoverageConfig.ID, medical_coverage, orgId)
+			if errormedicalcoverage == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       medicalCoverageConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           medical_coverage,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+		}
+		medicalCoverageList, _ := service.GetParentDataConfig(medicalCoverageConfig.ID, orgId)
+		for _, it := range medicalCoverageList {
+			if medical_coverage == it.Name {
+				medical_coverage_id = int64(it.Value)
+			}
+		}
+		project.MedicalCoverage = medical_coverage_id
+
+		pinyin := projectM["pinyin"].(string)
+		project.Pinyin = pinyin
+
+		wubi := projectM["wubi"].(string)
+		fmt.Println("五笔333333333333333333333333333333", wubi)
+		project.Wubi = wubi
+
+		statistical_classification := projectM["statistical_classification"].(string)
+
+		var statisticalClassification = "统计分类"
+		var statistical_classification_id int64
+		classiFication, _ := service.GetDrugDataConfig(0, statisticalClassification)
+		if len(statistical_classification) != 0 {
+
+			_, classificationerrcodes := service.IsExistDicConfig(classiFication.ID, statistical_classification, orgId)
+
+			if classificationerrcodes == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       classiFication.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           statistical_classification,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+
+		}
+		classiFicationList, _ := service.GetParentDataConfig(classiFication.ID, orgId)
+
+		for _, it := range classiFicationList {
+			if statistical_classification == it.Name {
+
+				statistical_classification_id = int64(it.Value)
+			}
+		}
+
+		project.StatisticalClassification = statistical_classification_id
+
+		disease_directory := int64(projectM["disease_directory"].(float64))
+		project.DiseaseDirectory = disease_directory
+
+		is_record := int64(projectM["is_record"].(float64))
+		project.IsRecord = is_record
+
+		medical_code := projectM["medical_code"].(string)
+		project.MedicalCode = medical_code
+
+		tube_color := projectM["tube_color"].(string)
+
+		var tubeColor = "试管颜色"
+		var tube_color_id int64
+		tubeColorConfig, _ := service.GetDrugDataConfig(0, tubeColor)
+		if len(tube_color) != 0 {
+			_, errcodetube := service.IsExistDicConfig(tubeColorConfig.ID, tube_color, orgId)
+			if errcodetube == gorm.ErrRecordNotFound {
+				dataconfig := models.DictDataconfig{
+					ParentId:       tubeColorConfig.ID,
+					Module:         "system",
+					OrgId:          orgId,
+					Name:           tube_color,
+					FieldName:      "",
+					Value:          index + 50,
+					CreatedTime:    "",
+					UpdatedTime:    "",
+					CreateUserId:   adminUser.AdminUser.Id,
+					Status:         1,
+					Remark:         "",
+					DeleteIdSystem: 0,
+					Title:          "",
+					Content:        "",
+					Order:          0,
+					Code:           "",
+				}
+				service.CreatedDicConfig(&dataconfig)
+			}
+
+		}
+
+		tubeColorList, _ := service.GetParentDataConfig(tubeColorConfig.ID, orgId)
+		for _, it := range tubeColorList {
+			if tube_color == it.Name {
+				tube_color_id = int64(it.Value)
+			}
+		}
+
+		project.TubeColor = tube_color_id
+
+		single_dose := projectM["single_dose"].(string)
+		project.SingleDose = single_dose
+		execution_frequency := projectM["execution_frequency"].(string)
+		project.ExecutionFrequency = execution_frequency
+
+		delivery_way := projectM["delivery_way"].(string)
+		project.DeliveryWay = delivery_way
+
+		number_days := projectM["number_days"].(string)
+		project.NumberDays = number_days
+
+		total := projectM["total"].(string)
+		project.Total = total
+
+		medical_status := int64(projectM["medical_status"].(float64))
+		project.MedicalStatus = medical_status
+
+		category := int64(projectM["category"].(float64))
+		project.Category = category
+
+		specail_project := int64(projectM["specail_project"].(float64))
+		project.SpecailProject = specail_project
+
+		social_security_directory_code := projectM["social_security_directory_code"].(string)
+		fmt.Println("社保目录编码22222222222", social_security_directory_code)
+		project.SocialSecurityDirectoryCode = social_security_directory_code
+
+		remark := projectM["remark"].(string)
+		project.Remark = remark
+
+		record_date := projectM["record_date"].(string)
+		fmt.Println("日期222222222", record_date)
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		project.RecordDate = theTime.Unix()
+		projectList = append(projectList, &project)
+	}
+
+	export_time := time.Now().Unix()
+
+	errLogs, _ := service.FindPatientExportLog(c.GetAdminUserInfo().CurrentOrgId, export_time)
+	if len(projectList) > 0 {
+		for _, item := range projectList {
+			project := models.HisProject{
+				ProjectName:      item.ProjectName,
+				Price:            item.Price,
+				Unit:             item.Unit,
+				CostClassify:     item.CostClassify,
+				ExecutiveSection: item.ExecutiveSection,
+				MedicalCoverage:  item.MedicalCoverage,
+				UserOrgId:        orgId,
+				Status:           1,
+				CreatedTime:      time.Now().Unix(),
+				Pinyin:           item.Pinyin,
+				Wubi:             item.Wubi,
+				StatisticalClassification: item.StatisticalClassification,
+				DiseaseDirectory:          item.DiseaseDirectory,
+				IsRecord:                  item.IsRecord,
+				MedicalCode:               item.MedicalCode,
+				TubeColor:                 item.TubeColor,
+				SingleDose:                item.SingleDose,
+				DeliveryWay:               item.DeliveryWay,
+				NumberDays:                item.NumberDays,
+				Total:                     item.Total,
+				Category:                  item.Category,
+				MedicalStatus:             item.MedicalStatus,
+				SpecailProject:            item.SpecailProject,
+				RecordDate:                item.RecordDate,
+				Remark:                    item.Remark,
+				SocialSecurityDirectoryCode: item.SocialSecurityDirectoryCode,
+				ExecutionFrequency:          item.ExecutionFrequency,
+			}
+
+			_, errcodeproject := service.GetProjectByNameIsExsit(item.ProjectName, orgId)
+			if errcodeproject == gorm.ErrRecordNotFound {
+				service.CreateProjectInfomation(&project)
+			} else if errcodeproject == nil {
+				service.UpdateProjectByName(&project, item.ProjectName, orgId)
+			}
+
+			log := models.ExportLog{
+				LogType:    6,
+				UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+				TotalNum:   int64(len(total_goods)),
+				FailNum:    int64(len(errLogs)),
+				SuccessNum: int64(len(projectList)),
+				CreateTime: time.Now().Unix(),
+				UpdateTime: time.Now().Unix(),
+				ExportTime: export_time,
+				Status:     1,
+			}
+			service.CreateExportLog(&log)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":         "导入成功",
+				"total_num":   len(total_goods),
+				"success_num": len(projectList),
+				"fail_num":    int64(len(errLogs)),
+			})
+		}
+	} else {
+		log := models.ExportLog{
+			LogType:    6,
+			UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+			TotalNum:   int64(len(total_goods)),
+			FailNum:    int64(len(errLogs)),
+			SuccessNum: int64(len(projectList)),
+			CreateTime: time.Now().Unix(),
+			UpdateTime: time.Now().Unix(),
+			ExportTime: export_time,
+			Status:     1,
+		}
+		service.CreateExportLog(&log)
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":         "导入成功",
+			"total_num":   len(total_goods),
+			"success_num": len(projectList),
+			"fail_num":    int64(len(errLogs)),
+		})
+	}
+}

controllers/manager_center_api_controller.go

@@ -347,7 +347,6 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	//查询是否存在
 	_, errOne := service.GetDrugNameIsExist(id, adminInfo.CurrentOrgId)
 	if errOne == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗")
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})
@@ -383,7 +382,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	_, errThree := service.GetSelfMedicalIsExist(id, adminInfo.CurrentOrgId)
 
 	if errThree == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗2")
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})
@@ -405,7 +404,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 
 	_, errFour := service.GetSelfStosckIsExist(id, adminInfo.CurrentOrgId)
 	if errFour == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗3")
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})
@@ -421,7 +420,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 
 	_, errFive := service.GetOutSelfOutStockIsExist(id, adminInfo.CurrentOrgId)
 	if errFive == gorm.ErrRecordNotFound {
-		fmt.Println("进来了吗4")
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",
 		})
@@ -1448,7 +1447,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	special_medical := c.GetString("special_medical")
 	adminUserInfo := c.GetAdminUserInfo()
 
-	totals := service.FindGoodInfoByName(specification_name, adminUserInfo.CurrentOrgId, good_id)
+	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
 	if totals > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodInfoNameExistError)
 		return
@@ -1598,7 +1597,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		ProductionType:              production_type,
 	}
 
-	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id)
+	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)
 	if totals > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGoodInfoNameExistError)
 		return

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -335,7 +335,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1158,11 +1158,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
-		DialysisDialyszers:         dialysis_dialyszers,
-		DialysisIrrigation:         dialysis_irrigation,
-		AntioxidantCommodityName:   antioxidant_commodity_name,
-		DisplaceSpeed:              displace_speed,
+		Blood:                    blood,
+		DialysisDialyszers:       dialysis_dialyszers,
+		DialysisIrrigation:       dialysis_irrigation,
+		AntioxidantCommodityName: antioxidant_commodity_name,
+		DisplaceSpeed:            displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2039,11 +2039,11 @@ func (c *DialysisAPIController) PostSolution() {
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood:                     blood,
-		DialysisDialyszers:        dialysis_dialyszers,
-		DialysisIrrigation:        dialysis_irrigation,
-		AntioxidantCommodityName:  antioxidant_commodity_name,
-		DisplaceSpeed:             displace_speed,
+		Blood:                    blood,
+		DialysisDialyszers:       dialysis_dialyszers,
+		DialysisIrrigation:       dialysis_irrigation,
+		AntioxidantCommodityName: antioxidant_commodity_name,
+		DisplaceSpeed:            displace_speed,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2285,7 +2285,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 32 || template.TemplateId == 34 {
+			if template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1)
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -2313,7 +2313,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/print_data_api_controller.go

@@ -92,13 +92,20 @@ func (this *PrintDataAPIController) StockRecordPrintData() {
 
 	list, err := service.FindPrintStockGoodInfoByType(types, startTime, endTime, adminUserInfo.CurrentOrgId)
 	stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
+
+	info, err := service.GetCoutWareseOutInfo(startTime, endTime, adminUserInfo.CurrentOrgId)
+
+	infomationList, err := service.GetGoodInfomationList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
-			"type":       types,
-			"stockTotal": stockTotal,
+			"list":           list,
+			"type":           types,
+			"stockTotal":     stockTotal,
+			"info":           info,
+			"orgid":          adminUserInfo.CurrentOrgId,
+			"infomationList": infomationList,
 		})
 	}
 }

controllers/schedule_api_controller.go

@@ -2011,112 +2011,163 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 	//获取本周患者排班
 	schedules, _ := service.GetWeekSchedules(orgId, start_time, end_time)
 
-	//查询复制中的排班日期是否存在
-	_, errcode := service.GetLastWeekSchedule(orgId, copy_startime, copy_endtime)
-
-	if errcode == gorm.ErrRecordNotFound {
-		//如果没有直接新增
-
-		for _, item := range schedules {
-			//fmt.Println(item.StartTime+604800)
-			//礼拜1
-			if item.ScheduleWeek == 1 {
-				item.ScheduleDate = copy_startime
-			}
-			if item.ScheduleWeek == 2 {
-				item.ScheduleDate = copy_startime + 86400
-			}
-			if item.ScheduleWeek == 3 {
-				item.ScheduleDate = copy_startime + 172800
-			}
-			if item.ScheduleWeek == 4 {
-				item.ScheduleDate = copy_startime + 259200
-			}
-			if item.ScheduleWeek == 5 {
-				item.ScheduleDate = copy_startime + 345600
-			}
-
-			if item.ScheduleWeek == 6 {
-				item.ScheduleDate = copy_startime + 432000
-			}
-			//礼拜天
-			if item.ScheduleWeek == 0 {
-				item.ScheduleDate = copy_endtime
-			}
-			schedule := models.XtSchedule{
-				UserOrgId:    item.UserOrgId,
-				PartitionId:  item.PartitionId,
-				BedId:        item.BedId,
-				PatientId:    item.PatientId,
-				ScheduleDate: item.ScheduleDate,
-				ScheduleType: item.ScheduleType,
-				ScheduleWeek: item.ScheduleWeek,
-				ModeId:       item.ModeId,
-				Status:       1,
-				CreatedTime:  time.Now().Unix(),
-			}
-
-			err := service.AddPatientSchedule(&schedule)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"schedule": schedule,
-			})
+	//先清除复制周的排班
+	errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
+	fmt.Println(errcode)
+	for _, item := range schedules {
+		//fmt.Println(item.StartTime+604800)
+		//礼拜1
+		if item.ScheduleWeek == 1 {
+			item.ScheduleDate = copy_startime
+		}
+		if item.ScheduleWeek == 2 {
+			item.ScheduleDate = copy_startime + 86400
+		}
+		if item.ScheduleWeek == 3 {
+			item.ScheduleDate = copy_startime + 172800
+		}
+		if item.ScheduleWeek == 4 {
+			item.ScheduleDate = copy_startime + 259200
+		}
+		if item.ScheduleWeek == 5 {
+			item.ScheduleDate = copy_startime + 345600
 		}
-	} else if errcode == nil {
-
-		//先清除复制周的排班
-		errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
-		fmt.Println(errcode)
-		for _, item := range schedules {
-			//fmt.Println(item.StartTime+604800)
-			//礼拜1
-			if item.ScheduleWeek == 1 {
-				item.ScheduleDate = copy_startime
-			}
-			if item.ScheduleWeek == 2 {
-				item.ScheduleDate = copy_startime + 86400
-			}
-			if item.ScheduleWeek == 3 {
-				item.ScheduleDate = copy_startime + 172800
-			}
-			if item.ScheduleWeek == 4 {
-				item.ScheduleDate = copy_startime + 259200
-			}
-			if item.ScheduleWeek == 5 {
-				item.ScheduleDate = copy_startime + 345600
-			}
 
-			if item.ScheduleWeek == 6 {
-				item.ScheduleDate = copy_startime + 432000
-			}
-			//礼拜天
-			if item.ScheduleWeek == 0 {
-				item.ScheduleDate = copy_endtime
-			}
-			schedule := models.XtSchedule{
-				UserOrgId:    item.UserOrgId,
-				PartitionId:  item.PartitionId,
-				BedId:        item.BedId,
-				PatientId:    item.PatientId,
-				ScheduleDate: item.ScheduleDate,
-				ScheduleType: item.ScheduleType,
-				ScheduleWeek: item.ScheduleWeek,
-				ModeId:       item.ModeId,
-				Status:       1,
-				CreatedTime:  time.Now().Unix(),
-			}
+		if item.ScheduleWeek == 6 {
+			item.ScheduleDate = copy_startime + 432000
+		}
+		//礼拜天
+		if item.ScheduleWeek == 0 {
+			item.ScheduleDate = copy_endtime
+		}
+		schedule := models.XtSchedule{
+			UserOrgId:    item.UserOrgId,
+			PartitionId:  item.PartitionId,
+			BedId:        item.BedId,
+			PatientId:    item.PatientId,
+			ScheduleDate: item.ScheduleDate,
+			ScheduleType: item.ScheduleType,
+			ScheduleWeek: item.ScheduleWeek,
+			ModeId:       item.ModeId,
+			Status:       1,
+			CreatedTime:  time.Now().Unix(),
+		}
 
-			err := service.AddPatientSchedule(&schedule)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"schedule": schedule,
-			})
+		err := service.AddPatientSchedule(&schedule)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"schedule": schedule,
+		})
 	}
+	//查询复制中的排班日期是否存在
+	//_, errcode := service.GetLastWeekSchedule(orgId, copy_startime, copy_endtime)
+	//
+	//if errcode == gorm.ErrRecordNotFound {
+	//	//如果没有直接新增
+	//
+	//	for _, item := range schedules {
+	//		//fmt.Println(item.StartTime+604800)
+	//		//礼拜1
+	//		if item.ScheduleWeek == 1 {
+	//			item.ScheduleDate = copy_startime
+	//		}
+	//		if item.ScheduleWeek == 2 {
+	//			item.ScheduleDate = copy_startime + 86400
+	//		}
+	//		if item.ScheduleWeek == 3 {
+	//			item.ScheduleDate = copy_startime + 172800
+	//		}
+	//		if item.ScheduleWeek == 4 {
+	//			item.ScheduleDate = copy_startime + 259200
+	//		}
+	//		if item.ScheduleWeek == 5 {
+	//			item.ScheduleDate = copy_startime + 345600
+	//		}
+	//
+	//		if item.ScheduleWeek == 6 {
+	//			item.ScheduleDate = copy_startime + 432000
+	//		}
+	//		//礼拜天
+	//		if item.ScheduleWeek == 0 {
+	//			item.ScheduleDate = copy_endtime
+	//		}
+	//		schedule := models.XtSchedule{
+	//			UserOrgId:    item.UserOrgId,
+	//			PartitionId:  item.PartitionId,
+	//			BedId:        item.BedId,
+	//			PatientId:    item.PatientId,
+	//			ScheduleDate: item.ScheduleDate,
+	//			ScheduleType: item.ScheduleType,
+	//			ScheduleWeek: item.ScheduleWeek,
+	//			ModeId:       item.ModeId,
+	//			Status:       1,
+	//			CreatedTime:  time.Now().Unix(),
+	//		}
+	//
+	//		err := service.AddPatientSchedule(&schedule)
+	//		if err != nil {
+	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//			return
+	//		}
+	//		this.ServeSuccessJSON(map[string]interface{}{
+	//			"schedule": schedule,
+	//		})
+	//	}
+	//} else if errcode == nil {
+	//
+	//	//先清除复制周的排班
+	//	errcode := service.UpdatePatientSchedule(orgId, copy_startime, copy_endtime)
+	//	fmt.Println(errcode)
+	//	for _, item := range schedules {
+	//		//fmt.Println(item.StartTime+604800)
+	//		//礼拜1
+	//		if item.ScheduleWeek == 1 {
+	//			item.ScheduleDate = copy_startime
+	//		}
+	//		if item.ScheduleWeek == 2 {
+	//			item.ScheduleDate = copy_startime + 86400
+	//		}
+	//		if item.ScheduleWeek == 3 {
+	//			item.ScheduleDate = copy_startime + 172800
+	//		}
+	//		if item.ScheduleWeek == 4 {
+	//			item.ScheduleDate = copy_startime + 259200
+	//		}
+	//		if item.ScheduleWeek == 5 {
+	//			item.ScheduleDate = copy_startime + 345600
+	//		}
+	//
+	//		if item.ScheduleWeek == 6 {
+	//			item.ScheduleDate = copy_startime + 432000
+	//		}
+	//		//礼拜天
+	//		if item.ScheduleWeek == 0 {
+	//			item.ScheduleDate = copy_endtime
+	//		}
+	//		schedule := models.XtSchedule{
+	//			UserOrgId:    item.UserOrgId,
+	//			PartitionId:  item.PartitionId,
+	//			BedId:        item.BedId,
+	//			PatientId:    item.PatientId,
+	//			ScheduleDate: item.ScheduleDate,
+	//			ScheduleType: item.ScheduleType,
+	//			ScheduleWeek: item.ScheduleWeek,
+	//			ModeId:       item.ModeId,
+	//			Status:       1,
+	//			CreatedTime:  time.Now().Unix(),
+	//		}
+	//
+	//		err := service.AddPatientSchedule(&schedule)
+	//		if err != nil {
+	//			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//			return
+	//		}
+	//		this.ServeSuccessJSON(map[string]interface{}{
+	//			"schedule": schedule,
+	//		})
+	//	}
+	//}
 }

models/his_models.go

@@ -369,34 +369,44 @@ func (HisPrescription) TableName() string {
 }
 
 type HisProject struct {
-	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
-	Pinyin                    string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                      string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
-	Unit                      string  `gorm:"column:unit" json:"unit" form:"unit"`
-	CostClassify              int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
-	ExecutiveSection          int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
-	MedicalCoverage           int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
-	StatisticalClassification int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
-	DiseaseDirectory          int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
-	IsRecord                  int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	MedicalCode               string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
-	TubeColor                 int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
-	MedicalStatus             int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
-	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Sign                      int64   `gorm:"column:sign" json:"sign" form:"sign"`
-	DefaultNumber             string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
-	IsDefault                 int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsCharge                  int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
-	IsEstimate                int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
-	IsWorkload                int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
-	Sort                      string  `gorm:"column:sort" json:"sort" form:"sort"`
-	DoctorAdvice              int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
-	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime               int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 }
 
 func (HisProject) TableName() string {

models/self_drug_models.go

@@ -534,3 +534,29 @@ type BloodDrugWarehouseOutInfo struct {
 	Creater                 int64   `gorm:"column:creater" json:"creater" form:"creater"`
 	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 }
+
+type XtMonitorConfig 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"`
+	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"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (XtMonitorConfig) TableName() string {
+	return "xt_monitor_config"
+}
+
+type XtOrderConfig 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"`
+	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"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+}
+
+func (XtOrderConfig) TableName() string {
+	return "xt_order_config"
+}

models/stock_models.go

@@ -308,3 +308,11 @@ type AutomaticReduceDetail struct {
 func (AutomaticReduceDetail) TableName() string {
 	return "xt_automatic_reduce_detail"
 }
+
+type VmWarehouseOutInfo struct {
+	GoodId int64   `gorm:"column:good_id" json:"good_id"`
+	Count  int64   `gorm:"column:count" json:"count"`
+	Remark string  `gorm:"column:remark" json:"remark"`
+	Price  float64 `gorm:"column:price" json:"price"`
+	OrgId  int64   `gorm:"column:org_id" json:"org_id"`
+}

service/gobal_config_service.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"time"
 )
 
 func CreateAutomaticReduceRecord(config *models.GobalConfig) (err error) {
@@ -395,3 +396,66 @@ func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoM
 
 	return autoMatic, err
 }
+
+func AddMonitorOpen(config *models.XtMonitorConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+
+	return err
+}
+
+func UpdateMonitorOpen(orgid int64, config *models.XtMonitorConfig) error {
+
+	err := XTWriteDB().Model(&config).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_open": config.IsOpen, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetMonitorConfig(orgid int64) (models.XtMonitorConfig, error) {
+
+	config := models.XtMonitorConfig{}
+	err := XTReadDB().Model(&config).Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	return config, err
+}
+
+func AddOrderConfig(config *models.XtOrderConfig) error {
+
+	err := XTWriteDB().Create(&config).Error
+	return err
+}
+
+func UpdateOrderConfig(orgid int64, config *models.XtOrderConfig) error {
+
+	err := XTWriteDB().Model(&config).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_open": config.IsOpen, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetOrderConfigById(orgid int64) (*models.XtOrderConfig, error) {
+	config := models.XtOrderConfig{}
+	err := XTReadDB().Model(&config).Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
+func GetOrderConfig(orgid int64) (models.XtOrderConfig, error) {
+	config := models.XtOrderConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	return config, err
+}
+
+func GetMonitorConfigById(orgid int64) (*models.XtMonitorConfig, error) {
+
+	config := models.XtMonitorConfig{}
+	err := XTReadDB().Model(&config).Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}

service/mobile_dialysis_service.go

@@ -2039,6 +2039,7 @@ func BatchAdviceExecution(ids []string, creator int64, execution_state int64) er
 }
 
 func BatchHisAdviceExecution(ids []string, creator int64, execution_state int64) error {
+
 	advice := models.HisDoctorAdviceInfo{}
 	err := XTWriteDB().Model(&advice).Where("id IN(?) and status = 1", ids).Updates(map[string]interface{}{"execution_state": 1, "execution_staff": creator, "execution_time": execution_state}).Error
 	return err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -198,3 +198,16 @@ func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoM
 
 	return autoMatic, err
 }
+
+func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutInfo []*models.VmWarehouseOutInfo, err error) {
+
+	db := p_service.XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status  =1")
+	err = db.Select("x.good_id,Sum(x.count) as count,x.remark,x.price,x.org_id").Where("x.ctime >=? and x.ctime<=? and x.org_id = ?", startime, endtime, orgid).Group("x.good_id").Scan(&houseOutInfo).Error
+	return houseOutInfo, err
+}
+
+func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error) {
+
+	err = p_service.XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+	return goodInfo, err
+}

service/schedule_service.go

@@ -738,8 +738,9 @@ func GetLastWeekSchedule(orgid int64, startime int64, endtime int64) (*models.Xt
 	return &schedule, nil
 }
 func AddPatientSchedule(schedule *models.XtSchedule) error {
-
-	err := XTWriteDB().Create(&schedule).Error
+	utx := XTWriteDB().Begin()
+	err := utx.Create(&schedule).Error
+	utx.Commit()
 	return err
 }
 

service/stock_service.go

@@ -1975,8 +1975,13 @@ func FindGoodInfoByName(name string, org_id int64, good_type_id int64) (total in
 	return
 }
 
-func FindGoodInfoByNameOne(name string, org_id int64, good_type_id int64, id int64) (total int64) {
-	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? and id <> ? ", org_id, name, good_type_id, id).Count(&total)
+func FindGoodInfoByNameTwo(name string, org_id int64, good_type_id int64, good_name string) (total int64) {
+	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? and good_name = ?", org_id, name, good_type_id, good_name).Count(&total)
+	return
+}
+
+func FindGoodInfoByNameOne(name string, org_id int64, good_type_id int64, id int64, goodname string) (total int64) {
+	readDb.Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 AND specification_name = ? AND good_type_id = ? and id <> ? and good_name = ? ", org_id, name, good_type_id, id, goodname).Count(&total)
 	return
 }
 
@@ -2228,3 +2233,263 @@ func GetManufacturerName(orgid int64, name string) (*models.Manufacturer, error)
 	}
 	return &manufacturer, nil
 }
+
+func CreateManufacturer(manufacturer *models.Manufacturer) error {
+
+	err := XTWriteDB().Create(manufacturer).Error
+	return err
+}
+
+func UpdatedManufactur(manufacturer *models.Manufacturer, orgid int64) error {
+
+	err := XTWriteDB().Model(&manufacturer).Where("org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"manufacturer_name": manufacturer.ManufacturerName}).Error
+	return err
+}
+
+func GetGoodsInformaitonIsExist(goodName string, goodType int64, specificationName string, orgid int64) (*models.GoodInfo, error) {
+
+	var good models.GoodInfo
+	var err error
+	err = XTReadDB().Model(&good).Where("good_name = ? and good_type_id = ? and specification_name = ? and org_id = ? and status = 1", goodName, goodType, specificationName, orgid).Find(&good).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &good, nil
+
+}
+
+func CreateGoodsInfomation(info *models.GoodInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func UpdateGoodsInformation(info *models.GoodInfo, goodName string, goodType int64, specificationName string, orgid int64) error {
+
+	err := XTWriteDB().Model(&info).Where("good_name = ? and good_type_id = ? and specification_name = ? and org_id = ? and status = 1", goodName, goodType, specificationName, orgid).Updates(map[string]interface{}{"good_name": info.GoodName, "good_type_id": info.GoodTypeId, "medical_insurance_level": info.MedicalInsuranceLevel, "good_kind": info.GoodKind, "specification_name": info.SpecificationName, "manufacturer": info.Manufacturer, "good_unit": info.GoodUnit, "retail_price": info.RetailPrice, "stock_warn_count": info.StockWarnCount, "dealer": info.Dealer, "pinyin": info.Pinyin, "wubi": info.Wubi, "buy_price": info.BuyPrice, "medical_insurance_number": info.MedicalInsuranceNumber, "is_special_diseases": info.IsSpecialDiseases, "is_record": info.IsRecord, "statistics_category": info.StatisticsCategory, "good_status": info.GoodStatus, "social_security_directory_code": info.SocialSecurityDirectoryCode, "production_type": info.ProductionType, "special_medical": info.SpecialMedical, "remark": info.Remark}).Error
+	return err
+}
+
+func GetCoutWareseOutInfo(startime int64, endtime int64, orgid int64) (houseOutInfo []*models.VmWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status  =1")
+	err = db.Select("x.good_id,Sum(x.count) as count,x.remark,x.price,x.org_id").Where("x.ctime >=? and x.ctime<=? and x.org_id = ?", startime, endtime, orgid).Group("x.good_id").Scan(&houseOutInfo).Error
+	return houseOutInfo, err
+}
+
+func GetGoodInfomationList(orgid int64) (goodInfo []*models.GoodInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&goodInfo).Error
+	return goodInfo, err
+}
+
+func IsExistDrugByName(drugname string, drugdesc string, orgid int64) (*models.BaseDrugLib, error) {
+	var drug models.BaseDrugLib
+	var err error
+	err = XTReadDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and status =1", drugname, drugdesc).Find(&drug).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drug, nil
+}
+
+func CreateDrugsInfomation(info *models.BaseDrugLib) error {
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func UpdateDrugsInformation(drug *models.BaseDrugLib, drugName string, drugSpec string, orgid int64) error {
+
+	err := XTWriteDB().Model(&drug).Where("drug_name = ? and drug_spec = ? and org_id = ? and status = 1", drugName, drugSpec, orgid).Updates(map[string]interface{}{"drug_name": drug.DrugName, "drug_alias": drug.DrugAlias, "drug_spec": drug.DrugSpec, "drug_type": drug.DrugType, "drug_stock_limit": drug.DrugStockLimit, "drug_origin_place": drug.DrugOriginPlace, "drug_dosage_form": drug.DrugDosageForm, "medical_insurance_level": drug.MedicalInsuranceLevel, "max_unit": drug.MaxUnit, "min_unit": drug.MinUnit, "unit_matrixing": drug.UnitMatrixing, "retail_price": drug.RetailPrice, "last_price": drug.LastPrice, "drug_classify": drug.DrugClassify, "manufacturer": drug.Manufacturer, "dealer": drug.Dealer, "pinyin": drug.Pinyin, "wubi": drug.Wubi, "drug_alias_pinyin": drug.DrugAliasPinyin, "drug_alias_wubi": drug.DrugAliasWubi, "drug_category": drug.DrugCategory, "drug_control": drug.DrugControl, "number": drug.Number, "hosp_appr_flag": drug.HospApprFlag, "medical_insurance_number": drug.MedicalInsuranceNumber, "pharmacology_category": drug.PharmacologyCategory, "statistics_category": drug.StatisticsCategory, "code": drug.Code, "is_special_diseases": drug.IsSpecialDiseases, "is_record": drug.IsRecord, "prescription_mark": drug.PrescriptionMark, "social_security_directory_code": drug.SocialSecurityDirectoryCode, "record_date": drug.RecordDate, "drug_remark": drug.DrugRemark, "drug_status": drug.DrugStatus, "limit_remark": drug.LimitRemark, "drug_dose": drug.DrugDose, "drug_dose_unit": drug.DrugDoseUnit, "lmt_used_flag": drug.LmtUsedFlag}).Error
+	return err
+}
+
+func GetProjectByNameIsExsit(projectName string, orgid int64) (*models.HisProject, error) {
+
+	var projoect models.HisProject
+	var err error
+	err = XTReadDB().Model(&projoect).Where("project_name = ? and user_org_id = ? and status =1", projectName, orgid).Find(&projoect).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &projoect, nil
+}
+
+func CreateProjectInfomation(info *models.HisProject) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func UpdateProjectByName(project *models.HisProject, projectName string, orgid int64) error {
+
+	err := XTWriteDB().Model(&project).Where("project_name = ? and user_org_id = ? and status = 1", projectName, orgid).Updates(map[string]interface{}{"project_name": project.ProjectName, "price": project.Price, "unit": project.Unit, "cost_classify": project.CostClassify, "executive_section": project.ExecutiveSection, "medical_coverage": project.MedicalCoverage, "pinyin": project.Pinyin, "wubi": project.Wubi, "statistical_classification": project.StatisticalClassification, "disease_directory": project.DiseaseDirectory, "is_record": project.IsRecord, "medical_code": project.MedicalCode, "tube_color": project.TubeColor, "single_dose": project.SingleDose, "delivery_way": project.DeliveryWay, "execution_frequency": project.ExecutionFrequency, "number_days": project.NumberDays, "total": project.Total, "medical_status": project.MedicalStatus, "category": project.Category, "specail_project": project.SpecailProject, "social_security_directory_code": project.SocialSecurityDirectoryCode, "record_date": project.RecordDate, "remark": project.Remark}).Error
+	return err
+}
+func GetWareOutInfoById(warehouseoutid int64, orgid int64) (warehouseinfo []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Model(&warehouseinfo).Where("warehouse_out_id = ? and org_id = ? and status= 1 and is_sys = 0", warehouseoutid, orgid).Find(&warehouseinfo).Error
+	return warehouseinfo, err
+}
+
+func EditDrugWarehousingOne(warehouse models.DrugWarehouse, id int64) {
+	err = readDb.Model(&models.DrugWarehouse{}).Where("warehousing_order = ? AND status = 1 and id = ?", warehouse.WarehousingOrder, id).Update(map[string]interface{}{"mtime": time.Now().Unix(), "warehousing_time": warehouse.WarehousingTime, "modifier": warehouse.Modifier, "dealer": warehouse.Dealer, "manufacturer": warehouse.Manufacturer}).Error
+
+}
+
+func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	return list, err
+}
+
+func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	return list, err
+}
+func GetDealerByName(orgid int64, name string) (*models.Dealer, error) {
+	var dealer models.Dealer
+	var err error
+	err = XTReadDB().Model(&dealer).Where("org_id = ? and dealer_name = ? and status = 1", orgid, name).Find(&dealer).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &dealer, nil
+}
+
+func CreateDealer(dealer *models.Dealer) error {
+
+	err := XTWriteDB().Create(&dealer).Error
+	return err
+}
+
+func UpdateDealer(dealer *models.Dealer, orgid int64) error {
+
+	err := XTWriteDB().Model(&dealer).Where("org_id = ? and status  =1", orgid).Updates(map[string]interface{}{"dealer_name": dealer.DealerName}).Error
+	return err
+}
+
+func GetDrugDataConfig(orgid int64, name string) (models.DictDataconfig, error) {
+	dataconfig := models.DictDataconfig{}
+	err := XTReadDB().Where("org_id = ? and name = ?", orgid, name).Find(&dataconfig).Error
+	return dataconfig, err
+}
+
+func GetParentDataConfig(parentid int64, orgid int64) (dataconfig []*models.DictDataconfig, err error) {
+
+	err = XTReadDB().Where("parent_id = ?  and status =1 and (org_id = ? or org_id = 0)", parentid, orgid).Find(&dataconfig).Error
+	return dataconfig, err
+}
+
+func IsExistDicConfig(parentid int64, goodKind string, orgid int64) (*models.DictDataconfig, error) {
+
+	var dataconfig models.DictDataconfig
+	var err error
+	err = XTReadDB().Where("parent_id = ? and status = 1 and name = ? and (org_id = ? or org_id = 0)", parentid, goodKind, orgid).Find(&dataconfig).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &dataconfig, nil
+}
+
+func CreatedDicConfig(dataconfig *models.DictDataconfig) error {
+
+	err := XTWriteDB().Create(&dataconfig).Error
+	return err
+}
+
+func UpdatedDicConfig(parentid int64, dataconfig *models.DictDataconfig, orgid int64, goodKind string) error {
+
+	err := XTWriteDB().Model(&dataconfig).Where("parent_id = ? and org_id = ? and name = ?", parentid, orgid, goodKind).Updates(map[string]interface{}{"name": dataconfig.Name}).Error
+	return err
+}
+
+func GetGoodType(goodName string, orgid int64) (*models.GoodsType, error) {
+
+	var goodType models.GoodsType
+	var err error
+	err = XTReadDB().Where("type_name =? and org_id = ? and status = 1", goodName, orgid).Find(&goodType).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &goodType, nil
+}
+
+func CreatedGoodType(goodsType *models.GoodsType) error {
+
+	err := XTWriteDB().Create(&goodsType).Error
+	return err
+}
+
+func GetAllGoodType(orgid int64) (goodsType []*models.GoodsType, err error) {
+
+	err = XTReadDB().Model(&goodsType).Where("org_id = ? and status = 1", orgid).Find(&goodsType).Error
+	return goodsType, err
+}
+
+func GetDepartMentByName(name string, orgid int64) (*models.XtHisDepartment, error) {
+
+	var department models.XtHisDepartment
+	var err error
+	err = XTReadDB().Where("name= ? and user_org_id = ? and status = 1", name, orgid).Find(&department).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &department, nil
+}
+
+func GetDataConfigIsExist(orgid int64, name string) (models.Dataconfig, error) {
+	dataconfig := models.Dataconfig{}
+	err := XTReadDB().Model(&dataconfig).Where("org_id = ? and name = ? and status = 1", orgid, name).Find(&dataconfig).Error
+	return dataconfig, err
+}
+
+func GetChildeConfigIsExist(parentid int64, name string, orgid int64) (*models.Dataconfig, error) {
+
+	var dataconfig models.Dataconfig
+	var err error
+	err = XTReadDB().Model(&dataconfig).Where("parent_id = ? and (org_id = ? or org_id = 0) and name = ? and status = 1", parentid, orgid, name).Find(&dataconfig).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &dataconfig, nil
+}
+
+func CreateDataConfig(dataconfig *models.Dataconfig) error {
+
+	err := XTWriteDB().Create(&dataconfig).Error
+	return err
+}
+
+func FindAllDataConfigList(orgid int64, parentId int64) (dataconfig []*models.Dataconfig, err error) {
+
+	err = XTReadDB().Model(&dataconfig).Where("(org_id = ? or org_id = 0) and parent_id = ? and status = 1", orgid, parentId).Find(&dataconfig).Error
+	return dataconfig, err
+}