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 = 10028 //机构id
+		subscibe.OrgId = 10721 //机构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 = 10028 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10721 //机构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 = 10028 //机构id小英9675或4
+		subscibe.OrgId = 10721 //机构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 = 10028 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/drug_stock_api_contorller.go

@@ -3391,7 +3391,7 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 		}
 		//查询该仓库是否有默认数据
 		drugStockCount, _ := service.GetNewDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId, tx)
-		fmt.Println("errcode======================", drugStockCount.ID)
+
 		if drugStockCount.ID == 0 {
 			drugStock := models.XtDrugStockCount{
 				UserOrgId:      item.OrgId,
@@ -3420,6 +3420,8 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 		"list": list,
 	})
 
+	return
+
 }
 
 func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {

controllers/patient_api_controller.go

@@ -14,6 +14,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"github.com/astaxie/beego/config"
 	"github.com/jinzhu/gorm"
 	"github.com/mozillazg/go-pinyin"
 
@@ -8661,34 +8662,82 @@ func (this *PatientApiController) GetAutoPatientContent() {
 
 	lastBefor, _ := service.GetPatientLastBefor(patient_id, startTime, endTime, orgId)
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"prescription":                         prescription,
-		"berfor":                               berfor,
-		"monitorList":                          monitorList,
-		"dryweightList":                        dryweightList,
-		"inpectionList":                        inpectionList,
-		"dialysisOrder":                        dialysisOrder,
-		"patient":                              patient,
-		"longAdvice":                           longAdvice,
-		"groupPrescriptionList":                groupPrescriptionList,
-		"after":                                after,
-		"max_blood_flow_volume":                monitor.BloodFlowVolume,
-		"max_befor_systolic_blood_pressure":    maxBeforSystolicBloodPressure.SystolicBloodPressure,
-		"min_befor_systolic_blood_pressure":    minBeforSystolicBloodPressure.SystolicBloodPressure,
-		"max_befor_diastolic_blood_pressure":   maxBeforDiastolicBloodPressure.DiastolicBloodPressure,
-		"min_befor_diastolic_blood_pressure":   minBeforDiastolicBloodPressure.DiastolicBloodPressure,
-		"max_after_systolic_blood_pressure":    maxAfterSystolicBloodPressure.SystolicBloodPressure,
-		"min_after_systolic_blood_pressure":    minAfterSystolicBloodPressure.SystolicBloodPressure,
-		"max_after_diastolic_blood_pressure":   maxAfterDiastolicBloodPressure.DiastolicBloodPressure,
-		"min_after_diastolic_blood_pressure":   minAfterDiastolicBloodPressure.DiastolicBloodPressure,
-		"max_monitor_systolic_blood_pressure":  maxMonitorSystolicBloodPressure.SystolicBloodPressure,
-		"min_monitor_systolic_blood_pressure":  minMonitorSystolicBloodPressure.SystolicBloodPressure,
-		"max_monitor_diastolic_blood_pressure": maxMonitorDiastolicBloodPressure.DiastolicBloodPressure,
-		"min_monitor_diastolic_blood_pressure": minMonitorDiastolicBloodPressure.DiastolicBloodPressure,
-		"lastDryWeight":                        lastDryWeight,
-		"patientVascularAccess":                patientVascularAccess,
-		"lastBefor":                            lastBefor,
-	})
+	_, configs := service.FindXTHisRecordByOrgId(orgId)
+
+	//血透
+	if configs.IsOpen != 1 {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescription":                         prescription,
+			"berfor":                               berfor,
+			"monitorList":                          monitorList,
+			"dryweightList":                        dryweightList,
+			"inpectionList":                        inpectionList,
+			"dialysisOrder":                        dialysisOrder,
+			"patient":                              patient,
+			"longAdvice":                           longAdvice,
+			"groupPrescriptionList":                groupPrescriptionList,
+			"after":                                after,
+			"max_blood_flow_volume":                monitor.BloodFlowVolume,
+			"max_befor_systolic_blood_pressure":    maxBeforSystolicBloodPressure.SystolicBloodPressure,
+			"min_befor_systolic_blood_pressure":    minBeforSystolicBloodPressure.SystolicBloodPressure,
+			"max_befor_diastolic_blood_pressure":   maxBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_befor_diastolic_blood_pressure":   minBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_after_systolic_blood_pressure":    maxAfterSystolicBloodPressure.SystolicBloodPressure,
+			"min_after_systolic_blood_pressure":    minAfterSystolicBloodPressure.SystolicBloodPressure,
+			"max_after_diastolic_blood_pressure":   maxAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_after_diastolic_blood_pressure":   minAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_monitor_systolic_blood_pressure":  maxMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"min_monitor_systolic_blood_pressure":  minMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"max_monitor_diastolic_blood_pressure": maxMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_monitor_diastolic_blood_pressure": minMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"lastDryWeight":                        lastDryWeight,
+			"patientVascularAccess":                patientVascularAccess,
+			"lastBefor":                            lastBefor,
+		})
+	}
+
+	//his
+	if configs.IsOpen == 1 {
+
+		hisadvice, _ := service.GetHisPrecriptionadviceList(orgId, patient_id, startTime, endTime)
+		if len(hisadvice) > 0 {
+			if len(hisadvice) > 0 {
+				for _, item := range hisadvice {
+					baseDrug, _ := service.GetBasedrugByIdOne(item.DrugId, orgId)
+					item.StartTime = item.CreatedTime
+					item.AdviceDesc = baseDrug.Dose + baseDrug.DoseUnit + "*" + config.ToString(baseDrug.MinNumber) + baseDrug.MinUnit + "/" + baseDrug.MaxUnit
+				}
+			}
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescription":                         prescription,
+			"berfor":                               berfor,
+			"monitorList":                          monitorList,
+			"dryweightList":                        dryweightList,
+			"inpectionList":                        inpectionList,
+			"dialysisOrder":                        dialysisOrder,
+			"patient":                              patient,
+			"longAdvice":                           hisadvice,
+			"groupPrescriptionList":                groupPrescriptionList,
+			"after":                                after,
+			"max_blood_flow_volume":                monitor.BloodFlowVolume,
+			"max_befor_systolic_blood_pressure":    maxBeforSystolicBloodPressure.SystolicBloodPressure,
+			"min_befor_systolic_blood_pressure":    minBeforSystolicBloodPressure.SystolicBloodPressure,
+			"max_befor_diastolic_blood_pressure":   maxBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_befor_diastolic_blood_pressure":   minBeforDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_after_systolic_blood_pressure":    maxAfterSystolicBloodPressure.SystolicBloodPressure,
+			"min_after_systolic_blood_pressure":    minAfterSystolicBloodPressure.SystolicBloodPressure,
+			"max_after_diastolic_blood_pressure":   maxAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_after_diastolic_blood_pressure":   minAfterDiastolicBloodPressure.DiastolicBloodPressure,
+			"max_monitor_systolic_blood_pressure":  maxMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"min_monitor_systolic_blood_pressure":  minMonitorSystolicBloodPressure.SystolicBloodPressure,
+			"max_monitor_diastolic_blood_pressure": maxMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"min_monitor_diastolic_blood_pressure": minMonitorDiastolicBloodPressure.DiastolicBloodPressure,
+			"lastDryWeight":                        lastDryWeight,
+			"patientVascularAccess":                patientVascularAccess,
+			"lastBefor":                            lastBefor,
+		})
+	}
 
 }
 
