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

controllers/dialysis_api_controller.go

@@ -2839,7 +2839,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10731 || adminUserInfo.CurrentOrgId == 10727 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
@@ -2940,6 +2940,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.PrescriptionWater = dewater_amount
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+				newprescribe.Amylaceum = dialysisSolution.Amylaceum
 				newprescribe.Status = 1
 
 				if adminUserInfo.CurrentOrgId == 10579 {
@@ -3013,6 +3014,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
 					newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 					newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
+					newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
 					newprescribe.CreatedTime = time.Now().Unix()
 					newprescribe.UpdatedTime = time.Now().Unix()
 					newprescribe.RecordDate = recordDate.Unix()
@@ -3301,6 +3303,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.PrescriptionWater = dewater_amount
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
+			newprescribe.Amylaceum = dialysisSolution.Amylaceum
 			newprescribe.Status = 1
 			if adminUserInfo.CurrentOrgId == 10579 {
 				newprescribe.Modifier = 0
@@ -3379,6 +3382,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.DialysisStrainer = lastDialysisPrescribe.DialysisStrainer
 				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 				newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
+				newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
 				newprescribe.Status = 1
 				if adminUserInfo.CurrentOrgId == 10579 {
 					newprescribe.Modifier = 0

controllers/doctor_schedule_api_controller.go

@@ -430,12 +430,37 @@ func (this *DoctorScheduleApiController) CopyStaffSchedule() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	start_time, _ := this.GetInt64("start_time")
-	fmt.Println("start_time", start_time)
+
 	end_time, _ := this.GetInt64("end_time")
-	fmt.Println("end_time", end_time)
+
 	copy_startime, _ := this.GetInt64("copy_startime")
-	fmt.Println("copy_startime", copy_startime)
+
 	copy_endtime, _ := this.GetInt64("copy_endtime")
+
+	remark := this.GetString("remark")
+
+	if len(remark) > 0 {
+		scheduleRemark, _ := service.GetStaffScheduleRemark(orgId, copy_startime, copy_endtime)
+
+		remark := models.XtStaffScheduleRemark{
+			ID:        scheduleRemark.ID,
+			StartTime: copy_startime,
+			EndTime:   copy_endtime,
+			Remark:    remark,
+			UserOrgId: orgId,
+			Status:    1,
+			Ctime:     0,
+			Mtime:     0,
+		}
+
+		if scheduleRemark.ID == 0 {
+			service.CreateStaffScheduleRemark(remark)
+		}
+
+		if scheduleRemark.ID > 0 {
+			service.SaveStaffScheduleRemarkOne(remark)
+		}
+	}
 	schedule, err := service.GetStaffScheduleListTwo(orgId, start_time, end_time)
 	//查询选中日期的排班是否存在
 	_, errcode := service.GetNextWeekSchedule(orgId, copy_startime, copy_endtime)
@@ -477,6 +502,7 @@ func (this *DoctorScheduleApiController) CopyStaffSchedule() {
 				Status:       1,
 				Ctime:        time.Now().Unix(),
 				ScheduleDate: item.ScheduleDate,
+				Remark:       item.Remark,
 			}
 			service.AddSchedule(&staffSchedule)
 		}

controllers/his_api_controller.go

@@ -3390,7 +3390,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -7068,6 +7068,7 @@ func (c *HisApiController) DeletePrescription() {
 									ExpireDate:              it.ExpiryDate,
 									StorehouseId:            houseConfig.StorehouseOutInfo,
 									OverCount:               flush_count_one,
+									OperateTime:             time.Now().Unix(),
 								}
 								service.CreateStockFlowOne(flow)
 
@@ -7701,8 +7702,6 @@ func (c *HisApiController) DeleteProject() {
 					//查询已出库数量
 					dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
 
-					//fmt.Println("aiwohonguo --------------------", prescribingNumber)
-					//fmt.Println("aiwohonguo --------------------", dialysisInfo.Count)
 					if prescribingNumber < dialysisInfo.Count {
 						//改变数量
 						service.UpdateAutoGood(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id, prescribingNumber)

controllers/inspection_api_controller.go

@@ -42,6 +42,10 @@ func InspectionApiRegistRouters() {
 
 	beego.Router("/api/editpatientnewinspection", &InspectionApiController{}, "Post:EditPatientNewInspection")
 
+	beego.Router("/api/getinspecitonbypatientgroup", &InspectionApiController{}, "Get:GetInpsectionByPatientGroup")
+
+	beego.Router("/api/getinspectionchildlist", &InspectionApiController{}, "Get:GetInspectionChildList")
+
 }
 func (c *InspectionApiController) SetInspectionRemind() {
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
@@ -1140,3 +1144,58 @@ func (c *InspectionApiController) EditPatientNewInspection() {
 
 	fmt.Println("id------------------------------", id)
 }
+
+func (c *InspectionApiController) GetInpsectionByPatientGroup() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	org_id := c.GetAdminUserInfo().CurrentOrgId
+
+	//patient, _ := service.GetPatientDetailTwo(patient_id)
+	inspection, _ := service.GetInspectionGroup(patient_id, org_id)
+
+	if len(inspection) > 0 {
+		for _, item := range inspection {
+			lastInspection, _ := service.GetLastInspectionProject(patient_id, org_id, item.ProjectId)
+			item.InspectDate = lastInspection.InspectDate
+			inspecList, _ := service.GetInspectionByProjectId(patient_id, org_id, item.ProjectId)
+			item.Count = int64(len(inspecList))
+		}
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"inspection": inspection,
+	})
+}
+
+func (c *InspectionApiController) GetInspectionChildList() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	project_id, _ := c.GetInt64("project_id")
+
+	org_id := c.GetAdminUserInfo().CurrentOrgId
+
+	//patient, _ := service.GetPatientDetailTwo(patient_id)
+
+	referenceList, _ := service.GetInSpctionRerefce(project_id, org_id)
+
+	inspection, _ := service.GetInspectionGroupByRecordDate(patient_id, project_id, org_id)
+
+	if len(inspection) > 0 {
+		for _, item := range inspection {
+			inspeclist, _ := service.GetInspectionByProject(patient_id, project_id, org_id, item.InspectDate)
+			for _, it := range inspeclist {
+				item.Child = append(item.Child, it)
+			}
+		}
+	}
+
+	patients, _ := service.GetPatientByIDOne(org_id, patient_id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"inspection":    inspection,
+		"patients":      patients,
+		"referenceList": referenceList,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -319,7 +319,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	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 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 10537 || adminUserInfo.Org.Id == 10667 || adminUserInfo.Org.Id == 10723 {
+	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 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10471 || adminUserInfo.Org.Id == 10537 || adminUserInfo.Org.Id == 10667 || adminUserInfo.Org.Id == 10723 || adminUserInfo.Org.Id == 10731 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}
@@ -437,6 +437,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.Chaptalization = dialysisSolution.Chaptalization
 			newprescribe.PrescribingNumber = 1
 			newprescribe.BloodAccessPartId = dialysisSolution.BloodAccessPartId
+			newprescribe.Amylaceum = dialysisSolution.Amylaceum
 			newprescribe.Status = 1
 			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 && adminUserInfo.Org.Id != 10016 {
 				newprescribe.Remark = dialysisSolution.Remark
@@ -587,6 +588,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.BodyFluidOther = lastDialysisPrescribe.BodyFluidOther
 				newprescribe.TargetKtv = lastDialysisPrescribe.TargetKtv
 				newprescribe.BloodAccessPartId = lastDialysisPrescribe.BloodAccessPartId
+				newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
 				newprescribe.CreatedTime = time.Now().Unix()
 				newprescribe.UpdatedTime = time.Now().Unix()
 				newprescribe.RecordDate = theAssessmentDateTime
@@ -713,6 +715,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.BloodAccessPartId = lastDialysisPrescribe.BloodAccessPartId
 				newprescribe.Status = 1
+				newprescribe.Amylaceum = lastDialysisPrescribe.Amylaceum
 				newprescribe.PrescribingNumber = 1
 
 				if adminUserInfo.Org.Id == 10340 {
@@ -954,6 +957,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10721 {
 					evaluation.Temperature = 36.5
 				}
+				if adminUserInfo.Org.Id == 10702 {
+					evaluation.PulseFrequency = 0
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()
@@ -974,6 +980,14 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			service.UpdateMobileGetDialysisPrescribeOne(lastDialysisPrescription.ID, dewater_amount)
 		}
 
+		//针对古镇乐生
+		if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10731 {
+
+			dewater_amount = (evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight) * 1000
+			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+			service.UpdateMobileGetDialysisPrescribeOne(lastDialysisPrescription.ID, dewater_amount)
+		}
+
 		err := service.UpadatePredialysisEvaluation(&evaluation)
 
 		//记录日志

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3011,7 +3011,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -3937,6 +3937,14 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			}
 
+			if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10731 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				ultrafiltration_rate = ultrafiltration_rate
+
+				ultrafiltration_rate_one = strconv.FormatFloat(ultrafiltration_rate, 'f', -1, 64)
+
+			}
+
 			if adminUserInfo.Org.Id == 10694 || adminUserInfo.Org.Id == 10697 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate
@@ -3972,6 +3980,21 @@ func (this *DialysisAPIController) StartDialysis() {
 				}
 			}
 
+			if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10731 || adminUserInfo.Org.Id == 10727 {
+				if prescription.ModeId == 2 {
+					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+					if totalMin == 0 {
+						totalMin = 240
+					}
+					if prescription.DisplaceLiquiValue == 0 {
+						prescription.ReplacementTotal = 32
+					}
+
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
+			}
+
 		}
 	}
 
@@ -5076,7 +5099,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 20 || template.TemplateId == 22 {
+			if template.TemplateId == 20 || template.TemplateId == 22 || adminInfo.Org.Id == 10731 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -5153,6 +5176,13 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 || adminInfo.Org.Id == 10679 {
 				record.UltrafiltrationRate = 0
 			}
+
+			if adminInfo.Org.Id == 10727 || adminInfo.Org.Id == 10731 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+				record.UltrafiltrationRate = ultrafiltration_rate / 1000
+
+				fmt.Println("record.UltrafiltrationRate ------------------------", record.UltrafiltrationRate)
+			}
 			//if template.TemplateId == 47 {
 			//	ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 			//	record.UltrafiltrationRate = ultrafiltration_rate
@@ -5226,7 +5256,16 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = 0
 	}
 
-	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 {
+	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10164 || adminInfo.Org.Id == 10731 {
+		if ultrafiltration_rate > 0 {
+			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+			record.UltrafiltrationVolume = ultrafiltration_volume / 1000
+		}
+
+	}
+
+	//古镇乐生
+	if adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10727 {
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume / 1000
@@ -5240,7 +5279,6 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 		replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*60) / 1000
 
-		fmt.Println("replacement_rate--------------------------", replacement_rate)
 		record.ReplacementRate = replacement_rate
 
 		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
@@ -5249,6 +5287,27 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	}
 
+	if adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10727 {
+
+		var replacement_rate float64
+		var displacement_quantity float64
+
+		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
+		if totalMin == 0 {
+			totalMin = 240
+		}
+		if prescription.DisplaceLiquiValue == 0 {
+			prescription.ReplacementTotal = 32
+		}
+
+		//乘10 除10是为了保留一位小数
+		replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+
+		fmt.Println(math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600))
+		displacement_quantity = math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * replacement_rate
+		record.DisplacementQuantity = displacement_quantity
+	}
+
 	lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -12393,3 +12452,29 @@ func (c *DialysisAPIController) SaveLongAdviceTemplate() {
 		"advice": newAdvices,
 	})
 }
