历史排班

controllers/base_api_controller.go

@@ -73,7 +73,6 @@ func (this *BaseAuthAPIController) Prepare() {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
 		userAdmin.Mobile = "15717313968"
-
 		userAdmin.Id = 1 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
@@ -82,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id
+		subscibe.OrgId = 3877 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,7 +91,7 @@ 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.CurrentOrgId = 3877 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -328,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id小英9675或4
+		subscibe.OrgId = 3877 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,7 +337,7 @@ 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.CurrentOrgId = 3877 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/his_api_controller.go

@@ -3076,20 +3076,20 @@ func (c *HisApiController) CreateHisPrescription() {
 
 							}
 
-							if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10265 {
-
-								if p.Type == 3 {
-									//查询该耗材是否停用
-									goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
-									//表示该耗材已经停用，不能保存
-									if goodInfoSeven.ID == 0 {
-										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-										c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
-										return
-									}
-								}
-
-							}
+							//if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10265 {
+							//
+							//	if p.Type == 3 {
+							//		//查询该耗材是否停用
+							//		goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+							//		//表示该耗材已经停用，不能保存
+							//		if goodInfoSeven.ID == 0 {
+							//			goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+							//			c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+							//			return
+							//		}
+							//	}
+							//
+							//}
 
 							service.CreateHisProjectTwo(&p)
 							//记录日志

controllers/patient_dataconfig_api_controller.go

@@ -1535,6 +1535,8 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 		xuanzhuan_a := dataBody["xuanzhuan_a"].(float64)
 		xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
 
+		img_url := dataBody["img_url"].(string)
+
 		deviceValsualMap := models.XtDeviceValsualMap{
 			ID:             id,
 			PatientId:      patient_id,
@@ -1569,6 +1571,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 			XuanzhuanV:     xuanzhuan_v,
 			ALeft:          left_a,
 			VLeft:          left_v,
+			ImgUrl:         img_url,
 		}
 
 		err = service.CreateDeviceValsualMap(deviceValsualMap)

controllers/sign_api_controller.go

@@ -72,6 +72,7 @@ func SignApiRegistRouters() {
 	beego.Router("/api/device/getenterprisedetail", &SignApiController{}, "Get:GetEnterPriseDetail")
 
 	beego.Router("/api/device/uploadprintorder", &SignApiController{}, "Post:UploadPrintOrder")
+
 }
 
 // 短信服务接口

controllers/verify_login_controller.go

@@ -188,7 +188,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 
 			//查询该机构是否存在医护排班
 			_, errcode := service.GetDoctorScheduleByOrgId(curOrg.Id)
-			fmt.Println("errcode2------------------", errcode)
+
 			//如果没有就插入
 			if errcode == gorm.ErrRecordNotFound {
 				err = service.BatchInsertDoctorSchedule(curOrg.Id)

models/patient_models.go

@@ -2161,6 +2161,7 @@ type XtDeviceValsualMap struct {
 	XuanzhuanV                   float64                         `gorm:"column:xuanzhuan_v" json:"xuanzhuan_v" form:"xuanzhuan_v"`
 	ALeft                        float64                         `gorm:"column:a_left" json:"a_left" form:"a_left"`
 	VLeft                        float64                         `gorm:"column:v_left" json:"v_left" form:"v_left"`
+	ImgUrl                       string                          `gorm:"column:img_url" json:"img_url" form:"img_url"`
 	XtDeviceValsualALeft         []*XtDeviceValsualALeft         `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualALeft"`
 	XtDeviceValsualMapFangxiangA []*XtDeviceValsualMapFangxiangA `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangA"`
 	XtDeviceValsualMapFangxiangV []*XtDeviceValsualMapFangxiangV `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangV"`

service/new_warehouse_service.go

@@ -1520,65 +1520,67 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
-		warehouseOutInfo := &models.DrugWarehouseOutInfo{
-			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseout.ID,
-			Status:                  1,
-			Ctime:                   advice.RecordDate,
-			Mtime:                   time.Now().Unix(),
-			Remark:                  warehouse.Remark,
-			OrgId:                   orgID,
-			Type:                    1,
-			Manufacturer:            warehouse.Manufacturer,
-			Dealer:                  warehouse.Dealer,
-			IsSys:                   1,
-			SysRecordTime:           advice.RecordDate,
-			DrugId:                  advice.DrugId,
-			Number:                  warehouse.Number,
-			BatchNumber:             warehouse.BatchNumber,
-			Price:                   warehouse.RetailPrice,
-			CountUnit:               drup.MinUnit,
-			RetailPrice:             warehouse.RetailPrice,
-			ProductDate:             warehouse.ProductDate,
-			ExpiryDate:              warehouse.ExpiryDate,
-			PatientId:               advice.PatientId,
-			Count:                   deliver_number, //出最小单位
-			WarehouseInfoId:         warehouse.ID,
-			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-			StorehouseId:            storeConfig.DrugStorehouseOut,
-			IsCheck:                 1,
-			OverCount:               sum_count,
-			AdviceId:                advice.ID,
-		}
+		if orgID != 10188 && orgID != 10217 && orgID != 3877 && orgID != 9671 {
+			warehouseOutInfo := &models.DrugWarehouseOutInfo{
+				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+				WarehouseOutId:          warehouseout.ID,
+				Status:                  1,
+				Ctime:                   advice.RecordDate,
+				Mtime:                   time.Now().Unix(),
+				Remark:                  warehouse.Remark,
+				OrgId:                   orgID,
+				Type:                    1,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				IsSys:                   1,
+				SysRecordTime:           advice.RecordDate,
+				DrugId:                  advice.DrugId,
+				Number:                  warehouse.Number,
+				BatchNumber:             warehouse.BatchNumber,
+				Price:                   warehouse.RetailPrice,
+				CountUnit:               drup.MinUnit,
+				RetailPrice:             warehouse.RetailPrice,
+				ProductDate:             warehouse.ProductDate,
+				ExpiryDate:              warehouse.ExpiryDate,
+				PatientId:               advice.PatientId,
+				Count:                   deliver_number, //出最小单位
+				WarehouseInfoId:         warehouse.ID,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            storeConfig.DrugStorehouseOut,
+				IsCheck:                 1,
+				OverCount:               sum_count,
+				AdviceId:                advice.ID,
+			}
 
-		//查询今日该药品该患者是否有出库数据
-		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-		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,
+			//查询今日该药品该患者是否有出库数据
+			lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+			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)
 				}
-				CreateDrugError(drugError)
 			}
-		}
-		if lastDrugOutInfo.ID > 0 {
+			if lastDrugOutInfo.ID > 0 {
 
-			//删除在新增
-			UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
+				//删除在新增
+				UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
 
-			AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+				AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 
+			}
 		}
 
 		var out_count int64