@@ -8888,11 +8937,50 @@ func (this *PatientApiController) GetPatientAdviceList() {
 		endTime = theTime.Unix()
 	}
 
-	advicelist, _ := service.GetPatientAdviceList(patient_id, orgId, startTime, endTime, advice_type)
+	_, configs := service.FindXTHisRecordByOrgId(orgId)
+
+	if configs.IsOpen == 1 {
+
+		if advice_type == 1 {
+			hisLongadvicelist, _ := service.GetHisPrecriptionadviceList(orgId, patient_id, startTime, endTime)
+			if len(hisLongadvicelist) > 0 {
+				for _, item := range hisLongadvicelist {
+					item.StartTime = item.CreatedTime
+					baseDrug, _ := service.GetBasedrugByIdOne(item.DrugId, orgId)
+					item.AdviceDesc = baseDrug.Dose + baseDrug.DoseUnit + "*" + config.ToString(baseDrug.MinNumber) + baseDrug.MinUnit + "/" + baseDrug.MaxUnit
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"advicelist": hisLongadvicelist,
+			})
+			return
+		} else {
+			fmt.Println("hhhhhh")
+			advicelist, _ := service.GetHisadviceList(orgId, patient_id, startTime, endTime)
+			if len(advicelist) > 0 {
+				for _, item := range advicelist {
+					item.StartTime = item.CreatedTime
+					baseDrug, _ := service.GetBasedrugByIdOne(item.DrugId, orgId)
+					item.AdviceDesc = baseDrug.Dose + baseDrug.DoseUnit + "*" + config.ToString(baseDrug.MinNumber) + baseDrug.MinUnit + "/" + baseDrug.MaxUnit
+				}
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"advicelist": advicelist,
+			})
+			return
+		}
+
+	}
+
+	if configs.IsOpen != 1 {
+		advicelist, _ := service.GetPatientAdviceList(patient_id, orgId, startTime, endTime, advice_type)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"advicelist": advicelist,
+		})
+		return
+	}
+	return
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"advicelist": advicelist,
-	})
 }
 
 func (this *PatientApiController) GetPatientInspectionList() {

service/new_stock_service.go

@@ -353,7 +353,6 @@ func GetNewDrugStockCount(storehouse_id int64, drug_id int64, org_id int64, tx *
 			tx.Rollback()
 			return nil, err
 		}
-		return nil, err
 	}
 	return &drugStockCount, nil
 }