+
+func (c *DialysisAPIController) StopLongAdvice() {
+
+	stop_time := c.GetString("execution_time")
+	id, _ := c.GetInt64("id")
+	if len(stop_time) <= 0 {
+		utils.ErrorLog("stop_time")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	timeLayout2 := "2006-01-02 15:04:05"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, errs := time.ParseInLocation(timeLayout2, stop_time, loc)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	advice, _ := service.StopLongAdvice(id, theTime.Unix())
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"advice": advice,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -231,4 +231,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/updateeditdrugorder", &DialysisAPIController{}, "Post:UpdateEditDrugOrder")
 
 	beego.Router("/m/api/savelongadvicetemplate", &DialysisAPIController{}, "Post:SaveLongAdviceTemplate")
+
+	beego.Router("/m/api/stoplongadvice", &DialysisAPIController{}, "Get:StopLongAdvice")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1375,7 +1375,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1391,7 +1391,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								}
 								if prescribing_number_total > total {
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1418,7 +1418,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											//查询今日是否出库
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 												}
 
@@ -1428,7 +1428,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										if pharmacyConfig.IsOpen != 1 {
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 												}
 
@@ -1455,7 +1455,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
-											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 											}
 
@@ -1479,7 +1479,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										service.CreateDrugError(drugError)
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
-											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 											}
 
@@ -1558,7 +1558,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1572,7 +1572,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 								if prescribing_number_total > total {
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1591,7 +1591,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 
@@ -1601,7 +1601,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 
@@ -3494,6 +3494,10 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 		}
 
+		if adminUserInfo.Org.Id == 10727 {
+			dewater_amount = dewater_amount * 1000
+		}
+
 		if dewater_amount <= 0 {
 			dewater_amount = 0
 		}
@@ -4226,6 +4230,27 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 	}
 
+	//古镇乐生
+	if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10731 {
+		if evaluation.ID == 0 {
+			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				dewater_amount = dewater_amount * 1000
+				service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
+			}
+		}
+
+		if evaluation.ID > 0 {
+			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				dewater_amount = dewater_amount * 1000
+				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
+			}
+		}
+	}
+
 	if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10164 {
 
 		prescription, _ := service.GetTodayPrescription(id, adminUserInfo.Org.Id, theAssessmentDateTime)
@@ -5706,6 +5731,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 				advice.PrescribingNumber = cnt
 				advice.PrescribingNumberUnit = item.Unit
 				advice.AdviceDoctor = item.Doctor
+				advice.Remark = item.Remark
 				if item.Type == 3 {
 					advice.AdviceName = item.GoodInfo.GoodName
 					advice.PrescribingNumberUnit = item.GoodInfo.PackingUnit

controllers/patient_api_controller.go

@@ -162,6 +162,12 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/getpatientlapeso", &DialysisApiController{}, "Get:GetPatientLapseList")
 
+	beego.Router("/api/patient/adddeathsummary", &DialysisApiController{}, "Post:AddDeathSummary")
+
+	beego.Router("/api/patient/getpatientdeathsummary", &DialysisApiController{}, "Get:GetPatientDeathSummary")
+
+	beego.Router("/api/patient/deletepatientdeathsummary", &DialysisApiController{}, "Get:DeletePatientDeathSummary")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -297,13 +303,25 @@ func (c *PatientApiController) GetPatientsAllList() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 
-	patients, total, _ := service.GetAllPatientList(adminUserInfo.CurrentOrgId)
+	if adminUserInfo.CurrentOrgId != 10702 {
+		patients, total, _ := service.GetAllPatientList(adminUserInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients":    patients,
+			"patientsOne": patients,
+			"total":       total,
+		})
+		return
+	} else {
+		patients, total, _ := service.GetAllPatientListOne(adminUserInfo.CurrentOrgId)
+		patientsOne, total, _ := service.GetAllPatientList(adminUserInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"patients":    patients,
+			"patientsOne": patientsOne,
+			"total":       total,
+		})
+		return
+	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"patients": patients,
-		"total":    total,
-	})
-	return
 }
 
 // GenerateDialysisNo 生成透析号
