2024/6/17

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id
+		subscibe.OrgId = 10702 //机构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 = 9671 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244 //4
+		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id小英9675或4
+		subscibe.OrgId = 10702 //机构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 = 9671 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3244 //4
+		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3244  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -3173,6 +3173,28 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			}
 		}
 
+		//针对孝昌康桥超滤率计算问题
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 {
+			if assessmentBeforeDislysis.ID == 0 {
+				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
+					dewater_amount = assessmentBeforeDislysis.WeightBefore - assessmentBeforeDislysis.DryWeight - assessmentBeforeDislysis.AdditionalWeight
+
+					service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
+				}
+			}
+
+			if assessmentBeforeDislysis.ID > 0 {
+				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
+					dewater_amount = assessmentBeforeDislysis.WeightBefore - assessmentBeforeDislysis.DryWeight - assessmentBeforeDislysis.AdditionalWeight
+
+					service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
+				}
+			}
+
+		}
+
 		err := service.UpadatePredialysisEvaluation(&assessmentBeforeDislysis)
 
 		//创建步骤表

controllers/his_api_controller.go

@@ -3657,23 +3657,49 @@ func (c *HisApiController) CreateHisPrescription() {
 								timeFormat := tempTime.Format("20060102150405")
 								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 
-								//查询改药品是否已经停用
-								base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+								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)
 
+									if drugMedical.SumCount == 0 {
+										tx.Rollback()
+										c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+										return
+
+									}
 								}
 
-								drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
+								//赤峰
+								if adminInfo.CurrentOrgId == 10265 {
 
-								if drugMedical.SumCount == 0 {
-									tx.Rollback()
-									c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
-									return
+									drug, _ := service.FindNewBaseDrugLibRecord(adminInfo.CurrentOrgId, s.DrugId, tx)
+
+									info, _ := service.FindNewLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut, tx)
 
+									if info.RetailPrice > 0 {
+										if s.DeliveryWay == "口服" {
+											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+												s.Price = drug.RetailPrice
+											}
+											if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+												s.Price = info.RetailPrice
+											}
+
+											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+												s.Price = info.RetailPrice
+											}
+										}
+
+									}
 								}
 
 								service.CreateHisDoctorAdviceOne(&s, tx)
@@ -3749,19 +3775,22 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 
 								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
-									}
 
-									goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
-									if goodInfoOne.SumCount == 0 {
-										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
+										}
+
+										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+										if goodInfoOne.SumCount == 0 {
+											c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+											return
+										}
 									}
 
 								}
@@ -4463,21 +4492,43 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 								}
 
-								//查询改药品是否已经停用
-								base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)
+								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
+
+									}
+								}
+
+								//赤峰
+								if s.UserOrgId == 10265 {
+									drug, _ := service.GetDrugByGoodId(s.DrugId)
+									info, _ := service.GetWarehoseInfoByDrugId(s.DrugId, s.UserOrgId)
+									if info.RetailPrice > 0 {
+										if s.DeliveryWay == "口服" {
+											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+												s.Price = drug.RetailPrice
+											}
+											if s.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+												s.Price = info.RetailPrice
+											}
 
+											if s.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+												s.Price = info.RetailPrice
+											}
+										}
+									}
 								}
 
 								service.CreateHisDoctorAdvice(&s)
