历史排班

controllers/dialysis_api_controller.go

@@ -2596,7 +2596,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				//lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribe(adminUserInfo.Org.Id, id,schedual.ModeId)
 				// 获取透析模版
 				dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
-				dialysisSolution, _ = service.MobileGetDialysisSolution(adminUserInfo.CurrentOrgId, patient)
+				// 获取透析模版
+				dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
 
 				if dialysisPrescribe == nil && dialysisSolution != nil {
 					mode_id = dialysisSolution.ModeId
@@ -2650,7 +2651,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
 				newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
 				newprescribe.TargetKtv = dialysisSolution.TargetKtv
-
+				newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
+				newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+				newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 				newprescribe.CreatedTime = time.Now().Unix()
 				newprescribe.UpdatedTime = time.Now().Unix()
 				newprescribe.RecordDate = recordDate.Unix()
@@ -2722,6 +2725,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.DialyzerPerfusionApparatus = lastDialysisPrescribe.DialyzerPerfusionApparatus
 					newprescribe.BodyFluidOther = lastDialysisPrescribe.BodyFluidOther
 					newprescribe.TargetKtv = lastDialysisPrescribe.TargetKtv
+					newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
+					newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
+					newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 					newprescribe.CreatedTime = time.Now().Unix()
 					newprescribe.UpdatedTime = time.Now().Unix()
 					newprescribe.RecordDate = recordDate.Unix()
@@ -2953,7 +2959,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
 			newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
 			newprescribe.TargetKtv = dialysisSolution.TargetKtv
-
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
+			newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+			newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 			newprescribe.CreatedTime = time.Now().Unix()
 			newprescribe.UpdatedTime = time.Now().Unix()
 			newprescribe.RecordDate = recordDate.Unix()
@@ -3030,6 +3038,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+				newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
+				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
+				newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2702,6 +2702,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.Status = 1
 		newprescribe.DialysisDialyszers = dialysisSolution.DialysisDialyszers
 		newprescribe.DialysisIrrigation = dialysisSolution.DialysisIrrigation
+		newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 		newprescribe.Remark = lastDialysisPrescription.Remark
 		newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 
@@ -2864,6 +2865,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 			newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 			newprescribe.Remark = lastDialysisPrescription.Remark
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
@@ -3018,6 +3020,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 			newprescribe.DialysisDialyszers = system_dialysisPrescribe.DialysisDialyszers
 			newprescribe.DialysisIrrigation = system_dialysisPrescribe.DialysisIrrigation
+			newprescribe.DialysisStrainer = dialysisSolution.DialysisStrainer
 			newprescribe.Remark = lastDialysisPrescription.Remark
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)

service/mobile_dialysis_service.go

@@ -2321,7 +2321,7 @@ func MobileGetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDry
 // 透析方案
 func MobileGetDialysisSolutionByModeIdSix(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
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil