2024/6/17

conf/app.conf

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

controllers/base_api_controller.go

@@ -72,10 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
+		userAdmin.Id = 4745
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 1 //4，809
+		userAdmin.Id = 4745 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10702 //机构id
+		subscibe.OrgId = 10495 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244  //4
+		adminUserInfo.CurrentOrgId = 10495 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17513 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -318,10 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 1448
+		userAdmin.Id = 4745
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 1 //4，809
+		userAdmin.Id = 4745 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10702 //机构id小英9675或4
+		subscibe.OrgId = 10495 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244  //4
+		adminUserInfo.CurrentOrgId = 10495 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17513 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/his_api_controller.go

@@ -3180,7 +3180,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3657,24 +3657,26 @@ func (c *HisApiController) CreateHisPrescription() {
 								timeFormat := tempTime.Format("20060102150405")
 								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 
-								if s.ID == 0 {
-									//查询改药品是否已经停用
-									base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+								if s.UserOrgId != 10206 {
+									if s.ID == 0 {
+										//查询改药品是否已经停用
+										base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
 
-									if base.ID > 0 {
-										tx.Rollback()
-										c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
-										return
+										if base.ID > 0 {
+											tx.Rollback()
+											c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+											return
 
-									}
+										}
 
-									drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
+										drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
 
-									if drugMedical.SumCount == 0 {
-										tx.Rollback()
-										c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
-										return
+										if drugMedical.SumCount == 0 {
+											tx.Rollback()
+											c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+											return
 
+										}
 									}
 								}
 
@@ -3774,25 +3776,27 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								}
 
-								if p.Type == 3 {
+								if adminInfo.CurrentOrgId != 10206 {
+									if p.Type == 3 {
+
+										if p.ID == 0 {
+											//查询该耗材是否停用
+											goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+											//表示该耗材已经停用，不能保存
+											if goodInfoSeven.ID == 0 {
+												goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+												return
+											}
 
-									if p.ID == 0 {
-										//查询该耗材是否停用
-										goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
-										//表示该耗材已经停用，不能保存
-										if goodInfoSeven.ID == 0 {
 											goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-											c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
-											return
+											if goodInfoOne.SumCount == 0 {
+												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+												return
+											}
 										}
 
-										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-										if goodInfoOne.SumCount == 0 {
-											c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
-											return
-										}
 									}
-
 								}
 
 								//查询保存耗材出库开关是否打开
@@ -4492,22 +4496,24 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 								}
 
-								if s.ID == 0 {
-									//查询改药品是否已经停用
-									base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+								if adminInfo.CurrentOrgId != 10206 {
+									if s.ID == 0 {
+										//查询改药品是否已经停用
+										base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
 
-									if base.ID > 0 {
-										c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
-										return
+										if base.ID > 0 {
+											c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+											return
 
-									}
+										}
 
-									drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
+										drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
 
-									if drugMedical.SumCount == 0 {
-										c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
-										return
+										if drugMedical.SumCount == 0 {
+											c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+											return
 
+										}
 									}
 								}
 
@@ -4627,24 +4633,26 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								}
 
-								if p.Type == 3 {
-									if p.ID == 0 {
-										//查询该耗材是否停用
-										goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
-										//表示该耗材已经停用，不能保存
-										if goodInfoSeven.ID == 0 {
+								if adminInfo.CurrentOrgId != 10206 {
+									if p.Type == 3 {
+										if p.ID == 0 {
+											//查询该耗材是否停用
+											goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+											//表示该耗材已经停用，不能保存
+											if goodInfoSeven.ID == 0 {
+												goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+												return
+											}
+
 											goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-											c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
-											return
+											if goodInfoOne.SumCount == 0 {
+												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+												return
+											}
 										}
 
-										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-										if goodInfoOne.SumCount == 0 {
-											c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
-											return
-										}
 									}
-
 								}
 
 								service.CreateHisProjectTwo(&p)
@@ -5424,9 +5432,9 @@ func (c *HisApiController) CreateHisPrescription() {
 
 									var out_count int64
 									out_count = in_count - total_count
-
-									fmt.Println("in_count------------------", in_count)
-									fmt.Println("total_count------------------", total_count)
+									//
+									//fmt.Println("in_count------------------", in_count)
+									//fmt.Println("total_count------------------", total_count)
 									//添加出库数量
 									service.AddSelfDrugCount(item.DrugId, item.UserOrgId, patient_id, out_count, tx)