XMLWAN 3 år sedan
förälder
incheckning
78af36374c

+ 1 - 1
conf/app.conf Visa fil

@@ -1,5 +1,5 @@
1 1
 appname = 血透
2
-httpport = 9531
2
+httpport = 9529
3 3
 runmode = dev
4 4
 
5 5
 #

+ 2 - 2
controllers/dialysis_record_api_controller.go Visa fil

@@ -228,8 +228,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
228 228
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
229 229
 		return
230 230
 	}
231
-	//dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
232
-	dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolutionOne(adminInfo.CurrentOrgId, schedual.ModeId)
231
+	dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
232
+	//dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolutionOne(adminInfo.CurrentOrgId, schedual.ModeId)
233 233
 
234 234
 	if getDialysisSolutionErr != nil {
235 235
 		this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)

+ 1 - 1
controllers/mobile_api_controllers/check_weight_api_controller.go Visa fil

@@ -335,7 +335,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
335 335
 
336 336
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
337 337
 
338
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 {
338
+	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 {
339 339
 		dewater_amount = dewater_amount * 1000
340 340
 	}
341 341
 

+ 2 - 2
controllers/mobile_api_controllers/mobile_api_router_register.go Visa fil

@@ -140,9 +140,9 @@ func MobileAPIControllersRegisterRouters() {
140 140
 	beego.Router("/m/api/getmobileprintstockgood", &DialysisAPIController{}, "Get:GetMobilePrintStockGood")
141 141
 
142 142
 	//批量删除监测
143
-	beego.Router("/m/api/batchDeleteMonitor", &DialysisAPIController{}, "Get:BatchDeleteMonitor")
143
+	//beego.Router("/m/api/batchDeleteMonitor", &DialysisAPIController{}, "Get:BatchDeleteMonitor")
144 144
 	//获取单个患者1年的透析日期
145
-	beego.Router("/m/api/getPatientDialysisRecord", &DialysisAPIController{}, "Get:GetPatientDialysisRecordList")
145
+	//beego.Router("/m/api/getPatientDialysisRecord", &DialysisAPIController{}, "Get:GetPatientDialysisRecordList")
146 146
 	//批量删除医嘱
147 147
 	//beego.Router("/m/api/batchDeleteAdvice", &DialysisAPIController{}, "Get:BathDeleteAdviceList:")
148 148
 }

+ 1 - 1
controllers/mobile_api_controllers/patient_api_controller.go Visa fil

@@ -1545,7 +1545,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
1545 1545
 	if evaluation.DryWeight > 0 {
1546 1546
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
1547 1547
 
1548
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 {
1548
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 {
1549 1549
 			dewater_amount = dewater_amount * 1000
1550 1550
 
1551 1551
 		}

+ 1 - 1
service/his_project_service.go Visa fil

@@ -308,7 +308,7 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
308 308
 		db = db.Where("x.user_org_id = ?", orgid)
309 309
 	}
310 310
 	db = db.Preload("HisOrder", "status = 1 AND user_org_id = ?", orgid)
311
-	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.is_return,x.doctor,x.ctime,x.social_type,x.phone").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
311
+	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.is_return,x.doctor,x.ctime,x.social_type,x.phone,x.status").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
312 312
 	return hisPatient, total, err
313 313
 }
314 314