@@ -7626,6 +7644,8 @@ func (c *PatientApiController) SavePatientLapse() {
 
 	end_time_one := dataBody["end_time_one"].(string)
 
+	is_check := int64(dataBody["is_check"].(float64))
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var recordDate int64
@@ -7711,9 +7731,11 @@ func (c *PatientApiController) SavePatientLapse() {
 
 		service.UpdatePatientLapsetoByPatientId(patient_id, recordDate, lapse_reason)
 
-		service.UpdateScheduleByDeathTime(patient_id, recordDate)
+		if is_check == 2 {
+			service.UpdateScheduleByDeathTime(patient_id, recordDate)
+			service.UpdateScheduleItemByPatientId(patient_id)
+		}
 
-		service.UpdateScheduleItemByPatientId(patient_id)
 	}
 
 	//病人转出
@@ -7721,9 +7743,11 @@ func (c *PatientApiController) SavePatientLapse() {
 
 		service.UpdatePatientLapsetoByPatientIdOne(patient_id, recordDate, lapse_reason)
 
-		service.UpdateScheduleByDeathTime(patient_id, recordDate)
+		if is_check == 2 {
+			service.UpdateScheduleByDeathTime(patient_id, recordDate)
+			service.UpdateScheduleItemByPatientId(patient_id)
+		}
 
-		service.UpdateScheduleItemByPatientId(patient_id)
 	}
 
 	if lapse_type == 11 {
@@ -8024,3 +8048,114 @@ func (c *DialysisApiController) GetPatientLapseList() {
 	//
 	//}
 }
+
+func (c *DialysisApiController) AddDeathSummary() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+
+	id := int64(dataBody["id"].(float64))
+
+	patient_id := int64(dataBody["patient_id"].(float64))
+
+	record_date := dataBody["record_date"].(string)
+
+	last_record_date := dataBody["last_record_date"].(string)
+
+	reason_one := dataBody["reason_one"].(string)
+
+	reason_two := dataBody["reason_two"].(string)
+
+	reason_three := dataBody["reason_three"].(string)
+
+	reason_four := dataBody["reason_four"].(string)
+
+	death_way := dataBody["death_way"].(string)
+
+	replace_way := dataBody["replace_way"].(string)
+
+	replace_reason := dataBody["replace_reason"].(string)
+
+	transplant := dataBody["transplant"].(string)
+
+	remark := dataBody["remark"].(string)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
+
+	var lastRecordDate int64
+	if len(last_record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", last_record_date+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		lastRecordDate = theTime.Unix()
+	}
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	admin_user_id := c.GetAdminUserInfo().AdminUser.Id
+
+	deathSummary := models.XtDeathSummary{
+		ID:             id,
+		PatientId:      patient_id,
+		UserOrgId:      orgId,
+		RecordDate:     recordDate,
+		ReasonOne:      reason_one,
+		ReasonTwo:      reason_two,
+		ReasonThree:    reason_three,
+		ReasonFour:     reason_four,
+		DeathWay:       death_way,
+		ReplaceWay:     replace_way,
+		ReplaceReason:  replace_reason,
+		Transplant:     transplant,
+		Ctime:          time.Now().Unix(),
+		Remark:         remark,
+		Mtime:          time.Now().Unix(),
+		Status:         1,
+		AdminUserId:    admin_user_id,
+		UpdateCreater:  admin_user_id,
+		LastRecordDate: lastRecordDate,
+	}
+
+	service.CreateDeathSummary(deathSummary)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"deathSummary": deathSummary,
+	})
+}
+
+func (c *DialysisApiController) GetPatientDeathSummary() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	deathSummary, _ := service.GetPatientDeathSummary(patient_id, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"deathSummary": deathSummary,
+	})
+}
+
+func (c *DialysisApiController) DeletePatientDeathSummary() {
+
+	id, _ := c.GetInt64("id")
+
+	service.DeletePatientDeathSummary(id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "删除成功",
+	})
+}

