Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

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

controllers/dialysis_api_controller.go

@@ -530,6 +530,15 @@ func (c *DialysisApiController) PostPrescription() {
 		DialysisDialyszersId:       dialysis_dialyszers_id,
 	}
 
+	if adminUserInfo.CurrentOrgId == 10721 {
+		if prescription.ModeId == 2 {
+			if prescription.ReplacementTotal == 0 {
+				prescription.ReplacementTotal = 15
+			}
+
+		}
+	}
+
 	//长沙南雅医院，自动生成抗凝剂的临时处方
 	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
 		if prescribing_number == 0 {
@@ -882,6 +891,15 @@ func (c *DialysisApiController) PostPrescription() {
 			}
 		}
 
+		if adminUserInfo.CurrentOrgId == 10721 {
+			if prescription.ModeId == 2 {
+				if prescription.ReplacementTotal == 0 {
+					prescription.ReplacementTotal = 15
+				}
+
+			}
+		}
+
 		updateErr := service.UpDateDialysisPrescription(&prescription)
 
 		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {
@@ -1566,6 +1584,15 @@ func (c *DialysisApiController) PostSoulution() {
 		prescription.AdminUserId = adminUserInfo.AdminUser.Id
 	}
 
+	if adminUserInfo.CurrentOrgId == 10721 {
+		if prescription.ModeId == 2 {
+			if prescription.ReplacementTotal == 0 {
+				prescription.ReplacementTotal = 15
+			}
+
+		}
+	}
+
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
 	if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {

controllers/gobal_config_api_controller.go

@@ -2336,8 +2336,9 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 
 	list, err := service.GetSingleOrderDetail(id, orgId)
-	fmt.Println("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH", list)
+
 	drugoutlist, _ := service.GetDrugWarehouseOutDetailNighty(id, orgId)
+
 	dealerList, err := service.GetAllDealerList(orgId)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	drugFlowList, _ := service.GetDrugStockFlowDetail(start_time, orgId)

controllers/his_api_controller.go

@@ -4027,7 +4027,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								if p.PatientId != 30038 {
 
 									//用机构ID区分
-									if adminInfo.CurrentOrgId != 10721 && adminInfo.CurrentOrgId != 10164 {
+									if adminInfo.CurrentOrgId != 9671 && adminInfo.CurrentOrgId != 10164 {
 										if goodOutConfig.IsOpen == 1 {
 											//耗材出库
 											if p.Type == 3 {
@@ -4462,7 +4462,7 @@ func (c *HisApiController) CreateHisPrescription() {
 										}
 									}
 
-									if adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10164 {
+									if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10164 {
 
 										//耗材出库
 										if p.Type == 3 {
@@ -6689,8 +6689,8 @@ func (c *HisApiController) DeletePrescription() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDeletePMedicineWrong)
 		return
 	}
-	//已收费和已发药限制逻辑
 
+	//已收费和已发药限制逻辑
 	if len(projects) > 0 {
 		for _, item := range projects {
 			service.DeletePrintInfo(item.ID) //删除打印信息

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2264,6 +2264,15 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		DialysisStrainerId:         dialysis_strainer_id,
 	}
 
+	if adminUserInfo.Org.Id == 10721 {
+		if prescription.ModeId == 2 {
+			if prescription.ReplacementTotal == 0 {
+				prescription.ReplacementTotal = 15
+			}
+		}
+
+	}
+
 	//查询最近透析准备表里是否存在 透析器 灌流器
 
 	//
@@ -2639,6 +2648,15 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.ID = dialysisPrescription.ID
 
+		if adminUserInfo.Org.Id == 10721 {
+			if prescription.ModeId == 2 {
+				if prescription.ReplacementTotal == 0 {
+					prescription.ReplacementTotal = 15
+				}
+			}
+
+		}
+
 		service.UpDateDialysisPrescription(&prescription)
 
 		//溪康 更改目标超滤量 同步监测里面的超滤量 超滤率 置换量 置换率
@@ -4462,6 +4480,15 @@ func (c *DialysisAPIController) PostSolution() {
 		DialysisStrainerId:         dialysis_strainer_id,
 	}
 
+	if adminUserInfo.Org.Id == 10721 {
+		if prescription.ModeId == 2 {
+			if prescription.ReplacementTotal == 0 {
+				prescription.ReplacementTotal = 15
+			}
+
+		}
+	}
+
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -41,7 +41,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	if len(keywords) > 0 {
 
-		//dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(orgid, keywords, scheduleType, partitionType, page, limit, theTime.Unix())
+		dialysisSchedule, _, _ := service.GetDialysisParametersByKeyword(orgid, keywords, scheduleType, partitionType, page, limit, theTime.Unix())
 		//查询今日排班的病人
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
 		var vlist []interface{}
@@ -58,7 +58,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 			elist = append(elist, dialysis)
 			if err == nil {
 				this.ServeSuccessJSON(map[string]interface{}{
-					//"schedule":     dialysisSchedule,
+					"schedule": dialysisSchedule,
 					//"total":        total,
 					"prescription": vlist,
 					"dialysbefor":  elist,
@@ -70,6 +70,8 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 		}
 	} else {
 		dialysisSchedule, err, total := service.GetDialysisParameter(orgid, theTime.Unix(), scheduleType, partitionType, page, limit)
+
+		fmt.Println("dialysisSchedule------------------------", dialysisSchedule)
 		//查询今日排班的病人
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords, scheduleType, partitionType)
 

service/gobal_config_service.go

@@ -349,9 +349,9 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.batch_number,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater,x.drug_code").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.batch_number,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater,x.drug_code").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Group("x.id").Scan(&drugInfo).Error
 	} else {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.batch_number,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater,x.drug_code").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.batch_number,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater,x.drug_code").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Group("x.id").Scan(&drugInfo).Error
 	}
 
 	return drugInfo, total, err

service/mobile_dialysis_service.go

@@ -2764,7 +2764,7 @@ func GetDialysisPrescribeOne(orgID int64, patientID int64, recordDate int64) (mo
 // 透析方案
 func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (models.DialysisSolution, error) {
 	var record models.DialysisSolution
-	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ? and solution_status=1", patientID, orgID, mode_id).Last(&record).Error
 	return record, err
 }