耗材参数

controllers/dialysis_api_controller.go

@@ -3208,6 +3208,11 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
+			if template.TemplateId == 43 { //adminInfo.CurrentOrgId == 9538
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			// 只针对方济医院
 			if template.TemplateId == 1 && adminInfo.CurrentOrgId != 9849 {
 				value, _ := strconv.ParseFloat(fmt.Sprintf("%.3f", prescription.TargetUltrafiltration/float64(totalMin)*60), 6)
@@ -3227,7 +3232,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 

controllers/dialysis_record_api_controller.go

@@ -570,6 +570,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 // @param nurse:int 上机护士
 // @param bed:int 上机床位号
 func (this *DialysisRecordAPIController) StartDialysis() {
+
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("date")
 	nurseID, _ := this.GetInt64("nurse")
@@ -583,6 +584,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
 	bedID, _ := this.GetInt64("bed")
+
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -737,7 +739,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-
+	fmt.Println("hhaaaaaaa888888888323232323232333232322333323232", adminUserInfo.CurrentOrgId)
 	dialysisRecord = &models.DialysisOrder{
 		DialysisDate:           recordDate.Unix(),
 		UserOrgId:              adminUserInfo.CurrentOrgId,
@@ -803,13 +805,22 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				}
 
 				//针对监利大垸医院
-				if adminUserInfo.CurrentOrgId == 10101 || adminUserInfo.CurrentOrgId == 9671 {
+				if adminUserInfo.CurrentOrgId == 10101 {
 
 					if evaluation.ID > 0 {
 						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 						fmt.Println("ultrafiltration_rate", ultrafiltration_rate)
 					}
 				}
+				fmt.Println("hhh233223323223232332233233223323223323232322332322323", adminUserInfo.CurrentOrgId)
+				//针对肇庆三鹤血液透析中心
+				if adminUserInfo.CurrentOrgId == 10215 || template.TemplateId == 43 {
+
+					if evaluation.ID > 0 {
+						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+						fmt.Println("hhhh2323323223322323323232", ultrafiltration_rate)
+					}
+				}
 			}
 		}
 		record := models.MonitoringRecord{

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -335,7 +335,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1493,7 +1493,7 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
 
 	}
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 9671 {
 		evaluation, _ := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -1916,6 +1916,12 @@ func (this *DialysisAPIController) StartDialysis() {
 			//针对监利大垸医院
 			if template.TemplateId == 41 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
+			}
+
+			//针对肇庆三鹤血液透析中心
+
+			if template.TemplateId == 43 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 				fmt.Println("hhhh232332322323232332", ultrafiltration_rate)
 			}
 
@@ -2476,10 +2482,12 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			if template.TemplateId == 41 {
-				fmt.Println("hhhhhhhhhh", prescription.TargetUltrafiltration)
-				fmt.Println("jj2332323322323", float64(totalMin))
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
-				fmt.Println("ultrafiltration_rate000304293929329238328328328328238328328", ultrafiltration_rate)
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
+			if template.TemplateId == 43 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 		}
@@ -2495,7 +2503,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/mobile_api_controllers/patient_api_controller.go

@@ -972,12 +972,14 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg":    "ok",
-				"advice": advices,
-				"ids":    ids,
-			})
+			for _, item := range advices {
+				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, item.ID)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "1",
+					"advice": advice,
+					"ids":    ids,
+				})
+			}
 
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/self_drug_api_congtroller.go

@@ -2016,7 +2016,7 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 	var minNumber int64
 	for _, item := range list {
 
-		//查询库存信息
+		//查询药品信息
 		drug, _ := service.GetDrugDetailByDrugId(item.DrugId)
 
 		//查询库存
@@ -2115,6 +2115,31 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 			service.CreateDrugWarehouseOutInfo(warehouseOutInfo)
 			service.CreateDrugFlowOne(drugflow)
 
+			//扣减当前批次号的库存
+			var total_count int64
+
+			//查询当前批次库存的数量
+			warehosueInfoList, _ := service.GetCurrentWarehosueInfo(item.WarehouseInfoId)
+			fmt.Println(warehosueInfoList)
+			for _, item := range warehosueInfoList {
+				total_count += item.StockMaxNumber*drug.MinNumber + item.StockMinNumber
+			}
+			//判断当前批次库存 和 需要出库的数据
+			//出库
+			if proof_count <= total_count {
+
+				//var total_count_one int64
+				//获取当前批次号的库存
+				//warehouseinfoOne, _ := service.GetCurrentWarehosueInfoOne(item.WarehouseInfoId)
+				//total_count_one = warehouseinfoOne.StockMaxNumber * drug.MinNumber + warehouseinfoOne.StockMinNumber
+
+			}
+			//报错提示
+			if proof_count > total_count {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
+			}
 		}
 
 		//判断 如果库存数量 小于于盘点库存，则入库
@@ -2198,6 +2223,7 @@ func (this *SelfDrugApiController) SaveDrugCheckInventory() {
 
 			service.CreateDrugWarehouseInfo(warehouseInfo)
 			service.CreateDrugFlowOne(drugflow)
+
 		}
 	}
 	returnData := make(map[string]interface{}, 0)