controllers/patient_dataconfig_api_controller.go

@@ -198,37 +198,31 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 	guominyaowu_desc := this.GetString("guominyaowu_desc")
 	doctor_id, _ := this.GetInt64("doctor_id")
 
-	//if patientID <= 0 || len(content) == 0 {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	if len(record_time_str) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time_str+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
 
 	if len(record_time_str) == 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	record_date := strings.Split(record_time_str, " ")
-
-	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
-	checkDate_two, _ := utils.ParseTimeStringToTime("2006-01-02", record_date[0])
 
 	adminUserInfo := this.GetAdminUserInfo()
-	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	//if getPatientErr != nil {
-	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//} else if patient == nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-	//	return
-	//}
 
 	now := time.Now().Unix()
 	record := models.XtPatientSickHistory{
 		OrgId:                   adminUserInfo.CurrentOrgId,
 		PatientId:               patientID,
 		Recorder:                adminUserInfo.AdminUser.Id,
-		RecordTime:              checkDate.Unix(),
+		RecordTime:              recordDate,
 		Content:                 content,
 		Status:                  1,
 		Title:                   title,
@@ -239,7 +233,7 @@ func (this *PatientDataConfigAPIController) CreateSickHistory() {
 		Ctime:                   now,
 		Mtime:                   now,
 		DoctorId:                doctor_id,
-		RecordDate:              checkDate_two.Unix(),
+		RecordDate:              recordDate,
 	}
 
 	createErr := service.CreatePatientSickHistory(&record)
@@ -304,24 +298,19 @@ func (this *PatientDataConfigAPIController) ModifySickHistory() {
 	guominyaowu_desc := this.GetString("guominyaowu_desc")
 	doctor_id, _ := this.GetInt64("doctor_id")
 
-	if patientID <= 0 || len(content) == 0 || id == 0 || len(record_time_str) == 0 {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
-
 	adminUserInfo := this.GetAdminUserInfo()
-	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	//if getPatientErr != nil {
-	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//} else if patient == nil {
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-	//	return
-	//}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDate int64
+	if len(record_time_str) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time_str+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDate = theTime.Unix()
+	}
 
 	now := time.Now().Unix()
 
@@ -335,7 +324,7 @@ func (this *PatientDataConfigAPIController) ModifySickHistory() {
 		Ctime:                   now,
 		Mtime:                   now,
 		Title:                   title,
-		RecordTime:              checkDate.Unix(),
+		RecordTime:              recordDate,
 		IsShenyizhiHistory:      is_shenyizhishi,
 		IsFumoDialysisHistory:   is_fumotouxishi,
 		HypersusceptibilityDesc: guominyaowu_desc,
@@ -866,15 +855,6 @@ func (this *PatientDataConfigAPIController) DeleteCourse() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
 
 	recordIDStrs := strings.Split(idsStr, ",")
 	recordIDs := make([]int64, 0, len(recordIDStrs))

models/patient_models.go

@@ -2803,3 +2803,30 @@ func (XtPatientLaspseRecord) TableName() string {
 
 	return "xt_patient_laspse_record"
 }
+
+type XtDeathSummary struct {
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId      int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate     int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ReasonOne      string `gorm:"column:reason_one" json:"reason_one" form:"reason_one"`
+	ReasonTwo      string `gorm:"column:reason_two" json:"reason_two" form:"reason_two"`
+	ReasonThree    string `gorm:"column:reason_three" json:"reason_three" form:"reason_three"`
+	ReasonFour     string `gorm:"column:reason_four" json:"reason_four" form:"reason_four"`
+	DeathWay       string `gorm:"column:death_way" json:"death_way" form:"death_way"`
+	ReplaceWay     string `gorm:"column:replace_way" json:"replace_way" form:"replace_way"`
+	ReplaceReason  string `gorm:"column:replace_reason" json:"replace_reason" form:"replace_reason"`
+	Transplant     string `gorm:"column:transplant" json:"transplant" form:"transplant"`
+	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Remark         string `gorm:"column:remark" json:"remark" form:"remark"`
+	Mtime          int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	AdminUserId    int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	UpdateCreater  int64  `gorm:"column:update_creater" json:"update_creater" form:"update_creater"`
+	LastRecordDate int64  `gorm:"column:last_record_date" json:"last_record_date" form:"last_record_date"`
+}
+
+func (XtDeathSummary) TableName() string {
+
+	return "xt_death_summary"
+}

service/dialysis_service.go

@@ -2726,3 +2726,11 @@ func ModifyPatientDisplacementQuantity(id int64, displacement_quantity float64)
 	err := XTWriteDB().Model(&models.MonitoringRecord{}).Where("id = ? and status=1", id).Updates(map[string]interface{}{"displacement_quantity": displacement_quantity}).Error
 	return err
 }
+
+func StopLongAdvice(id int64, stop_time int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id=? and status=1", id).Updates(map[string]interface{}{"stop_time": stop_time, "stop_state": 1, "updated_time": time.Now().Unix()}).Error
+
+	return advice, err
+}

service/patient_service.go

@@ -110,6 +110,14 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 	return
 }
 
+func GetAllPatientListOne(orgID int64) (patients []*models.Patients, total int64, err error) {
+
+	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1 and p.lapseto =1", orgID)
+
+	err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.age,p.id_card_no").Count(&total).Find(&patients).Error
+	return
+}
+
 func GetAllPatientListTwenty(orgID int64) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1 and p.lapseto = 1", orgID)
@@ -4359,3 +4367,28 @@ func GetDialysisPrescribeOneList(patient_id int64, record_date int64, user_org_i
 
 	return prescription, err
 }
+
+func CreateDeathSummary(summary models.XtDeathSummary) error {
+
+	err := XTWriteDB().Save(&summary).Error
+
+	return err
+}
+
+func GetPatientDeathSummary(patient_id int64, user_org_id int64) (models.XtDeathSummary, error) {
+
+	deathSummary := models.XtDeathSummary{}
+
+	err := XTReadDB().Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Find(&deathSummary).Error
+
+	return deathSummary, err
+}
+
+func DeletePatientDeathSummary(id int64) error {
+
+	summary := models.XtDeathSummary{}
+
+	err := XTWriteDB().Model(&summary).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}