@@ -4577,20 +4628,23 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 
 								if p.Type == 3 {
-									//查询该耗材是否停用
-									goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
-									//表示该耗材已经停用，不能保存
-									if goodInfoSeven.ID == 0 {
+									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)

controllers/inspection_api_controller.go

@@ -1,16 +1,17 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
 	"strconv"
 	"strings"
 	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
 )
 
 type InspectionApiController struct {
@@ -34,6 +35,8 @@ func InspectionApiRegistRouters() {
 
 	beego.Router("/api/patient/inspection_remind/set", &InspectionApiController{}, "Get:SetInspectionRemind")
 
+	beego.Router("/api/getnewinspectionList", &InspectionApiController{}, "Get:GetNewInspectionList")
+
 }
 func (c *InspectionApiController) SetInspectionRemind() {
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
@@ -866,6 +869,7 @@ func (c *InspectionApiController) GetPatientInspections() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	inspections, total, dateTime, err := service.GetPatientInspections(adminUserInfo.CurrentOrgId, patient, projectId, page)
+
 	fmt.Println("inspections", inspections)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1073,3 +1077,23 @@ func (c *InspectionApiController) GetInitInsepction() {
 	return
 
 }
+
+func (c *InspectionApiController) GetNewInspectionList() {
+
+	patient, _ := c.GetInt64("patient")
+
+	project_id, _ := c.GetInt64("project_id")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	inspection, _ := service.GetNewInspectionList(patient, project_id, orgId)
+
+	inspectionGroup, _ := service.GetNewGroupInspectionList(patient, project_id, orgId)
+
+	inspectionInspectDateGroup, _ := service.GetNewGroupInspectionInspectionList(patient, project_id, orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"inspectionGroup": inspectionGroup,
+		"inspection":      inspection,
+		"list":            inspectionInspectDateGroup,
+	})
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3974,6 +3974,26 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 	}
 
+	//针对孝昌康桥超滤率计算问题
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 {
+		if evaluation.ID == 0 {
+			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
+			}
+		}
+
+		if evaluation.ID > 0 {
+			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
+			}
+		}
+
+	}
+
 	err = service.UpadatePredialysisEvaluation(&evaluation)
 
 	//记录日志

routers/router.go

@@ -11,7 +11,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		//AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com", "https://mobile.kuyicloud.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com", "https://mobile.kuyicloud.com", ""},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission", "KyToken"},

service/inspection_service.go

@@ -415,3 +415,23 @@ func GetInspectionByProject(patient_id int64, project_id int64, org_id int64, re
 
 	return inspection, err
 }
+
+func GetNewInspectionList(patient_id int64, project_id int64, user_org_id int64) (inspection []*models.Inspection, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ?", patient_id, project_id, user_org_id).Find(&inspection).Error
+
+	return inspection, err
+}
+
+func GetNewGroupInspectionList(patient_id int64, project_id int64, user_org_id int64) (inspection []*models.Inspection, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ?", patient_id, project_id, user_org_id).Group("item_id").Find(&inspection).Error
+
+	return inspection, err
+}
+
+func GetNewGroupInspectionInspectionList(patient_id int64, project_id int64, user_org_id int64) (inspection []*models.Inspection, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ?", patient_id, project_id, user_org_id).Group("inspect_date").Order("inspect_date asc").Find(&inspection).Error
+	return inspection, err
+}

service/mobile_dialysis_service.go

@@ -1264,6 +1264,25 @@ func MobileGetDialysisPrescribe(orgID int64, patientID int64, recordDate int64)
 	return &record, nil
 }
 
+func MobileGetDialysisPrescribeOne(orgID int64, patientID int64, recordDate int64) (models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+	err = readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).Find(&record).Error
+
+	return record, nil
+}
+
+func UpdateMobileGetDialysisPrescribe(id int64, dewater_amount float64) error {
+
+	err := XTWriteDB().Model(&models.DialysisPrescription{}).Where("id=? and status=1", id).Updates(map[string]interface{}{"target_ultrafiltration": dewater_amount, "prescription_water": dewater_amount}).Error
+	return err
+}
+
+func UpdateMobileGetDialysisPrescribeOne(id int64, dewater_amount float64) error {
+
+	err := XTWriteDB().Model(&models.DialysisPrescription{}).Where("id=? and status=1", id).Updates(map[string]interface{}{"target_ultrafiltration": dewater_amount}).Error
+	return err
+}
+
 func MobileGetDialysisSchedual(orgID int64, patientID int64, scheduleDate int64) (*models.XtSchedule, error) {
 	var schedule models.XtSchedule
 	err := readDb.Model(&models.XtSchedule{}).Where("patient_id = ? and user_org_id = ? and status = 1 and schedule_date = ?", patientID, orgID, scheduleDate).First(&schedule).Error