@@ -1602,6 +1604,44 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		fmt.Println("查收嗖嗖嗖哦", deliver_number_one-(out_count-cancel_count))
 		if deliver_number_one-(out_count-cancel_count) >= 0 {
 			if (deliver_number_one - out_count - cancel_count) != 0 {
+
+				if orgID == 10217 || orgID == 10188 || orgID == 3877 || orgID == 9671 {
+					warehouseOutInfo := &models.DrugWarehouseOutInfo{
+						WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+						WarehouseOutId:          warehouseout.ID,
+						Status:                  1,
+						Ctime:                   advice.RecordDate,
+						Mtime:                   time.Now().Unix(),
+						Remark:                  warehouse.Remark,
+						OrgId:                   orgID,
+						Type:                    1,
+						Manufacturer:            warehouse.Manufacturer,
+						Dealer:                  warehouse.Dealer,
+						IsSys:                   1,
+						SysRecordTime:           advice.RecordDate,
+						DrugId:                  advice.DrugId,
+						Number:                  warehouse.Number,
+						BatchNumber:             warehouse.BatchNumber,
+						Price:                   warehouse.RetailPrice,
+						CountUnit:               drup.MinUnit,
+						RetailPrice:             warehouse.RetailPrice,
+						ProductDate:             warehouse.ProductDate,
+						ExpiryDate:              warehouse.ExpiryDate,
+						PatientId:               advice.PatientId,
+						Count:                   deliver_number_one - (out_count - cancel_count), //出最小单位
+						WarehouseInfoId:         warehouse.ID,
+						SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+						StorehouseId:            storeConfig.DrugStorehouseOut,
+						IsCheck:                 1,
+						OverCount:               sum_count,
+						AdviceId:                advice.ID,
+					}
+
+					AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+
+				}
+				lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+
 				drugflow := models.DrugFlow{
 					WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseout.ID,

service/sign_service.go

@@ -1372,3 +1372,12 @@ func CreateNewUploadPact(name string) string {
 	fmt.Println("strwwoowowow", str)
 	return str
 }
+
+func GetDataConfigDisinfectionFluid(org_id int64) (models.Dataconfig, error) {
+
+	dataconfig := models.Dataconfig{}
+
+	err := XTReadDB().Where("org_id = ? and status =1 and id =12536", org_id).Find(&dataconfig).Error
+
+	return dataconfig, err
+}