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 = 10164 //机构id
+		subscibe.OrgId = 10653 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10653 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10164 //机构id小英9675或4
+		subscibe.OrgId = 10653 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10653 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/drug_stock_api_contorller.go

@@ -3787,7 +3787,6 @@ func (c *StockDrugApiController) CheckDrugOut() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	warehousingOutInfoList, _ := service.GetDrugWarehouseOutListById(warehouse_out_id, orgId)
 	drugWarehouseOut, _ := service.GetDrugWarehouseOutByLastId(warehouse_out_id)
-	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
 	for _, it := range warehousingOutInfoList {
 		var total_count int64
@@ -3850,7 +3849,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			out_count_one = it.Count
 		}
 
-		service.AddDrugCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, out_count_one)
+		service.AddDrugCount(it.DrugId, it.OrgId, it.StorehouseId, out_count_one)
 
 	}
 	warehousingOutInfoListThree, _ := service.GetDrugWarehouseOutListById(warehouse_out_id, orgId)
@@ -3861,7 +3860,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		service.AutoDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it, it.CountUnit)
 
 		//查询剩余库存
-		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
+		stockInfo, _ := service.GetDrugAllStockInfo(it.StorehouseId, it.OrgId, it.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
 			if its.MaxUnit == medical.MaxUnit {
@@ -3869,11 +3868,19 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			}
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
-		//更新基础库库存
-		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count, it.OrgId)
-
-		service.UpdateDrugStockCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+		service.UpdateDrugStockCount(it.DrugId, it.OrgId, it.StorehouseId, sum_count)
 
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+		stockInfoOne, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfoOne {
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
+		}
+		//更新基础库库存
+		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count_one, it.OrgId)
 	}
 
 	out := models.DrugWarehouseOut{
@@ -3994,24 +4001,22 @@ func (c *StockDrugApiController) ToReturnCheck() {
 			out_count = item.Count
 		}
 		//增加出库数量
-		service.ReduceDrugCount(item.DrugId, item.OrgId, storeHouseConfig.DrugStorehouseOut, out_count)
+		service.ReduceDrugCount(item.DrugId, item.OrgId, item.StorehouseId, out_count)
 
 		//查询该药品剩余库存
-		infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(item.DrugId, item.OrgId, storeHouseConfig.DrugStorehouseOut)
+		infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(item.DrugId, item.OrgId, item.StorehouseId)
 		var over_count int64
 		for _, its := range infolist {
 			baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
-			fmt.Println("ITS", its.MaxUnit)
-			fmt.Println("itwowoowow", baseDrug.MaxUnit)
+
 			if its.MaxUnit == baseDrug.MaxUnit {
 				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
 			}
-			fmt.Println("its.StockMaxNumber", its.StockMaxNumber)
-			fmt.Println("its.StockMinNumber", its.StockMinNumber)
+
 			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
-		fmt.Println("over_coutnwowowowowo", over_count)
-		service.UpdateDrugStockCount(item.DrugId, item.OrgId, storeHouseConfig.DrugStorehouseOut, over_count)
+
+		service.UpdateDrugStockCount(item.DrugId, item.OrgId, item.StorehouseId, over_count)
 
 	}
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/his_api_controller.go

@@ -1696,6 +1696,10 @@ func (c *HisApiController) GetHisPatientInfo() {
 
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
+
+	beforThrity, _ := service.GetAssessmentBeforThrity(admin.CurrentOrgId, patient_id, recordDateTime)
+
+	LastCaseHistory, _ := service.GetLastHisPatientCaseHistory(admin.CurrentOrgId, patient_id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":     his_patient_info,
 		"xt_info":      xt_patient_info,
@@ -1712,6 +1716,8 @@ func (c *HisApiController) GetHisPatientInfo() {
 		"count":              count,
 		"drugStockConfig":    drugStockConfig,
 		"last_info":          lastPatientPrescriptionInfo,
+		"befor":              beforThrity,
+		"LastCaseHistory":    LastCaseHistory,
 	})
 	return
 
@@ -3423,6 +3429,11 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										}
 
+										fmt.Println("药品名称----------------------", drug.DrugName)
+										fmt.Println("药品名称----------------------", drug.IsUse)
+										fmt.Println("is_user_total-------------------------", is_user_total)
+										fmt.Println("no_user_total-------------------------", no_user_total)
+
 										if is_user_total != no_user_total {
 											//出库
 											if drug.IsUse == 2 {
@@ -3543,9 +3554,9 @@ func (c *HisApiController) CreateHisPrescription() {
 													history_count += prescribingNumberSevenTy
 												}
 
-												//fmt.Println("local_count0000000000000000000000000000000000000000000", local_count)
-												//
-												//fmt.Println("history_count999999999999999999999999999999999999999", history_count)
+												fmt.Println("drug_nam,e---------------", drug.DrugName)
+												fmt.Println("local_count0000000000000000000000000000000000000000000", local_count)
+												fmt.Println("history_count999999999999999999999999999999999999999", history_count)
 
 												//如果当前出库数量大于历史出库数量则需要出库
 												if local_count > history_count {
@@ -3570,6 +3581,12 @@ func (c *HisApiController) CreateHisPrescription() {
 													service.NewHisDrugAutoCancelInfo(s.UserOrgId, creater, newadviceInfo, cha_count, drug, tx)
 												}
 
+												if local_count == history_count {
+													if is_user_total == 0 {
+														service.NewHisDrugsDelivery(s.UserOrgId, creater, newadviceInfo, tx)
+													}
+
+												}
 											}
 
 											//更新字典里面的库存
@@ -3877,6 +3894,33 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 
+											if nowCount == historyCount {
+												if historyCount == 0 {
+													recordDateStr := time.Now().Format("2006-01-02")
+													recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+													nowtime := recordDate.Unix()
+													lastOut, _ := service.FindNewLastPrescriptionWarehouseOut(adminInfo.CurrentOrgId, nowtime, tx)
+													goodObj, _ := service.GetNewGoodInformationByGoodIdThirty(p.ProjectId, tx)
+													houseConfig, _ := service.GetNewAllStoreHouseConfig(p.UserOrgId, tx)
+													creater := c.GetAdminUserInfo().AdminUser.Id
+													dialyPrepareOne := models.DialysisBeforePrepare{
+														GoodTypeId:   goodObj.GoodTypeId,
+														GoodId:       p.ProjectId,
+														PatientId:    p.PatientId,
+														RecordDate:   p.RecordDate,
+														UserOrgId:    adminInfo.CurrentOrgId,
+														Count:        nowCount,
+														Ctime:        time.Now().Unix(),
+														Creater:      creater,
+														Status:       1,
+														StorehouseId: houseConfig.StorehouseOutInfo,
+														ProjectId:    p.ID,
+													}
+													//出库
+													service.ConsumableNewHisPrescriptionDelivery(adminInfo.CurrentOrgId, p.PatientId, p.RecordDate, &dialyPrepareOne, &lastOut, creater, tx)
+												}
+											}
+
 											//lastHisProject, _ := service.GetLastHisProject(p.PatientId, p.UserOrgId, p.RecordDate, tx, p.ProjectId)
 											////查询历史出库数据
 											//flowGood, _ := service.GetStockFlowIsBatchNumberSeventy(p.PatientId, p.RecordDate, p.ProjectId, lastHisProject.ID)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1379,7 +1379,8 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	channels, _ := c.GetInt64("channel", 0)
 	return_blood, _ := c.GetInt64("return_blood", 0)
 	rehydration_volume, _ := c.GetInt64("rehydration_volume", 0)
-	dialysis_during, _ := c.GetInt64("dialysis_during", 0)
+	//dialysis_during, _ := c.GetInt64("dialysis_during", 0)
+	dialysis_during, _ := c.GetFloat("dialysis_during")
 	stroke_volume, _ := c.GetInt64("stroke_volume", 0)
 	blood_flow, _ := c.GetInt64("blood_flow", 0)
 	//sealing_fluid_dispose, _ := c.GetInt64("sealing_fluid_dispose", 0)
@@ -2739,6 +2740,10 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
 	}
 
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10617 {
+		tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume
+	}
+
 	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 9829 {
 		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
@@ -3604,7 +3609,9 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.DialysateTemperature = 36.5
 		}
 
-		err := service.CreateMonitor(&record)
+		if adminUserInfo.Org.Id != 10683 {
+			err = service.CreateMonitor(&record)
+		}
 
 		//记录日志
 		byterequest, _ := json.Marshal(record)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2998,6 +2998,8 @@ func (this *NewDialysisApiController) GetInspectionGroup() {
 
 	if len(inspection) > 0 {
 		for _, item := range inspection {
+			lastInspection, _ := service.GetLastInspectionProject(item.PatientId, org_id, item.ProjectId)
+			item.InspectDate = lastInspection.InspectDate
 			inspecList, _ := service.GetInspectionByProjectId(item.PatientId, org_id, item.ProjectId)
 			item.Count = int64(len(inspecList))
 		}

controllers/self_drug_api_congtroller.go

@@ -4093,7 +4093,7 @@ func (this *SelfDrugApiController) GetDrugFlowDetailById() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, _ := service.GetDrugFlowDetailById(drug_id, orgId)
-	fmt.Println("list====================", list)
+
 	drugMedical, _ := service.GetBaseDrugMedical(drug_id)
 
 	for index, _ := range list {

models/dialysis.go

@@ -631,7 +631,7 @@ type AssessmentAfterDislysis struct {
 	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	ReturnBlood                     int64   `gorm:"column:return_blood" json:"return_blood" form:"return_blood"`
 	RehydrationVolume               int64   `gorm:"column:rehydration_volume" json:"rehydration_volume" form:"rehydration_volume"`
-	DialysisDuring                  int64   `gorm:"column:dialysis_during" json:"dialysis_during" form:"dialysis_during"`
+	DialysisDuring                  float64 `gorm:"column:dialysis_during" json:"dialysis_during" form:"dialysis_during"`
 	StrokeVolume                    int64   `gorm:"column:stroke_volume" json:"stroke_volume" form:"stroke_volume"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`

service/gobal_config_service.go

@@ -314,7 +314,7 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	}
 
 	if len(keyword) > 0 {
-		db = db.Joins("left join sgj_xt.xt_drug_warehouse as o on o.id = x.warehousing_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("s.id")
+		db = db.Joins("left join sgj_xt.xt_drug_warehouse as o on o.id = x.warehousing_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater")
 		db = db.Where("x.warehousing_order like ? or t.drug_name like ? or r.user_name like ? ", likeKey, likeKey, likeKey)
 
 	}

service/his_service.go

@@ -339,6 +339,14 @@ func GetHisPatientCaseHistoryInfo(org_id int64, patient_id int64, record_date in
 	return
 }
 
+func GetLastHisPatientCaseHistory(org_id int64, patient_id int64) (models.HisPatientCaseHistory, error) {
+
+	patientCaseHistory := models.HisPatientCaseHistory{}
+	err := readDb.Where("user_org_id =? and status= 1 and patient_id = ?", org_id, patient_id).Last(&patientCaseHistory).Error
+
+	return patientCaseHistory, err
+}
+
 func GetHisPatientCaseHistoryList(org_id int64, patient_id int64) (caseHistorys []*models.HisPatientCaseHistory, err error) {
 	db := readDb.Model(&models.HisPatientCaseHistory{}).Where("user_org_id = ? AND status = 1  AND his_patient_id = ?", org_id, patient_id)
 	err = db.Find(&caseHistorys).Error

service/inspection_service.go

@@ -368,6 +368,15 @@ func GetInspectionGroup(patient_id int64, org_id int64) (inspection []*models.Ne
 	return inspection, err
 }
 
+func GetLastInspectionProject(patient_id int64, org_id int64, project_id int64) (models.XtInspection, error) {
+
+	inspection := models.XtInspection{}
+
+	err := XTReadDB().Where("patient_id = ? and org_id = ? and project_id = ? and status=1", patient_id, org_id, project_id).Last(&inspection).Error
+
+	return inspection, err
+}
+
 func GetInspectionByProjectId(patient_id int64, org_id int64, project_id int64) (inspection []*models.NewInspection, err error) {
 
 	db := XTReadDB().Table("xt_inspection").Where("status =1")
@@ -382,7 +391,7 @@ func GetInspectionByProjectId(patient_id int64, org_id int64, project_id int64)
 		db = db.Where("project_id = ?", project_id)
 	}
 
-	err = db.Order("inspect_date desc").Group("inspect_date").Scan(&inspection).Error
+	err = db.Order("id asc").Group("inspect_date").Scan(&inspection).Error
 	return inspection, err
 
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -378,7 +378,7 @@ type AssessmentAfterDislysisVM struct {
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
 	ReturnBlood                     int64   `gorm:"column:return_blood" json:"return_blood" form:"return_blood"`
 	RehydrationVolume               int64   `gorm:"column:rehydration_volume" json:"rehydration_volume" form:"rehydration_volume"`
-	DialysisDuring                  int64   `gorm:"column:dialysis_during" json:"dialysis_during" form:"dialysis_during"`
+	DialysisDuring                  float64 `gorm:"column:dialysis_during" json:"dialysis_during" form:"dialysis_during"`
 	StrokeVolume                    int64   `gorm:"column:stroke_volume" json:"stroke_volume" form:"stroke_volume"`
 	BloodFlow                       int64   `gorm:"column:blood_flow" json:"blood_flow" form:"blood_flow"`
 	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`

service/secondary_service.go

@@ -1153,7 +1153,7 @@ func DeleteSecondOrderInfo(id int64) error {
 
 func GetStockFlowOrderList(good_id int64, user_org_id int64) (list []*models.VmStockFlow, err error) {
 
-	err = XTReadDB().Where("good_id = ? and user_org_id =?  and status=1 and ctime>=1711900800", good_id, user_org_id).Order("id asc").Find(&list).Error
+	err = XTReadDB().Where("good_id = ? and user_org_id =?  and status=1", good_id, user_org_id).Order("id asc").Find(&list).Error
 	return list, err
 }
 

service/user_service.go

@@ -4,8 +4,9 @@ import (
 	"XT_New/models"
 
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"time"
+
+	"github.com/jinzhu/gorm"
 )
 
 func GetAdminUserByUserID(userID int64) (*models.AdminUser, error) {
@@ -217,7 +218,7 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 
 func GetDrugFlowDetailById(drug_id int64, org_id int64) (flow []*models.DrugFlow, err error) {
 
-	err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =?", drug_id, org_id).Order("id asc").Find(&flow).Error
+	err = XTReadDB().Model(&flow).Where("drug_id = ? and status =1 and user_org_id =?", drug_id, org_id).Order("ctime asc").Find(&flow).Error
 
 	return flow, err
 }