新功能

controllers/dialysis_api_controller.go

@@ -3303,7 +3303,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 {
+			if templateInfo.TemplateId == 17 && templateInfo.TemplateId == 22 {
 				dewater_amount = dewater_amount * 1000
 			}
 			if dewater_amount <= 0 {
@@ -4858,7 +4858,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 6 || template.TemplateId == 22 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -4885,7 +4885,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume

controllers/dialysis_record_api_controller.go

@@ -741,9 +741,11 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 						}
 						//查出入库记录中最后一条记录
 						stockInInfo, _ := service.FindLastStockInInfoRecord(prescription.Niprocart, adminUserInfo.CurrentOrgId)
+
 						warehouseOutInfo.Price = stockInInfo.Price
 						warehouseOutInfo.GoodId = prescription.Niprocart
 						warehouseOutInfo.GoodTypeId = niprocart
+
 						err := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 
 						if err == nil {
@@ -762,6 +764,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 							service.AddSigleAutoReduceRecordInfo(details)
 						}
 					}
+
 					if prescription.Jms > 0 {
 						warehouseOutInfo := &models.WarehouseOutInfo{
 							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -2155,7 +2158,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 				totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-				if template.TemplateId == 6 || template.TemplateId == 20 {
+				if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 {
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				}
 				// 只针对方济医院

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -111,6 +111,7 @@ func (this *DialysisAPIController) Scheduals() {
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
 
 		var dat []map[string]interface{}
+
 		if err := json.Unmarshal([]byte(scheduals_json_str), &dat); err == nil {
 
 		} else {
@@ -2746,7 +2747,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 { //adminUserInfo.Org.Id == 9538
+			if template.TemplateId == 6 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
@@ -5593,15 +5594,18 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	fristrecord, _ := service.FindFirstMonitorRecordToday(patientID, adminInfo.Org.Id, monitorDate)
 
 	template, _ := service.GetOrgInfoTemplate(adminInfo.Org.Id)
-	fmt.Println("1122233333")
 
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, theAssessmentDateTime, adminInfo.Org.Id)
 	if prescription.ID > 0 {
+		fmt.Println("444444444")
+
 		if prescription.TargetUltrafiltration > 0 && prescription.DialysisDurationHour > 0 {
+			fmt.Println("4444444445555")
 
 			totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
-			if template.TemplateId == 6 {
+			if template.TemplateId == 6 || template.TemplateId == 22 {
+				fmt.Println("12222222")
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -5628,9 +5632,8 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
-			fmt.Println("11222344444444443333")
 			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

@@ -885,9 +885,12 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	dewater_amount = 0
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-		if template.TemplateId == 17 {
+
+		if template.TemplateId == 17 || template.TemplateId == 22 {
 			dewater_amount = dewater_amount * 1000
+
 		}
+
 		if dewater_amount <= 0 {
 			dewater_amount = 0
 		}

controllers/new_mobile_api_controllers/management_analyse_api_controller.go

@@ -82,10 +82,13 @@ func (this *ManagementAnalyseApiController) StatisticsPatientChart() {
 	data, total_one, _ := management_service.GetPatientChartData(adminUserInfo.Org.Id, startTime, endTime, statistics_type)
 	total, _ := management_service.GetLapsetoPatientTotal(adminUserInfo.Org.Id, statistics_type)
 
+	total_three, _ := management_service.GetLapsetoPatientTotal(adminUserInfo.Org.Id, 2)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"chart_data": data,
-		"total_one":  total_one,
-		"total":      total,
+		"chart_data":  data,
+		"total_one":   total_one,
+		"total":       total,
+		"total_three": total + total_three,
 	})
 
 }

routers/router.go

@@ -35,7 +35,7 @@ func init() {
 	controllers.ScheduleApiRegistRouters()
 	controllers.SignWeighAPIControllerRegistRouters()
 	controllers.InvoiceApiRegistRouters()
-	controllers.StockApiRegistRouters()
+	//controllers.StockApiRegistRouters()
 	controllers.StockGoodApiRegistRouters()
 	controllers.StockManagerApiRegistRouters()
 	controllers.PatientScheduleTemplateAPIControllerRegistRouters()

service/management_service/management_analyse_service.go

@@ -17,8 +17,8 @@ func GetPatientChartData(user_org_id int64, start_time int64, end_time int64, st
 		break
 	case 2:
 		//err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
-		//err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
-		err = db.Raw("select from_unixtime(created_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.created_time >=? AND patient.created_time <=? AND patient.status = 1   AND patient.lapseto = 2  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		//err = db.Raw("select from_unixtime(updated_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.updated_time >=? AND patient.updated_time <=? AND patient.status = 1   AND patient.lapseto = 2  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
 
 		break
 	}
@@ -45,9 +45,18 @@ func GetPatientTableData(orgID int64, page, limit, start, end int64, statistics_
 	var err error
 	var patients []*PatientTableStruct
 	readDb := service.XTReadDB()
-	//db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
-	db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.created_time >= ? AND patient.created_time <= ?  ", orgID, statistics_type, start, end)
-	err = db.Order("patient.created_time desc").Scan(&patients).Error
+	if statistics_type == 1 {
+		db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.created_time >= ? AND patient.created_time <= ?  ", orgID, statistics_type, start, end)
+		err = db.Order("patient.created_time desc").Scan(&patients).Error
+
+	} else {
+
+		db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
+		//db := readDb.Raw("select from_unixtime(patient.`updated_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.updated_time >= ? AND patient.updated_time <= ?  ", orgID, statistics_type, start, end)
+		err = db.Group("lapseto.`patient_id`").Order("lapseto.lapseto_time desc").Scan(&patients).Error
+
+	}
+
 	return patients, total, err
 }
 

service/stock_service.go

@@ -1186,7 +1186,7 @@ func FindAllGoodTypeByType(types int64) (goodType []*models.GoodsType, err error
 }
 
 func FindWarehouseInfoByGoodType(good_type_id int64, org_id int64) (info []*models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Preload("GoodInfo", "status = 1 AND org_id = ?", org_id).Where("good_type_id = ? AND status = 1 AND org_id = ?", good_type_id, org_id).Find(&info).Error
+	err = readDb.Model(&models.WarehousingInfo{}).Preload("GoodInfo", " org_id = ? AND good_type_id = ? AND status = 1", org_id, good_type_id).Where(" org_id = ? AND good_type_id = ?  AND status = 1 ", org_id, good_type_id).Find(&info).Error
 	return info, err
 
 }