service/manage_service.go

@@ -730,7 +730,7 @@ func UpdatedZoneID(bedid int64, orgid int64, number *models.DeviceNumber) error
 
 func UpadateForm(id int64, orgid int64, infor *models.DeviceInformation) error {
 
-	err := UserWriteDB().Model(&infor).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"date": infor.Date, "class": infor.Class, "zone": infor.Zone, "bed_number": infor.BedNumber, "contagion": infor.Contagion, "dialysis_mode": infor.DialysisMode, "start_time": infor.StartTime, "end_time": infor.EndTime, "dialysis_hour": infor.DialysisHour, "hyperfiltratio": infor.Hyperfiltratio, "weight_loss": infor.WeightLoss, "warning_value": infor.WarningValue, "user_total": infor.UserTotal, "move": infor.Move, "failure_stage": infor.FailureStage, "fault_description": infor.FaultDescription, "code_information": infor.CodeInformation, "disinfect_type": infor.DisinfectType, "disinfectant_type": infor.DisinfectType, "disinfection": infor.Disinfection, "machine_run": infor.MachineRun, "fluid_path": infor.FluidPath, "disinfectant": infor.Disinfectant, "disinfection_status": infor.DisinfectionStatus, "disinfection_residue": infor.DisinfectionResidue, "long_time": infor.LongTime, "disinfec_startime": infor.DisinfecStartime, "disinfec_endtime": infor.DisinfecEndtime, "dialysis_checked": infor.DialysisChecked, "dialysis_name": infor.DialysisName, "norms": infor.Norms, "dialysis_concentration": infor.DialysisConcentration,
+	err := UserWriteDB().Model(&infor).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"date": infor.Date, "class": infor.Class, "zone": infor.Zone, "bed_number": infor.BedNumber, "contagion": infor.Contagion, "dialysis_mode": infor.DialysisMode, "start_time": infor.StartTime, "end_time": infor.EndTime, "dialysis_hour": infor.DialysisHour, "hyperfiltratio": infor.Hyperfiltratio, "weight_loss": infor.WeightLoss, "warning_value": infor.WarningValue, "user_total": infor.UserTotal, "move": infor.Move, "failure_stage": infor.FailureStage, "fault_description": infor.FaultDescription, "code_information": infor.CodeInformation, "disinfect_type": infor.DisinfectType, "disinfectant_type": infor.DisinfectantType, "disinfection": infor.Disinfection, "machine_run": infor.MachineRun, "fluid_path": infor.FluidPath, "disinfectant": infor.Disinfectant, "disinfection_status": infor.DisinfectionStatus, "disinfection_residue": infor.DisinfectionResidue, "long_time": infor.LongTime, "disinfec_startime": infor.DisinfecStartime, "disinfec_endtime": infor.DisinfecEndtime, "dialysis_checked": infor.DialysisChecked, "dialysis_name": infor.DialysisName, "norms": infor.Norms, "dialysis_concentration": infor.DialysisConcentration,
 		"germ_checked": infor.GermChecked, "germ_name": infor.GermName, "germ_number": infor.GermNumber, "clean": infor.Clean, "sign_name": infor.SignName, "bed": infor.Bed, "patient_id": infor.PatientId, "mtime": time.Now().Unix()}).Error
 	return err
 }

service/patientmanage_service.go

@@ -1626,8 +1626,8 @@ func GetInspectionMajorItem(startime int64, lasttime int64, orgid int64, patient
 
 	db := XTReadDB().Table("xt_inspection")
 
-	err = db.Raw("select * from xt_inspection where id in(select max(id) from xt_inspection where org_id = ? and status = 1 and patient_id = ? and inspect_date>=? and inspect_date<=? group by project_id)", orgid, patientid, lasttime, startime).Scan(&inspection).Error
-
+	//err = db.Raw("select * from xt_inspection where id in(select max(id) from xt_inspection where org_id = ? and status = 1 and patient_id = ? and inspect_date>=? and inspect_date<=? group by project_id)", orgid, patientid, lasttime, startime).Scan(&inspection).Error
+	err = db.Raw("select * from xt_inspection  where org_id = ? and status = 1 and patient_id = ? and inspect_date>=? and inspect_date<=? group by project_id", orgid, patientid, lasttime, startime).Scan(&inspection).Error
 	return inspection, err
 }
 

service/stock_service.go

@@ -4747,3 +4747,16 @@ func GetWarehouseTotal(id int64) (models.WarehousingInfo, error) {
 	err := db.Select("sum(x.stock_count) as stock_count").Scan(&info).Error
 	return info, err
 }
+
+func GetCurrentWarehosueInfo(id int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("id=? or warehousing_info_id = ? ", id, id).Find(&info).Error
+	return info, err
+}
+
+func GetCurrentWarehosueInfoOne(id int64) (models.DrugWarehouseInfo, error) {
+
+	info := models.DrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("id=?", id).Find(&info).Error
+	return info, err
+}