service/patient_dataconfig_service.go

@@ -182,3 +182,43 @@ func GetLongDoctorAdvice(org_id int64, patient_id int64, start_time int64, end_t
 
 	return advice, err
 }
+
+func GetHisPrecriptionadviceList(org_id int64, patient_id int64, start_time int64, end_time int64) (advice []*models.HisPrescriptionAdviceTemplate, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status =1")
+	if org_id > 0 {
+		db = db.Where("user_org_id =?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("created_time>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("created_time<=?", end_time)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}
+
+func GetHisadviceList(org_id int64, patient_id int64, start_time int64, end_time int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	db := XTReadDB().Model(&advice).Where("status =1")
+	if org_id > 0 {
+		db = db.Where("user_org_id =?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+	err = db.Find(&advice).Error
+
+	return advice, err
+}

service/user_service.go

@@ -181,7 +181,7 @@ func GetLastData(orgid int64) (models.SgjPatientDryweight, error) {
 
 func UpdateDialysisPrescription(patientid int64, orgid int64, dryweight float64, prescription models.PredialysisEvaluation) error {
 
-	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ? and assessment_date = ?", patientid, orgid, prescription.AssessmentDate).Update(map[string]interface{}{"dry_weight": prescription.DryWeight, "mtime": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&prescription).Where("patient_id = ? AND user_org_id = ? and assessment_date = ?", patientid, orgid, prescription.AssessmentDate).Update(map[string]interface{}{"dry_weight": prescription.DryWeight, "updated_time": time.Now().Unix()}).Error
 	fmt.Println("错误是设么", err)
 	return err
 }

service/warhouse_service.go

@@ -6443,18 +6443,15 @@ func ModifyGoodSumCount(storehouse_id int64, count int64, user_org_id int64, goo
 
 func ModifyNewGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64, tx *gorm.DB) error {
 
-	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
+	err := tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count + ?", count)).Error
 
 	err = tx.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_act_out_count", gorm.Expr("stock_act_out_count + ?", count)).Error
+
+	fmt.Println("err---------------------------", err)
 	if err != nil {
 		tx.Rollback()
 		return err
 	}
-
 	return err
 }
 
@@ -10907,11 +10904,13 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		//更新出库数量
 		ModifyNewGoodSumCount(goods.StorehouseId, goods.Count, goods.OrgId, goods.GoodId, tx)
 
-		if warehouse.StockCount < maxNumber {
-			tx.Rollback()
-			return errors.New("库存数量不足")
-
-		}
+		fmt.Println("warehouse.StockCount----------------", warehouse.StockCount)
+		fmt.Println("warehouse.StockCount----------------", maxNumber)
+		//if warehouse.StockCount < maxNumber {
+		//	tx.Rollback()
+		//	return errors.New("库存数量不足")
+		//
+		//}
 
 		return nil
 	} else {
@@ -10978,6 +10977,8 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		ModifyNewGoodSumCount(goods.StorehouseId, stock_number, goods.OrgId, goods.GoodId, tx)
 
 		goods.Count = deliver_number - stock_number
+
+		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", goods.Count)
 		ConsumablesNewDeliveryThirty(orgID, record_time, goods, warehouseOut, count, creator, tx)
 	}
 	return nil