소스 검색

库存调拨修改

28169 2 년 전
부모
커밋
2bd846213f
2개의 변경된 파일16개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 1
      controllers/dialysis_record_api_controller.go
  2. 10 0
      controllers/mobile_api_controllers/dialysis_api_controller.go

+ 6 - 1
controllers/dialysis_record_api_controller.go 파일 보기

@@ -1145,7 +1145,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
1145 1145
 		}
1146 1146
 
1147 1147
 		//只针对广慈医院
1148
-		if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.CurrentOrgId == 9987 || adminUserInfo.CurrentOrgId == 9526 || template.TemplateId == 32 || adminUserInfo.CurrentOrgId == 9918 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 4 {
1148
+		if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.CurrentOrgId == 9987 || adminUserInfo.CurrentOrgId == 9526 || template.TemplateId == 32 || adminUserInfo.CurrentOrgId == 9918 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 4 || adminUserInfo.CurrentOrgId == 10447 {
1149 1149
 			// 查询病人是否有透前评估数据
1150 1150
 			befor, errcode := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
1151 1151
 			//如果有数据就插入
@@ -1370,6 +1370,11 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
1370 1370
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
1371 1371
 		}
1372 1372
 		tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
1373
+
1374
+		//新化博翔
1375
+		if adminUserInfo.CurrentOrgId == 10447 || adminUserInfo.CurrentOrgId == 9675 {
1376
+			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
1377
+		}
1373 1378
 	}
1374 1379
 
1375 1380
 	if adminUserInfo.CurrentOrgId == 9583 {

+ 10 - 0
controllers/mobile_api_controllers/dialysis_api_controller.go 파일 보기

@@ -1891,6 +1891,10 @@ func (c *DialysisAPIController) Finish() {
1891 1891
 		} else {
1892 1892
 			tempassessmentAfterDislysis.ActualDisplacement = endmonitorRecords.DisplacementQuantity
1893 1893
 		}
1894
+		//新化博翔
1895
+		if adminUserInfo.Org.Id == 10447 {
1896
+			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
1897
+		}
1894 1898
 
1895 1899
 	}
1896 1900
 
@@ -2537,6 +2541,12 @@ func (this *DialysisAPIController) StartDialysis() {
2537 2541
 			record.PulseFrequency = befor.PulseFrequency
2538 2542
 			record.BreathingRate = befor.BreathingRate
2539 2543
 		}
2544
+		//新化博翔
2545
+		if adminUserInfo.Org.Id == 10447 {
2546
+			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
2547
+			record.SystolicBloodPressure = befor.SystolicBloodPressure
2548
+			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
2549
+		}
2540 2550
 		err := service.CreateMonitor(&record)
2541 2551
 
2542 2552
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"