历史排班

controllers/common_api_controller.go

@@ -735,8 +735,11 @@ func (this *CommonApiController) GetDialysislist() {
 	dialysislist, total, err := service.GetDialysisList(statime, entime, page, limit, orgId)
 	prescriptionList, _ := service.GetAllDialysisList(statime, entime, orgId)
 	list, totallist, _ := service.GetDialysisPatientList(statime, entime, page, limit, orgId)
-	//获取每个病人每个透析模式的数据
+	//获取每个病人每个透析模式的数据（按透析记录）
 	modeIdCount, parseDateErr := service.GetModeIdCount(statime, entime, orgId, page, 1000)
+
+	//按排班
+	scheduleCount, _ := service.GetScheduleModeIdCount(statime, entime, orgId, page, 1000)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -749,6 +752,7 @@ func (this *CommonApiController) GetDialysislist() {
 		"prescriptionList": prescriptionList,
 		"count":            count,
 		"modeIdCount":      modeIdCount,
+		"scheduleCount":    scheduleCount,
 	})
 }
 

controllers/dialysis_api_controller.go

@@ -637,7 +637,7 @@ func (c *DialysisApiController) PostPrescription() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 1)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -649,6 +649,22 @@ func (c *DialysisApiController) PostPrescription() {
 
 		err := service.AddSigleRecord(&prescription)
 
+		//记录日志
+		byterequest, _ := json.Marshal(prescription)
+		dialysisPrescriptionLog := models.XtDialysisPrescriptionLog{
+
+			UserOrgId:   adminUserInfo.CurrentOrgId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			RecordDate:  prescription.RecordDate,
+			PatientId:   prescription.PatientId,
+			Source:      "电脑端新建处方",
+			Status:      1,
+		}
+		service.CreatePrescriptionLog(dialysisPrescriptionLog)
+
 		//创建步骤表
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
@@ -759,7 +775,7 @@ func (c *DialysisApiController) PostPrescription() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 1)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -771,6 +787,22 @@ func (c *DialysisApiController) PostPrescription() {
 
 		updateErr := service.UpDateDialysisPrescription(&prescription)
 
+		//记录日志
+		byterequest, _ := json.Marshal(prescription)
+		dialysisPrescriptionLog := models.XtDialysisPrescriptionLog{
+
+			UserOrgId:   adminUserInfo.CurrentOrgId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			RecordDate:  prescription.RecordDate,
+			PatientId:   prescription.PatientId,
+			Source:      "电脑端修改处方",
+			Status:      1,
+		}
+		service.CreatePrescriptionLog(dialysisPrescriptionLog)
+
 		//创建步骤表
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
@@ -1013,7 +1045,7 @@ func (c *DialysisApiController) PostSoulution() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 1)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1357,6 +1389,22 @@ func (c *DialysisApiController) PostSoulution() {
 
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
+	//记录日志
+	byterequest, _ := json.Marshal(prescription)
+	dialysisPrescriptionLog := models.XtDialysisPrescriptionLog{
+
+		UserOrgId:   adminUserInfo.CurrentOrgId,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		ErrLog:      string(byterequest),
+		AdminUserId: adminUserInfo.AdminUser.Id,
+		RecordDate:  prescription.RecordDate,
+		PatientId:   prescription.PatientId,
+		Source:      "电脑端新增长期处方",
+		Status:      1,
+	}
+	service.CreatePrescriptionLog(dialysisPrescriptionLog)
+
 	//创建步骤表
 	finishOne := models.XtDialysisFinish{
 		IsFinish:   1,
@@ -1630,7 +1678,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId, 5)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1681,7 +1729,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId, 5)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1836,7 +1884,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId, 2)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1906,7 +1954,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId, 2)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2084,7 +2132,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 9)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2094,7 +2142,20 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 			}
 		}
 		err = service.UpdateAssessmentAfterDislysisRecord(&assessment)
-
+		//记录日志
+		byterequest, _ := json.Marshal(assessment)
+		afterDialysisLog := models.XtAssessmentAfterDialysisLog{
+			UserOrgId:   assessment.UserOrgId,
+			PatientId:   assessment.PatientId,
+			RecordDate:  assessment.AssessmentDate,
+			Status:      1,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "电脑端保存透后评估",
+		}
+		service.CreateAfterDialysisLog(afterDialysisLog)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
 		//清空key 值
@@ -2118,6 +2179,20 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 		assessment.AssessmentDate = recordDate.Unix()
 
 		err = service.AddSigleAssessmentAfterDislysisRecord(&assessment)
+		//记录日志
+		byterequest, _ := json.Marshal(assessment)
+		afterDialysisLog := models.XtAssessmentAfterDialysisLog{
+			UserOrgId:   assessment.UserOrgId,
+			PatientId:   assessment.PatientId,
+			RecordDate:  assessment.AssessmentDate,
+			Status:      1,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "电脑端修改保存透后评估",
+		}
+		service.CreateAfterDialysisLog(afterDialysisLog)
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.CurrentOrgId,
@@ -2380,7 +2455,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 3)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2391,6 +2466,20 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
+		//记录日志
+		byterequest, _ := json.Marshal(assessmentBeforeDislysis)
+		beforeDislysisLog := models.XtAssessmentBeforeDislysisLog{
+			UserOrgId:   assessmentBeforeDislysis.UserOrgId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			ErrLog:      string(byterequest),
+			PatientId:   assessmentBeforeDislysis.PatientId,
+			RecordDate:  assessmentBeforeDislysis.AssessmentDate,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Status:      1,
+			Source:      "电脑端保存透前评估",
+		}
+		service.CreateBeforLog(beforeDislysisLog)
 		//创建步骤表
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
@@ -2506,6 +2595,21 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
+
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "电脑端透前评估保存",
+					Status:      1,
+				}
+				service.CreatePrescriptionLog(prescriptionLog)
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -2564,6 +2668,20 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 
 					err := service.AddSigleRecord(&newprescribe)
+					//记录日志
+					byterequest, _ := json.Marshal(newprescribe)
+					prescriptionLog := models.XtDialysisPrescriptionLog{
+						UserOrgId:   newprescribe.UserOrgId,
+						Ctime:       time.Now().Unix(),
+						Mtime:       0,
+						ErrLog:      string(byterequest),
+						AdminUserId: adminUserInfo.AdminUser.Id,
+						RecordDate:  newprescribe.RecordDate,
+						PatientId:   newprescribe.PatientId,
+						Source:      "电脑端透前评估保存",
+						Status:      1,
+					}
+					service.CreatePrescriptionLog(prescriptionLog)
 					key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 					redis := service.RedisClient()
 					defer redis.Close()
@@ -2593,6 +2711,20 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.Modifier = adminUserInfo.AdminUser.Id
 
 					err := service.AddSigleRecord(&newprescribe)
+					//记录日志
+					byterequest, _ := json.Marshal(newprescribe)
+					prescriptionLog := models.XtDialysisPrescriptionLog{
+						UserOrgId:   newprescribe.UserOrgId,
+						Ctime:       time.Now().Unix(),
+						Mtime:       0,
+						ErrLog:      string(byterequest),
+						AdminUserId: adminUserInfo.AdminUser.Id,
+						RecordDate:  newprescribe.RecordDate,
+						PatientId:   newprescribe.PatientId,
+						Source:      "电脑端透前评估保存",
+						Status:      1,
+					}
+					service.CreatePrescriptionLog(prescriptionLog)
 					key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 					redis := service.RedisClient()
 					defer redis.Close()
@@ -2763,6 +2895,20 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.Status = 1
 
 			err := service.AddSigleRecord(&newprescribe)
+			//记录日志
+			byterequest, _ := json.Marshal(newprescribe)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   newprescribe.UserOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  newprescribe.RecordDate,
+				PatientId:   newprescribe.PatientId,
+				Source:      "电脑端透前评估保存",
+				Status:      1,
+			}
+			service.CreatePrescriptionLog(prescriptionLog)
 			if err != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}
@@ -2819,7 +2965,20 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
-
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "电脑端透前评估保存",
+					Status:      1,
+				}
+				service.CreatePrescriptionLog(prescriptionLog)
 				key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
 				defer redis.Close()
@@ -2846,6 +3005,20 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "电脑端透前评估保存",
+					Status:      1,
+				}
+				service.CreatePrescriptionLog(prescriptionLog)
 				key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
 				defer redis.Close()
@@ -2877,7 +3050,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 3)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2999,7 +3172,7 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 10)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3069,7 +3242,7 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, 10)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3617,7 +3790,7 @@ func (this *DialysisApiController) DelMonitor() {
 
 		if cha_time >= monitor.MonitoringDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patientID, monitor.MonitoringDate, adminInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, monitor.MonitoringDate, adminInfo.CurrentOrgId, 7)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3629,6 +3802,22 @@ func (this *DialysisApiController) DelMonitor() {
 
 	err := service.DisableMonitor(adminInfo.CurrentOrgId, patientID, recordID, adminInfo.AdminUser.Id)
 
+	//记录日志
+	byterequest, _ := json.Marshal(monitor)
+	monitorRecordLog := models.XtMonitorRecordLog{
+		RecordDate:  monitor.MonitoringDate,
+		PatientId:   monitor.PatientId,
+		Module:      3,
+		AdminUserId: adminInfo.AdminUser.Id,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Status:      1,
+		UserOrgId:   monitor.UserOrgId,
+		ErrLog:      string(byterequest),
+		Source:      "电脑端删除监测",
+	}
+	service.CreateMonitorRecordLog(monitorRecordLog)
+
 	key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":monitor_records"
 	redis := service.RedisClient()
 	//清空key 值
@@ -3764,7 +3953,7 @@ func (c *DialysisApiController) CreateMonitor() {
 
 		if cha_time >= monitoring_date {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient, monitoring_date, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, monitoring_date, adminUserInfo.CurrentOrgId, 7)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -4903,6 +5092,24 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
 
+	for _, item := range advices {
+		//记录日志
+		byterequest, _ := json.Marshal(item)
+		adviceLog := models.XtDoctorAdviceLog{
+			UserOrgId:   item.UserOrgId,
+			PatientId:   item.PatientId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Module:      1,
+			ErrLog:      string(byterequest),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "电脑端医嘱推送",
+			RecordDate:  item.AdviceDate,
+		}
+		service.CreateDoctorAdviceLog(adviceLog)
+	}
+
 	//创建步骤表
 	finish := models.XtDialysisFinish{
 		IsFinish:   1,

controllers/dialysis_record_api_controller.go

@@ -649,7 +649,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
 		if cha_time >= scheduleDate && infor.WeekDay != 0 {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patientID, scheduleDate, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, scheduleDate, adminUserInfo.CurrentOrgId, 7)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -717,6 +717,22 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			Dicarbonate:                 monitorParam.Dicarbonate,
 		}
 		createErr := service.CreateMonitor(&monitor)
+
+		//记录日志
+		byterequest, _ := json.Marshal(monitor)
+		monitorRecordLog := models.XtMonitorRecordLog{
+			RecordDate:  monitor.MonitoringDate,
+			PatientId:   monitor.PatientId,
+			Module:      1,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Status:      1,
+			UserOrgId:   monitor.UserOrgId,
+			ErrLog:      string(byterequest),
+			Source:      "电脑端新增监测",
+		}
+		service.CreateMonitorRecordLog(monitorRecordLog)
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.CurrentOrgId,
@@ -819,6 +835,21 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.ReplacementSpeed = monitorParam.ReplacementSpeed
 		monitor.Dicarbonate = monitorParam.Dicarbonate
 		updateErr := service.UpdateMonitor(monitor)
+		//记录日志
+		byterequest, _ := json.Marshal(monitor)
+		monitorRecordLog := models.XtMonitorRecordLog{
+			RecordDate:  monitor.MonitoringDate,
+			PatientId:   monitor.PatientId,
+			Module:      1,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Status:      1,
+			UserOrgId:   monitor.UserOrgId,
+			ErrLog:      string(byterequest),
+			Source:      "电脑端修改监测",
+		}
+		service.CreateMonitorRecordLog(monitorRecordLog)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()
 		defer redis.Close()
@@ -1066,7 +1097,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, 6)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1310,6 +1341,22 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 			err := service.CreateMonitor(&record)
 
+			//记录日志
+			byterequest, _ := json.Marshal(record)
+			monitorRecordLog := models.XtMonitorRecordLog{
+				RecordDate:  record.MonitoringDate,
+				PatientId:   record.PatientId,
+				Module:      1,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Status:      1,
+				UserOrgId:   record.UserOrgId,
+				ErrLog:      string(byterequest),
+				Source:      "电脑端执行上机新建监测",
+			}
+			service.CreateMonitorRecordLog(monitorRecordLog)
+
 			finish := models.XtDialysisFinish{
 				IsFinish:   1,
 				UserOrgId:  adminUserInfo.CurrentOrgId,
@@ -1717,7 +1764,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.CurrentOrgId, 8)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1978,7 +2025,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 
 		if cha_time >= tempDialysisRecord.DialysisDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecord.PatientId, tempDialysisRecord.DialysisDate, adminUserInfo.CurrentOrgId, 6)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2136,7 +2183,7 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 
 		if cha_time >= tempDialysisRecords.DialysisDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecords.PatientId, tempDialysisRecords.DialysisDate, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecords.PatientId, tempDialysisRecords.DialysisDate, adminUserInfo.CurrentOrgId, 6)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)

controllers/his_api_controller.go

@@ -2204,8 +2204,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 											pharmacyConfig, _ := service.FindPharmacyConfig(adminInfo.CurrentOrgId)
-											fmt.Println("device_number2333233232323222323232323323322332", device_number)
-											fmt.Println("number_count99999999999999999999999999999999999", number_count)
+
 											if pharmacyConfig.IsOpen != 1 {
 												if device_number != number_count {
 
@@ -2987,6 +2986,22 @@ func (c *HisApiController) CreateHisPrescription() {
 
 							service.CreateHisDoctorAdvice(&s)
 
+							//记录日志
+							byterequest, _ := json.Marshal(s)
+							adviceLog := models.XtDoctorAdviceLog{
+								UserOrgId:   s.UserOrgId,
+								PatientId:   s.PatientId,
+								AdminUserId: adminInfo.AdminUser.Id,
+								Module:      1,
+								ErrLog:      string(byterequest),
+								Status:      1,
+								Ctime:       time.Now().Unix(),
+								Mtime:       0,
+								Source:      "电脑端新建his医嘱",
+								RecordDate:  s.AdviceDate,
+							}
+							service.CreateDoctorAdviceLog(adviceLog)
+
 							//存储切片中
 							adviceList = append(adviceList, s)
 
@@ -3058,6 +3073,22 @@ func (c *HisApiController) CreateHisPrescription() {
 							}
 
 							service.CreateHisProjectTwo(&p)
+							//记录日志
+							byterequest, _ := json.Marshal(p)
+							adviceLog := models.XtDoctorAdviceLog{
+								UserOrgId:   p.UserOrgId,
+								PatientId:   p.PatientId,
+								AdminUserId: adminInfo.AdminUser.Id,
+								Module:      1,
+								ErrLog:      string(byterequest),
+								Status:      1,
+								Ctime:       time.Now().Unix(),
+								Mtime:       0,
+								Source:      "电脑端新建his项目",
+								RecordDate:  p.RecordDate,
+							}
+							service.CreateDoctorAdviceLog(adviceLog)
+
 							projectList = append(projectList, p)
 							var randNum int
 							randNum = rand.Intn(10000) + 1000
@@ -3629,6 +3660,21 @@ func (c *HisApiController) EditHisPrescription() {
 								return
 							}
 							service.CreateHisDoctorAdvice(&s)
+							//记录日志
+							byterequest, _ := json.Marshal(s)
+							adviceLog := models.XtDoctorAdviceLog{
+								UserOrgId:   s.UserOrgId,
+								PatientId:   s.PatientId,
+								AdminUserId: adminInfo.AdminUser.Id,
+								Module:      1,
+								ErrLog:      string(byterequest),
+								Status:      1,
+								Ctime:       time.Now().Unix(),
+								Mtime:       0,
+								Source:      "电脑端his医嘱修改",
+								RecordDate:  s.AdviceDate,
+							}
+							service.CreateDoctorAdviceLog(adviceLog)
 							redis := service.RedisClient()
 							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 							redis.Set(key, "", time.Second)
@@ -3662,6 +3708,21 @@ func (c *HisApiController) EditHisPrescription() {
 							}
 							service.CreateHisProjectTwo(&p)
 
+							//记录日志
+							byterequest, _ := json.Marshal(p)
+							adviceLog := models.XtDoctorAdviceLog{
+								UserOrgId:   p.UserOrgId,
+								PatientId:   p.PatientId,
+								AdminUserId: adminInfo.AdminUser.Id,
+								Module:      1,
+								ErrLog:      string(byterequest),
+								Status:      1,
+								Ctime:       time.Now().Unix(),
+								Mtime:       0,
+								Source:      "电脑端his项目修改",
+								RecordDate:  p.RecordDate,
+							}
+							service.CreateDoctorAdviceLog(adviceLog)
 						}
 					}
 				}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	_ "XT_New/utils"
+	"encoding/json"
 	_ "encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
@@ -132,6 +133,21 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 		evaluation.AssessmentTime = time.Now().Unix()
 
 		err := service.UpadatePredialysisEvaluation(&evaluation)
+		//记录日志
+		byterequest, _ := json.Marshal(evaluation)
+		assessmentBeforeDislysisLog := models.XtAssessmentBeforeDislysisLog{
+			UserOrgId:   adminUserInfo.Org.Id,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			ErrLog:      string(byterequest),
+			PatientId:   evaluation.PatientId,
+			RecordDate:  evaluation.AssessmentDate,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Status:      1,
+			Source:      "物联网上传透前血压",
+		}
+
+		service.CreateBeforLog(assessmentBeforeDislysisLog)
 
 		assessdateDateStart := thisTime.Format("2006-01-02")
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_before_dislysis"
@@ -193,6 +209,23 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 		}
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
+
+		//记录日志
+		byterequest, _ := json.Marshal(afterevaluation)
+		afterLog := models.XtAssessmentAfterDialysisLog{
+			UserOrgId:   adminUserInfo.Org.Id,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			ErrLog:      string(byterequest),
+			PatientId:   afterevaluation.PatientId,
+			RecordDate:  afterevaluation.AssessmentDate,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Status:      1,
+			Source:      "物联网上传透后血压",
+		}
+
+		service.CreateAfterDialysisLog(afterLog)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
 		//清空key 值
@@ -406,6 +439,23 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
+
+			//记录日志
+			byterequest, _ := json.Marshal(newprescribe)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   newprescribe.UserOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  newprescribe.RecordDate,
+				PatientId:   newprescribe.PatientId,
+				Source:      "物联网上传",
+				Status:      1,
+			}
+
+			service.CreatePrescriptionLog(prescriptionLog)
+
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 			redis := service.RedisClient()
 			//清空key 值
@@ -489,6 +539,23 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
 				err := service.AddSigleRecord(&newprescribe)
+
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "物联网上传",
+					Status:      1,
+				}
+
+				service.CreatePrescriptionLog(prescriptionLog)
+
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
 				//清空key 值
@@ -563,6 +630,22 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
 				err := service.AddSigleRecord(&newprescribe)
+
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "物联网上传",
+					Status:      1,
+				}
+
+				service.CreatePrescriptionLog(prescriptionLog)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
 				//清空key 值
@@ -590,6 +673,21 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "物联网上传",
+					Status:      1,
+				}
+
+				service.CreatePrescriptionLog(prescriptionLog)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
 				//清空key 值
@@ -616,6 +714,21 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				dialysisPrescribe.TargetUltrafiltration = 0
 			}
 			updateErr := service.UpDateDialysisPrescription(dialysisPrescribe)
+			//记录日志
+			byterequest, _ := json.Marshal(dialysisPrescribe)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   dialysisPrescribe.UserOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  dialysisPrescribe.RecordDate,
+				PatientId:   dialysisPrescribe.PatientId,
+				Source:      "物联网上传",
+				Status:      1,
+			}
+
+			service.CreatePrescriptionLog(prescriptionLog)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 			redis := service.RedisClient()
 			//清空key 值
@@ -732,6 +845,23 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		evaluation.AssessmentTime = time.Now().Unix()
 
 		err := service.UpadatePredialysisEvaluation(&evaluation)
+
+		//记录日志
+		byterequest, _ := json.Marshal(evaluation)
+		beforLog := models.XtAssessmentBeforeDislysisLog{
+			UserOrgId:   evaluation.UserOrgId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			RecordDate:  evaluation.AssessmentDate,
+			PatientId:   evaluation.PatientId,
+			Source:      "物联网上传",
+			Status:      1,
+		}
+
+		service.CreateBeforLog(beforLog)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_before_dislysis"
 		redis := service.RedisClient()
 		//清空key 值
@@ -804,6 +934,23 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
+
+		//记录日志
+		byterequest, _ := json.Marshal(afterevaluation)
+		afterDialysisLog := models.XtAssessmentAfterDialysisLog{
+			UserOrgId:   afterevaluation.UserOrgId,
+			PatientId:   afterevaluation.PatientId,
+			RecordDate:  afterevaluation.AssessmentDate,
+			Status:      1,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "物联网称重",
+		}
+
+		service.CreateAfterDialysisLog(afterDialysisLog)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_after_dislysis"
 		redis := service.RedisClient()
 		//清空key 值

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -729,7 +729,7 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 10)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -940,7 +940,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 5)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1019,7 +1019,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 5)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1165,7 +1165,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 2)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1267,7 +1267,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 2)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1514,7 +1514,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		fmt.Println("recordDate.Unix()", recordDate.Unix())
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 9)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1535,6 +1535,22 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		}
 
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
+
+		//记录日志
+		byterequest, _ := json.Marshal(assessmentAfterDislysis)
+		afterDialysisLog := models.XtAssessmentAfterDialysisLog{
+			UserOrgId:   assessmentAfterDislysis.UserOrgId,
+			PatientId:   assessmentAfterDislysis.PatientId,
+			RecordDate:  assessmentAfterDislysis.AssessmentDate,
+			Status:      1,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       0,
+			Mtime:       0,
+			Source:      "手机端保存透后评估",
+		}
+		service.CreateAfterDialysisLog(afterDialysisLog)
+
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.Org.Id,
@@ -1582,7 +1598,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
 			if cha_time >= recordDate.Unix() {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 9)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1605,7 +1621,22 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		assessmentAfterDislysis.ID = assessmentAfter.ID
 
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
-		fmt.Println("werwewweoweoweoweoewoewoew", err)
+
+		//记录日志
+		byterequest, _ := json.Marshal(assessmentAfterDislysis)
+		afterDialysisLog := models.XtAssessmentAfterDialysisLog{
+			UserOrgId:   assessmentAfterDislysis.UserOrgId,
+			PatientId:   assessmentAfterDislysis.PatientId,
+			RecordDate:  assessmentAfterDislysis.AssessmentDate,
+			Status:      1,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       0,
+			Mtime:       0,
+			Source:      "手机端修改保存透后评估",
+		}
+		service.CreateAfterDialysisLog(afterDialysisLog)
+
 		redis := service.RedisClient()
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
 
@@ -1809,7 +1840,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 1)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2026,6 +2057,23 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			prescription.AdminUserId = adminUserInfo.AdminUser.Id
 		}
 		err := service.AddSigleRecord(&prescription)
+
+		//记录日志
+		byterequest, _ := json.Marshal(prescription)
+		prescriptionLog := models.XtDialysisPrescriptionLog{
+			UserOrgId:   prescription.UserOrgId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			RecordDate:  prescription.RecordDate,
+			PatientId:   prescription.PatientId,
+			Source:      "手机端新增保存处方",
+			Status:      1,
+		}
+
+		service.CreatePrescriptionLog(prescriptionLog)
+
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.Org.Id,
@@ -2263,6 +2311,22 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		err := service.UpDateDialysisPrescription(&prescription)
 
+		//记录日志
+		byterequest, _ := json.Marshal(prescription)
+		prescriptionLog := models.XtDialysisPrescriptionLog{
+			UserOrgId:   prescription.UserOrgId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			RecordDate:  prescription.RecordDate,
+			PatientId:   prescription.PatientId,
+			Source:      "手机端修改处方",
+			Status:      1,
+		}
+
+		service.CreatePrescriptionLog(prescriptionLog)
+
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.Org.Id,
@@ -2399,7 +2463,7 @@ func (c *DialysisAPIController) Finish() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 8)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3159,7 +3223,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, recordDate.Unix(), adminUserInfo.Org.Id, 6)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3409,6 +3473,23 @@ func (this *DialysisAPIController) StartDialysis() {
 		}
 
 		err := service.CreateMonitor(&record)
+
+		//记录日志
+		byterequest, _ := json.Marshal(record)
+		monitorRecordLog := models.XtMonitorRecordLog{
+			RecordDate:  record.MonitoringDate,
+			PatientId:   record.PatientId,
+			Module:      1,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Status:      1,
+			UserOrgId:   record.UserOrgId,
+			ErrLog:      string(byterequest),
+			Source:      "执行上机时新增监测",
+		}
+		service.CreateMonitorRecordLog(monitorRecordLog)
+
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.Org.Id,
@@ -3642,7 +3723,7 @@ func (c *DialysisAPIController) PostSolution() {
 
 		if cha_time >= recordDate.Unix() {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id, 1)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3761,7 +3842,7 @@ func (c *DialysisAPIController) PostSolution() {
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-	fmt.Println("appRole0000000000000", appRole.UserType)
+
 	//
 	if appRole.UserType == 2 || appRole.UserType == 1 {
 		prescription_doctor = adminUserInfo.AdminUser.Id
@@ -3924,6 +4005,22 @@ func (c *DialysisAPIController) PostSolution() {
 	}
 
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
+	//记录日志
+	byterequest, _ := json.Marshal(prescription)
+	prescriptionLog := models.XtDialysisPrescriptionLog{
+		UserOrgId:   prescription.UserOrgId,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		ErrLog:      string(byterequest),
+		AdminUserId: adminUserInfo.AdminUser.Id,
+		RecordDate:  prescription.RecordDate,
+		PatientId:   prescription.PatientId,
+		Source:      "手机端新增处方",
+		Status:      1,
+	}
+
+	service.CreatePrescriptionLog(prescriptionLog)
+
 	finish := models.XtDialysisFinish{
 		IsFinish:   1,
 		UserOrgId:  adminUserInfo.Org.Id,
@@ -4594,7 +4691,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 
 		if cha_time >= record_date {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecord.PatientId, record_date, adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecord.PatientId, record_date, adminUserInfo.Org.Id, 1)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -4734,7 +4831,7 @@ func (c *DialysisAPIController) ModifyFinishDialysisOrder() {
 
 		if cha_time >= tempDialysisRecords.DialysisDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecords.PatientId, tempDialysisRecords.DialysisDate, adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(tempDialysisRecords.PatientId, tempDialysisRecords.DialysisDate, adminUserInfo.Org.Id, 6)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -5342,6 +5439,25 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 		}
 
 		list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
+
+		for _, item := range advices {
+			byterequest, _ := json.Marshal(item)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   adminUserInfo.Org.Id,
+				PatientId:   patient,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      1,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端医嘱推送",
+				RecordDate:  item.AdviceDate,
+			}
+
+			service.CreateDoctorAdviceLog(adviceLog)
+		}
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
 		//清空key 值
@@ -5591,7 +5707,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 		if cha_time >= record_time {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, orgid)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, orgid, 11)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -5974,7 +6090,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 		if cha_time >= record_time {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, adminInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, adminInfo.Org.Id, 11)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -6435,7 +6551,7 @@ func (c *DialysisAPIController) EditConsumables() {
 
 		if cha_time >= record_time {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, adminInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, adminInfo.Org.Id, 11)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -7314,7 +7430,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 		if cha_time >= record_time {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, adminInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_time, adminInfo.Org.Id, 11)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -9334,7 +9450,7 @@ func (this *DialysisAPIController) SaveMobileInformation() {
 		Mtime:             0,
 	}
 
-	infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, user_org_id)
+	infor, _ := service.GetDialysisInformationByRecordDateOne(patient_id, record_date, user_org_id)
 	if infor.ID == 0 {
 		service.SaveDialysisInformation(information)
 	}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
@@ -134,7 +135,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 
 		if cha_time >= date {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patientID, date, adminInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(patientID, date, adminInfo.Org.Id, 7)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -203,6 +204,23 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	}
 
 	err := service.CreateMonitor(&record)
+	//记录日志
+	byterequest, _ := json.Marshal(record)
+	monitorRecordLog := models.XtMonitorRecordLog{
+		RecordDate:  record.MonitoringDate,
+		PatientId:   record.PatientId,
+		Module:      1,
+		AdminUserId: adminInfo.AdminUser.Id,
+		Ctime:       0,
+		Mtime:       0,
+		Status:      1,
+		UserOrgId:   record.UserOrgId,
+		ErrLog:      string(byterequest),
+		Source:      "手机端新增血压",
+	}
+
+	service.CreateMonitorRecordLog(monitorRecordLog)
+
 	finish := models.XtDialysisFinish{
 		IsFinish:   1,
 		UserOrgId:  record.UserOrgId,
@@ -407,7 +425,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 
 		if cha_time >= monitor.MonitoringDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, monitor.MonitoringDate, monitor.UserOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, monitor.MonitoringDate, monitor.UserOrgId, 7)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -419,6 +437,22 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.ReplacementSpeed = replacement_speed
 	monitor.Dicarbonate = dicarbonate
 	err = service.UpdateMonitor(monitor)
+	//记录日志
+	byterequest, _ := json.Marshal(monitor)
+	monitorRecordLog := models.XtMonitorRecordLog{
+		RecordDate:  monitor.MonitoringDate,
+		PatientId:   monitor.PatientId,
+		Module:      3,
+		AdminUserId: adminInfo.AdminUser.Id,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Status:      1,
+		UserOrgId:   monitor.UserOrgId,
+		ErrLog:      string(byterequest),
+		Source:      "手机端修改监测",
+	}
+	service.CreateMonitorRecordLog(monitorRecordLog)
+
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()
 	//清空key 值
@@ -480,7 +514,7 @@ func (this *DialysisAPIController) DeleteMonitor() {
 
 		if cha_time >= monitor.MonitoringDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(monitor.PatientId, monitor.MonitoringDate, monitor.UserOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(monitor.PatientId, monitor.MonitoringDate, monitor.UserOrgId, 7)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -490,6 +524,23 @@ func (this *DialysisAPIController) DeleteMonitor() {
 		}
 	}
 	err := service.DisableMonitor(adminInfo.Org.Id, patientID, recordID, adminInfo.AdminUser.Id)
+
+	//记录日志
+	byterequest, _ := json.Marshal(monitor)
+	recordLog := models.XtMonitorRecordLog{
+		RecordDate:  monitor.MonitoringDate,
+		PatientId:   monitor.PatientId,
+		Module:      4,
+		AdminUserId: adminInfo.AdminUser.Id,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Status:      1,
+		UserOrgId:   monitor.UserOrgId,
+		ErrLog:      string(byterequest),
+		Source:      "手机端删除监测",
+	}
+	service.CreateMonitorRecordLog(recordLog)
+
 	orgid := this.GetMobileAdminUserInfo().Org.Id
 	redis := service.RedisClient()
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(monitor.MonitoringDate, 10) + ":monitor_record_list_all"

controllers/mobile_api_controllers/patient_api_controller.go

@@ -326,7 +326,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 
 				if cha_time >= sourceAdvice.AdviceDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(id, sourceAdvice.AdviceDate, adminUserInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(id, sourceAdvice.AdviceDate, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -369,7 +369,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 
 				if cha_time >= sourceAdvice.AdviceDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(id, sourceAdvice.AdviceDate, adminUserInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(id, sourceAdvice.AdviceDate, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -418,7 +418,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 
 			if cha_time >= advice.AdviceDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(id, advice.AdviceDate, adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(id, advice.AdviceDate, adminUserInfo.Org.Id, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -727,7 +727,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				if cha_time >= record_date {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -737,6 +737,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}
 			err = service.ExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+			//记录日志
+			byterequest, _ := json.Marshal(advices)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   advices.UserOrgId,
+				PatientId:   advices.PatientId,
+				AdminUserId: advices.ExecutionStaff,
+				Module:      2,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端执行医嘱",
+				RecordDate:  advices.RecordDate,
+			}
+
+			service.CreateDoctorAdviceLog(adviceLog)
+
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -773,7 +790,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				if cha_time >= record_date {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -783,6 +800,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}
 			err = service.BatchExceOldDoctorAdvice(&advices, ids)
+
+			//记录日志
+			byterequest, _ := json.Marshal(advices)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   advices.UserOrgId,
+				PatientId:   advices.PatientId,
+				AdminUserId: advices.ExecutionStaff,
+				Module:      2,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端执行医嘱",
+				RecordDate:  advices.RecordDate,
+			}
+
+			service.CreateDoctorAdviceLog(adviceLog)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
@@ -1287,7 +1321,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				if cha_time >= item.AdviceDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(item.PatientId, item.AdviceDate, item.UserOrgId)
+					infor, _ := service.GetDialysisInformationByRecordDate(item.PatientId, item.AdviceDate, item.UserOrgId, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1297,6 +1331,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 			}
 			err = service.SaveHisDoctorAdvice(item)
+
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   item.UserOrgId,
+				PatientId:   item.PatientId,
+				AdminUserId: item.ExecutionStaff,
+				Module:      2,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端执行his医嘱",
+				RecordDate:  item.AdviceDate,
+			}
+			service.CreateDoctorAdviceLog(adviceLog)
+
 			if err == nil {
 				drugError := models.XtDrugError{
 					UserOrgId:             adminInfo.Org.Id,
@@ -1735,7 +1786,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 
 			if cha_time >= advices.AdviceDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advices.AdviceDate, adminUserInfo.Org.Id, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1745,6 +1796,23 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			}
 		}
 		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+		//记录日志
+		byterequest, _ := json.Marshal(advices)
+		adviceLog := models.XtDoctorAdviceLog{
+			UserOrgId:   adminUserInfo.Org.Id,
+			PatientId:   advices.PatientId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Module:      1,
+			ErrLog:      string(byterequest),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "手机端编辑医嘱",
+			RecordDate:  advices.AdviceDate,
+		}
+
+		service.CreateDoctorAdviceLog(adviceLog)
+
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 
@@ -1768,7 +1836,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 
 			if cha_time >= advices.AdviceDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advices.AdviceDate, adminUserInfo.Org.Id, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1778,8 +1846,24 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			}
 		}
 		err = service.BatchModifyExceOldDoctorAdvice(&advices, ids)
-
 		err = service.ModifyExceDoctorAdviceByGroupNoOne(&advices, ids)
+
+		//记录日志
+		byterequest, _ := json.Marshal(advices)
+		adviceLog := models.XtDoctorAdviceLog{
+			UserOrgId:   adminUserInfo.Org.Id,
+			PatientId:   advices.PatientId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Module:      1,
+			ErrLog:      string(byterequest),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "手机端编辑执行医嘱",
+			RecordDate:  advices.AdviceDate,
+		}
+
+		service.CreateDoctorAdviceLog(adviceLog)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 
@@ -1800,6 +1884,22 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 		}
 		var advicehis models.HisDoctorAdviceInfo
 		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
+		//记录日志
+		byterequest, _ := json.Marshal(advicesinfo)
+		adviceLog := models.XtDoctorAdviceLog{
+			UserOrgId:   adminUserInfo.Org.Id,
+			PatientId:   advices.PatientId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Module:      1,
+			ErrLog:      string(byterequest),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "手机端his编辑医嘱",
+			RecordDate:  advices.AdviceDate,
+		}
+
+		service.CreateDoctorAdviceLog(adviceLog)
 		his_advices, _ := service.FindHisDoctorAdviceByIdOne(adminUserInfo.Org.Id, ids)
 		for _, item := range his_advices {
 			if item.ExecutionState == 1 {
@@ -1821,7 +1921,21 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			Mtime:         time.Now().Unix(),
 		}
 		service.ModifyHisPrescriptionProject(&project, ids)
-
+		//记录日志
+		projectquerst, _ := json.Marshal(project)
+		projectLog := models.XtDoctorAdviceLog{
+			UserOrgId:   adminUserInfo.Org.Id,
+			PatientId:   advices.PatientId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Module:      1,
+			ErrLog:      string(projectquerst),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "手机端his编辑项目医嘱",
+			RecordDate:  advices.AdviceDate,
+		}
+		service.CreateDoctorAdviceLog(projectLog)
 		keyEnd := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advicesinfo.PatientId, 10) + ":" + strconv.FormatInt(advicesinfo.AdviceDate, 10) + ":his_doctor_advice"
 		redis.Set(keyEnd, "", time.Second)
 		keyFours := "scheduals_" + recordDate + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
@@ -1934,7 +2048,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 
 				if cha_time >= record_date {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminUserInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1944,6 +2058,23 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 				}
 			}
 			err = service.CheckDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+
+			//记录日志
+			byterequest, _ := json.Marshal(advices)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   adminUserInfo.Org.Id,
+				PatientId:   advices.PatientId,
+				AdminUserId: advices.Checker,
+				Module:      3,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端核对医嘱",
+				RecordDate:  advices.AdviceDate,
+			}
+			service.CreateDoctorAdviceLog(adviceLog)
+
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -1984,7 +2115,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 
 					if cha_time >= advices.AdviceDate {
 						//查询审核是否允许
-						infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
+						infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id, 4)
 						//申请状态不允许的情况 拒绝修改
 						if infor.ApplicationStatus != 1 {
 							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1994,6 +2125,21 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 					}
 				}
 				err = service.BatchCheckOldDoctorAdvice(&advices, ids, adminUserInfo.Org.Id, advice.AdviceDate)
+				//记录日志
+				byterequest, _ := json.Marshal(advices)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   advices.PatientId,
+					AdminUserId: advices.Checker,
+					Module:      3,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端核对医嘱",
+					RecordDate:  advices.AdviceDate,
+				}
+				service.CreateDoctorAdviceLog(adviceLog)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 				redis := service.RedisClient()
 				//清空key 值
@@ -2058,7 +2204,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 
 				if cha_time >= record_date {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(patient_id, record_date, adminInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2068,6 +2214,21 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 				}
 			}
 			err = service.SaveHisDoctorAdvice(item)
+			//记录日志
+			byterequest, _ := json.Marshal(advices)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   adminInfo.Org.Id,
+				PatientId:   item.PatientId,
+				AdminUserId: item.Checker,
+				Module:      3,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端核对His医嘱",
+				RecordDate:  item.AdviceDate,
+			}
+			service.CreateDoctorAdviceLog(adviceLog)
 			redis := service.RedisClient()
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			//清空key 值
@@ -2287,6 +2448,22 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 			}
 			err := service.AddSigleRecord(&newprescribe)
+			//记录日志
+			byterequest, _ := json.Marshal(newprescribe)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   newprescribe.UserOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  newprescribe.RecordDate,
+				PatientId:   newprescribe.PatientId,
+				Source:      "手机端新增透前评估插入处方",
+				Status:      1,
+			}
+
+			service.CreatePrescriptionLog(prescriptionLog)
+
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 			redis := service.RedisClient()
@@ -2325,6 +2502,22 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				}
 			}
 			err := service.UpDateDialysisPrescription(&newprescribe)
+
+			//记录日志
+			byterequest, _ := json.Marshal(newprescribe)
+			prescriptionLog := models.XtDialysisPrescriptionLog{
+				UserOrgId:   newprescribe.UserOrgId,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				RecordDate:  newprescribe.RecordDate,
+				PatientId:   newprescribe.PatientId,
+				Source:      "手机端新增透前评估插入处方",
+				Status:      1,
+			}
+
+			service.CreatePrescriptionLog(prescriptionLog)
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 			redis := service.RedisClient()
@@ -2413,6 +2606,22 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					newprescribe.DialysateFlow = 500
 				}
 				err := service.AddSigleRecord(&newprescribe)
+
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "手机端新增透前评估插入处方",
+					Status:      1,
+				}
+
+				service.CreatePrescriptionLog(prescriptionLog)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2447,6 +2656,22 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					}
 				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
+
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "手机端新增透前评估插入处方",
+					Status:      1,
+				}
+
+				service.CreatePrescriptionLog(prescriptionLog)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2535,7 +2760,21 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					newprescribe.DialysateFlow = 500
 				}
 				err := service.AddSigleRecord(&newprescribe)
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "手机端新增透前评估插入处方",
+					Status:      1,
+				}
 
+				service.CreatePrescriptionLog(prescriptionLog)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2574,6 +2813,21 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					}
 				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "手机端新增透前评估插入处方",
+					Status:      1,
+				}
+
+				service.CreatePrescriptionLog(prescriptionLog)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2662,6 +2916,22 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					}
 				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
+
+				//记录日志
+				byterequest, _ := json.Marshal(newprescribe)
+				prescriptionLog := models.XtDialysisPrescriptionLog{
+					UserOrgId:   newprescribe.UserOrgId,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					ErrLog:      string(byterequest),
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					RecordDate:  newprescribe.RecordDate,
+					PatientId:   newprescribe.PatientId,
+					Source:      "手机端新增透前评估插入处方",
+					Status:      1,
+				}
+
+				service.CreatePrescriptionLog(prescriptionLog)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2720,7 +2990,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 		if cha_time >= evaluation.AssessmentDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(id, evaluation.AssessmentDate, adminUserInfo.Org.Id)
+			infor, _ := service.GetDialysisInformationByRecordDate(id, evaluation.AssessmentDate, adminUserInfo.Org.Id, 3)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2731,6 +3001,23 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	err = service.UpadatePredialysisEvaluation(&evaluation)
+
+	//记录日志
+	byterequest, _ := json.Marshal(evaluation)
+	beforeDislysisLog := models.XtAssessmentBeforeDislysisLog{
+
+		UserOrgId:   evaluation.UserOrgId,
+		AdminUserId: adminUserInfo.AdminUser.Id,
+		ErrLog:      string(byterequest),
+		PatientId:   evaluation.PatientId,
+		RecordDate:  evaluation.AssessmentDate,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Status:      1,
+		Source:      "手机端保存透前评估",
+	}
+	service.CreateBeforLog(beforeDislysisLog)
+
 	finish := models.XtDialysisFinish{
 		IsFinish:   1,
 		UserOrgId:  adminUserInfo.Org.Id,
@@ -4429,7 +4716,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 			if cha_time >= Startdate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, Startdate, adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, Startdate, adminUserInfo.Org.Id, 5)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -4440,6 +4727,25 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		}
 
 		newAdvices, createErr := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, group_no)
+
+		for _, item := range advices {
+			//记录日志
+			byterequest, _ := json.Marshal(item)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   item.UserOrgId,
+				PatientId:   item.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      1,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端新增医嘱",
+				RecordDate:  item.AdviceDate,
+			}
+			service.CreateDoctorAdviceLog(adviceLog)
+		}
+
 		finish := models.XtDialysisFinish{
 			IsFinish:   1,
 			UserOrgId:  adminUserInfo.Org.Id,
@@ -4556,7 +4862,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 			if cha_time >= advice.RecordDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.RecordDate, adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.RecordDate, adminUserInfo.Org.Id, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -4566,6 +4872,24 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			}
 		}
 		err := service.CreateDoctorAdvice(&advice)
+
+		//记录日志
+		byterequest, _ := json.Marshal(advice)
+		adviceLog := models.XtDoctorAdviceLog{
+			UserOrgId:   advice.UserOrgId,
+			PatientId:   advice.PatientId,
+			AdminUserId: adminUserInfo.Org.Id,
+			Module:      1,
+			ErrLog:      string(byterequest),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "手机端新增医嘱",
+			RecordDate:  advice.AdviceDate,
+		}
+
+		service.CreateDoctorAdviceLog(adviceLog)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()
 		//清空key 值
@@ -4718,7 +5042,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 			if cha_time >= advice.AdviceDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id)
+				infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -4728,6 +5052,22 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			}
 		}
 		err := service.DeleteDoctorAdvice(&advice)
+		//记录日志
+		byterequest, _ := json.Marshal(advice)
+		adviceLog := models.XtDoctorAdviceLog{
+			UserOrgId:   advice.UserOrgId,
+			PatientId:   advice.PatientId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Module:      4,
+			ErrLog:      string(byterequest),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "手机端删除医嘱",
+			RecordDate:  advice.RecordDate,
+		}
+		service.CreateDoctorAdviceLog(adviceLog)
+
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
 		redis.Set(key, "", time.Second)
@@ -4804,7 +5144,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 				if cha_time >= advice.AdviceDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -4814,6 +5154,22 @@ func (c *PatientApiController) DelDoctorAdvice() {
 				}
 			}
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
+			//记录日志
+			byterequest, _ := json.Marshal(advice)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   advice.UserOrgId,
+				PatientId:   advice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      4,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "手机端删除医嘱",
+				RecordDate:  advice.RecordDate,
+			}
+			service.CreateDoctorAdviceLog(adviceLog)
+
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
 			redis.Set(key, "", time.Second)
@@ -4839,7 +5195,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 
 				if cha_time >= advice.AdviceDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id)
+					infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -4849,6 +5205,27 @@ func (c *PatientApiController) DelDoctorAdvice() {
 				}
 			}
 			err = service.BatchDeleteDoctorAdvice(ids, adminUserInfo.AdminUser.Id)
+
+			advicelist, _ := service.GetBatchDoctorAdviceList(ids, adminUserInfo.Org.Id)
+
+			for _, item := range advicelist {
+				//记录日志
+				byterequest, _ := json.Marshal(item)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   item.UserOrgId,
+					PatientId:   item.PatientId,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      4,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端批量删除医嘱",
+					RecordDate:  item.RecordDate,
+				}
+				service.CreateDoctorAdviceLog(adviceLog)
+			}
+
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(doc_advice_date, 10) + ":doctor_advices"
 
 			redis.Set(key, "", time.Second)
@@ -5064,7 +5441,7 @@ func (c *PatientApiController) ExecProject() {
 
 			if cha_time >= project.RecordDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -5100,7 +5477,7 @@ func (c *PatientApiController) ExecProject() {
 
 				if cha_time >= project.RecordDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -5135,7 +5512,7 @@ func (c *PatientApiController) ExecProject() {
 
 				if cha_time >= project.RecordDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -5200,7 +5577,7 @@ func (c *PatientApiController) CheckProject() {
 
 			if cha_time >= project.RecordDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -5239,7 +5616,7 @@ func (c *PatientApiController) CheckProject() {
 
 				if cha_time >= project.RecordDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -5277,7 +5654,7 @@ func (c *PatientApiController) CheckProject() {
 
 				if cha_time >= project.RecordDate {
 					//查询审核是否允许
-					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId)
+					infor, _ := service.GetDialysisInformationByRecordDate(project.PatientId, project.PatientId, project.UserOrgId, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)

controllers/patient_api_controller.go

@@ -1398,7 +1398,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 			if cha_time >= advice.AdviceDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1669,6 +1669,25 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	}
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
+
+	for _, item := range advices {
+		//记录日志
+		byterequest, _ := json.Marshal(item)
+		adviceLog := models.XtDoctorAdviceLog{
+			UserOrgId:   item.UserOrgId,
+			PatientId:   item.PatientId,
+			AdminUserId: adminUserInfo.AdminUser.Id,
+			Module:      1,
+			ErrLog:      string(byterequest),
+			Status:      1,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			Source:      "电导端批量插入医嘱",
+			RecordDate:  item.AdviceDate,
+		}
+		service.CreateDoctorAdviceLog(adviceLog)
+	}
+
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
 
 	redis := service.RedisClient()
@@ -1772,7 +1791,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 
 		if cha_time >= advice.AdviceDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId, 4)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -1796,6 +1815,24 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 		}
 	}
 	err := service.CreateDoctorAdvice(&advice)
+
+	//记录日志
+	byterequest, _ := json.Marshal(advice)
+	adviceLog := models.XtDoctorAdviceLog{
+		UserOrgId:   advice.UserOrgId,
+		PatientId:   advice.PatientId,
+		AdminUserId: adminUserInfo.AdminUser.Id,
+		Module:      1,
+		ErrLog:      string(byterequest),
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Source:      "电脑新增医嘱",
+		RecordDate:  advice.RecordDate,
+	}
+
+	service.CreateDoctorAdviceLog(adviceLog)
+
 	//创建步骤表
 	finish := models.XtDialysisFinish{
 		IsFinish:   1,
@@ -2108,7 +2145,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			if cha_time >= advice.AdviceDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2119,6 +2156,21 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 		if advice.ParentId > 0 {
 			err = service.ExceDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
+			//记录日志
+			byterequest, _ := json.Marshal(exceAdvice)
+			doctorAdviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   exceAdvice.UserOrgId,
+				PatientId:   exceAdvice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      2,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "电脑端执行医嘱",
+				RecordDate:  exceAdvice.RecordDate,
+			}
+			service.CreateDoctorAdviceLog(doctorAdviceLog)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -2140,6 +2192,21 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			defer redis.Close()
 		} else {
 			err = service.ExceDoctorAdviceById(&exceAdvice, id, patient)
+			//记录日志
+			byterequest, _ := json.Marshal(exceAdvice)
+			doctorAdviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   exceAdvice.UserOrgId,
+				PatientId:   exceAdvice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      2,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "电脑端执行医嘱",
+				RecordDate:  exceAdvice.RecordDate,
+			}
+			service.CreateDoctorAdviceLog(doctorAdviceLog)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -2462,6 +2529,21 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 		if advice.ParentId > 0 {
 			err = service.ExceHidDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
+			//记录日志
+			byterequest, _ := json.Marshal(exceAdvice)
+			doctorAdviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   exceAdvice.UserOrgId,
+				PatientId:   exceAdvice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      2,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "电脑端执行His医嘱",
+				RecordDate:  exceAdvice.RecordDate,
+			}
+			service.CreateDoctorAdviceLog(doctorAdviceLog)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -2482,6 +2564,21 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			defer redis.Close()
 		} else {
 			err = service.ExceHidDoctorAdviceById(&exceAdvice, id, patient)
+			//记录日志
+			byterequest, _ := json.Marshal(exceAdvice)
+			doctorAdviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   exceAdvice.UserOrgId,
+				PatientId:   exceAdvice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      2,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "电脑端执行His医嘱",
+				RecordDate:  exceAdvice.RecordDate,
+			}
+			service.CreateDoctorAdviceLog(doctorAdviceLog)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -2898,7 +2995,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 
 			if cha_time >= advice.AdviceDate {
 				//查询审核是否允许
-				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId, 4)
 				//申请状态不允许的情况 拒绝修改
 				if infor.ApplicationStatus != 1 {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -2909,6 +3006,23 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		}
 		if advice.ParentId > 0 {
 			err = service.CheckDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
+			//记录日志
+			byterequest, _ := json.Marshal(exceAdvice)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   exceAdvice.UserOrgId,
+				PatientId:   exceAdvice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      3,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "核对医嘱",
+				RecordDate:  exceAdvice.AdviceDate,
+			}
+
+			service.CreateDoctorAdviceLog(adviceLog)
+
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -2925,6 +3039,22 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			redis.Set(keyFive, "", time.Second)
 		} else {
 			err = service.CheckDoctorAdviceById(&exceAdvice, id, patient)
+			//记录日志
+			byterequest, _ := json.Marshal(exceAdvice)
+			adviceLog := models.XtDoctorAdviceLog{
+				UserOrgId:   exceAdvice.UserOrgId,
+				PatientId:   exceAdvice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+				Module:      3,
+				ErrLog:      string(byterequest),
+				Status:      1,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				Source:      "核对医嘱",
+				RecordDate:  exceAdvice.AdviceDate,
+			}
+
+			service.CreateDoctorAdviceLog(adviceLog)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			//清空key 值
@@ -3113,7 +3243,7 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 
 		if cha_time >= advice.AdviceDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(patient, advice.AdviceDate, adminUserInfo.CurrentOrgId, 4)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3124,15 +3254,30 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	}
 
 	err := service.UpdateDoctorAdvice(&advice)
+
+	//记录日志
+	byterequest, _ := json.Marshal(advice)
+	doctorAdviceLog := models.XtDoctorAdviceLog{
+		UserOrgId:   advice.UserOrgId,
+		PatientId:   advice.PatientId,
+		AdminUserId: adminUserInfo.AdminUser.Id,
+		Module:      1,
+		ErrLog:      string(byterequest),
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Source:      "电脑端修改医嘱",
+		RecordDate:  advice.AdviceDate,
+	}
+	service.CreateDoctorAdviceLog(doctorAdviceLog)
 	redis := service.RedisClient()
 
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 
 	redis.Set(key, "", time.Second)
-	fmt.Println("key2332233232322332", key)
+
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 	redis.Set(keyOne, "", time.Second)
-	fmt.Println("key3333333333333333", keyOne)
 	defer redis.Close()
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
@@ -3350,7 +3495,7 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 
 		if cha_time >= advice.AdviceDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.CurrentOrgId, 4)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3360,6 +3505,22 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 		}
 	}
 	err := service.DeleteDoctorAdvice(&advice)
+
+	//记录日志
+	byterequest, _ := json.Marshal(advice)
+	doctorAdviceLog := models.XtDoctorAdviceLog{
+		UserOrgId:   advice.UserOrgId,
+		PatientId:   advice.PatientId,
+		AdminUserId: adminUserInfo.AdminUser.Id,
+		Module:      4,
+		ErrLog:      string(byterequest),
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Source:      "电脑端删除医嘱",
+		RecordDate:  advice.RecordDate,
+	}
+	service.CreateDoctorAdviceLog(doctorAdviceLog)
 	redis := service.RedisClient()
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 
@@ -3421,7 +3582,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 
 		if cha_time >= advice.AdviceDate {
 			//查询审核是否允许
-			infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.CurrentOrgId)
+			infor, _ := service.GetDialysisInformationByRecordDate(advice.PatientId, advice.AdviceDate, adminUserInfo.CurrentOrgId, 4)
 			//申请状态不允许的情况 拒绝修改
 			if infor.ApplicationStatus != 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
@@ -3433,6 +3594,21 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 
 	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
 
+	byterequest, _ := json.Marshal(advice)
+	doctorAdviceLog := models.XtDoctorAdviceLog{
+		UserOrgId:   advice.UserOrgId,
+		PatientId:   advice.PatientId,
+		AdminUserId: adminUserInfo.AdminUser.Id,
+		Module:      4,
+		ErrLog:      string(byterequest),
+		Status:      1,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		Source:      "电脑端批量删除医嘱",
+		RecordDate:  advice.RecordDate,
+	}
+	service.CreateDoctorAdviceLog(doctorAdviceLog)
+
 	key := strconv.FormatInt(advice.UserOrgId, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 	redis := service.RedisClient()
 

controllers/sign_api_controller.go

@@ -6,6 +6,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jung-kurt/gofpdf"
+	"time"
 )
 
 type SignApiController struct {
@@ -41,11 +43,35 @@ func SignApiRegistRouters() {
 	//后台签署（返回签署文件）
 	beego.Router("/api/sign/createbackstagesign", &SignApiController{}, "Get:CreateBackStageSign")
 
-	//创建企业印章并添加授权用户
+	//署意愿认证-短信验证
 	beego.Router("/api/sign/totestelment", &SignApiController{}, "Get:CreateEnterprise")
 
 	//测试PDF
 	beego.Router("/api/sign/totestthrityment", &SignApiController{}, "Get:GetTestThrityMent")
+
+	//CA企业认证
+	beego.Router("/api/sign/saveenerprise", &SignApiController{}, "Post:SaveEnerprise")
+
+	//
+	beego.Router("/api/sign/getenerprisebyid", &SignApiController{}, "Get:GetEnerPriseById")
+
+	beego.Router("/api/sign/getmobilecode", &SignApiController{}, "Get:GetMobileCode")
+
+	beego.Router("/api/sign/getpersionenterprise", &SignApiController{}, "Post:GetPersionEnterPrise")
+
+	beego.Router("/api/sign/getpersenterprisebyid", &SignApiController{}, "Get:GetPerseEnterPriseById")
+
+	beego.Router("/api/device/sign/creterpersionseal", &SignApiController{}, "Get:CreateNewPersionSeal")
+
+	beego.Router("/api/device/sign/createnewenterprise", &SignApiController{}, "Get:CreateNewEnterPrise")
+
+	beego.Router("/api/device/contractid", &SignApiController{}, "Get:GetContractId")
+
+	beego.Router("/api/device/endenterprise", &SignApiController{}, "Get:EndEnterPrise")
+
+	beego.Router("/api/device/getenterprisedetail", &SignApiController{}, "Get:GetEnterPriseDetail")
+
+	beego.Router("/api/device/uploadprintorder", &SignApiController{}, "Post:UploadPrintOrder")
 }
 
 // 短信服务接口
@@ -236,54 +262,9 @@ func (this *SignApiController) CreateBackStageSign() {
 
 	signers := this.GetString("signers")
 	sign := service.CreateBackStageSign(contractId, signers)
-	sealTimestampFiles := make(map[string]interface{})
-	inputDataArr := make([]map[string]interface{}, 0)
-	signFiles := make(map[string]interface{})
-
-	keywordSignControls := make(map[string]interface{})
-	keywordSignControls["controlsKey"] = "2"
-	keywordSignControls["pattern"] = 1
-	keywordSignControls["color"] = "#FF0000"
-	inputDataArr = append(inputDataArr, keywordSignControls)
-
-	sealTimestampFiles["allAddTimestamp"] = false
-	sealTimestampFiles["someTimestampStyle"] = inputDataArr
-
-	inputDataArrOne := make([]map[string]interface{}, 0)
-
-	keySignControls := make(map[string]interface{})
-	keySignControls["controlsKey"] = "1"
-	keySignControls["fontType"] = 1
-	keySignControls["fontSize"] = 8.5
-	keySignControls["fontColor"] = "#56600F"
-	keySignControls["alignment"] = 1
-	inputDataArrOne = append(inputDataArrOne, keySignControls)
-
-	signFiles["fonts"] = inputDataArrOne
-	signFiles["showTimestamp"] = false
-	signFiles["sealTimestamp"] = sealTimestampFiles
-	signControl := make(map[string]interface{})
-	signControl["1"] = "123456"
-	signFiles["signControl"] = signControl
-	signFiles["docId"] = "156190809375377646"
-	inputDataArrThree := make([]map[string]interface{}, 0)
-	inputDataArrThree = append(inputDataArrThree, signFiles)
-
-	signer := make(map[string]interface{})
-
-	signer["signerId"] = "156002269974758623"
-	signer["isUserWishes"] = true
-	signer["userWishesWay"] = 1
-	signer["codeNumber"] = "msg202308111444501897422"
-	signer["verifyCode"] = "978176"
-	signer["signFiles"] = inputDataArrThree
-	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "156190809375377645"
-	maprequest["signer"] = signer
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"sign":       sign,
-		"maprequest": maprequest,
+		"sign": sign,
 	})
 	return
 }
@@ -305,3 +286,288 @@ func (this *SignApiController) CreateEnterprise() {
 	})
 	return
 }
+
+func (this *SignApiController) GetTestThrityMent() {
+
+	pdf := gofpdf.New("P", "mm", "A4", "")
+	pdf.AddPage()
+	pdf.SetFont("Arial", "B", 16)
+	pdf.Cell(40, 10, "Hello, World!")
+	pdf.OutputFileAndClose("output.pdf")
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": "msg",
+	})
+	return
+}
+
+func loremList() []string {
+	return []string{
+		"我爱你中国" +
+			"tempor incididunt ut labore et dolore magna aliqua.",
+		"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut " +
+			"aliquip ex ea commodo consequat.",
+		"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum " +
+			"dolore eu fugiat nulla pariatur.",
+		"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui " +
+			"officia deserunt mollit anim id est laborum.",
+	}
+}
+
+func (this *SignApiController) SaveEnerprise() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	creater := this.GetAdminUserInfo().AdminUser.Id
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+
+	id := int64(dataBody["id"].(float64))
+	org_type := int64(dataBody["org_type"].(float64))
+
+	enterprise_name := dataBody["enterprise_name"].(string)
+
+	code := dataBody["code"].(string)
+
+	org_code := dataBody["org_code"].(string)
+
+	legal_person_name := dataBody["legal_person_name"].(string)
+
+	legal_id_card_num := dataBody["legal_id_card_num"].(string)
+
+	legal_phone := dataBody["legal_phone"].(string)
+
+	enterprise := models.XtDeviceEnterprise{
+		ID:              id,
+		UserOrgId:       orgId,
+		OrgType:         org_type,
+		EnterpriseName:  enterprise_name,
+		Code:            code,
+		OrgCode:         org_code,
+		LegalPersonName: legal_person_name,
+		LegalIdCardNum:  legal_id_card_num,
+		LegalPhone:      legal_phone,
+		Creater:         creater,
+		Ctime:           time.Now().Unix(),
+		Mtime:           0,
+		Enterpriseid:    "",
+		Status:          1,
+	}
+	service.SaveEnerPrise(enterprise)
+
+	//查找该机构有没有认证信息
+	lastenterprise, _ := service.GetEnterPriseByUserOrgId(orgId)
+
+	//调用企业认证接口
+	if lastenterprise.ID > 0 {
+		enterPrise, enterpriseid := service.CreateNewEnterPriseRealName(lastenterprise)
+		fmt.Println("enterprise2ooo2oo2o2o2o", enterPrise)
+		updateEnterprise := models.XtDeviceEnterprise{
+			ID:              enterprise.ID,
+			UserOrgId:       orgId,
+			OrgType:         org_type,
+			EnterpriseName:  enterprise_name,
+			Code:            code,
+			OrgCode:         org_code,
+			LegalPersonName: legal_person_name,
+			LegalIdCardNum:  legal_id_card_num,
+			LegalPhone:      legal_phone,
+			Creater:         creater,
+			Ctime:           time.Now().Unix(),
+			Mtime:           0,
+			Enterpriseid:    enterpriseid,
+			Status:          1,
+		}
+		service.SaveEnerPrise(updateEnterprise)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"enterPrise": enterPrise,
+		})
+		return
+	}
+}
+
+func (this *SignApiController) GetEnerPriseById() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	enterPrise, _ := service.GetEnterPriseByUserOrgId(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"enterPrise": enterPrise,
+	})
+	return
+}
+
+func (this *SignApiController) GetMobileCode() {
+
+	phone := this.GetString("phone")
+
+	sign, orderNumber := service.GetNewSignNameByPhone(phone)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign":        sign,
+		"orderNumber": orderNumber,
+	})
+	return
+}
+
+func (this *SignApiController) GetPersionEnterPrise() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	creater := this.GetAdminUserInfo().AdminUser.Id
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+
+	id := int64(dataBody["id"].(float64))
+	admin_user_id := int64(dataBody["admin_user_id"].(float64))
+
+	code := dataBody["code"].(string)
+
+	display_name := dataBody["display_name"].(string)
+
+	id_card_num := dataBody["id_card_num"].(string)
+
+	phone := dataBody["phone"].(string)
+
+	enterprise := models.XtDevicePersonEnterprise{
+		ID:          id,
+		AdminUserId: admin_user_id,
+		DisplayName: display_name,
+		Phone:       phone,
+		IdCardNum:   id_card_num,
+		UserOrgId:   orgId,
+		Status:      1,
+		Creater:     creater,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		UserId:      "",
+	}
+
+	service.SavePersonEnterPrise(enterprise)
+
+	lastEnterPrise, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+
+	_, orderNumber := service.GetNewSignNameByPhone(phone)
+
+	personEnterPrse, UserId := service.CreateNewUserName(lastEnterPrise.Phone, lastEnterPrise.DisplayName, code, orderNumber, lastEnterPrise.IdCardNum)
+
+	firstenterprise := models.XtDevicePersonEnterprise{
+		ID:          id,
+		AdminUserId: admin_user_id,
+		DisplayName: display_name,
+		Phone:       phone,
+		IdCardNum:   id_card_num,
+		UserOrgId:   orgId,
+		Status:      1,
+		Creater:     creater,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		UserId:      UserId,
+	}
+
+	service.SavePersonEnterPrise(firstenterprise)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"personEnterPrse": personEnterPrse,
+	})
+	return
+}
+
+func (this *SignApiController) GetPerseEnterPriseById() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+
+	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"lastPerson": lastPerson,
+	})
+	return
+}
+
+func (this *SignApiController) CreateNewPersionSeal() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+
+	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+
+	personSeal, personSealId := service.CreateNewPersionSeal(lastPerson.UserId)
+
+	service.UpdatePerseEnterPriseById(lastPerson.ID, personSealId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"personSeal": personSeal,
+	})
+	return
+
+}
+
+func (this *SignApiController) CreateNewEnterPrise() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+
+	enterPrise, _ := service.GetEnterPriseByUserOrgId(orgId)
+	fmt.Println("地址日活", enterPrise.Enterpriseid)
+	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+
+	newEnterPrise, sealId := service.CreateNewEnterPrise(enterPrise.Enterpriseid, lastPerson.UserId)
+
+	service.UpdatePersonEnterPrise(lastPerson.ID, sealId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"newEnterPrise": newEnterPrise,
+	})
+	return
+
+}
+
+func (this *SignApiController) GetContractId() {
+
+	sign := service.GetContractId()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+	return
+}
+
+func (this *SignApiController) EndEnterPrise() {
+
+	sign := service.EndEnterPrise()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+	return
+}
+
+func (this *SignApiController) GetEnterPriseDetail() {
+
+	sign, url := service.GetEnterPriseDetail()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+		"url":  url,
+	})
+	return
+}
+
+func (this *SignApiController) UploadPrintOrder() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	name := dataBody["name"].(string)
+
+	sign := service.CreateNewUploadPact(name)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+
+}

go.mod

@@ -15,9 +15,11 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/protobuf v1.5.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jung-kurt/gofpdf v1.16.2 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/prometheus/client_golang v1.7.0 // indirect
@@ -26,7 +28,9 @@ require (
 	github.com/prometheus/procfs v0.1.3 // indirect
 	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
 	github.com/stretchr/testify v1.8.2 // indirect
+	github.com/wcharczuk/go-chart v2.0.1+incompatible // indirect
 	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect

go.sum

@@ -16,6 +16,7 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
 github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
@@ -53,6 +54,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -86,6 +89,9 @@ github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
+github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc=
+github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -117,6 +123,7 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
+github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -139,6 +146,7 @@ github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFB
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
+github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
 github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo=
 github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
@@ -163,6 +171,8 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/wcharczuk/go-chart v2.0.1+incompatible h1:0pz39ZAycJFF7ju/1mepnk26RLVLBCWz1STcD3doU0A=
+github.com/wcharczuk/go-chart v2.0.1+incompatible/go.mod h1:PF5tmL4EIx/7Wf+hEkpCqYi5He4u90sw+0+6FhrryuE=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -172,6 +182,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a h1:gHevYm0pO4QUbwy8Dmdr01R5r1BuKtfYqRqF0h/Cbh0=
+golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

models/patient_models.go

@@ -2020,3 +2020,90 @@ type VmDoubleCheck struct {
 func (VmDoubleCheck) TableName() string {
 	return "xt_double_check"
 }
+
+type XtDialysisPrescriptionLog struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	ErrLog      string `gorm:"column:err_log" json:"err_log" form:"err_log"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Source      string `gorm:"column:source" json:"source" form:"source"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDialysisPrescriptionLog) TableName() string {
+	return "xt_dialysis_prescription_log"
+}
+
+type XtAssessmentBeforeDislysisLog struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	ErrLog      string `gorm:"column:err_log" json:"err_log" form:"err_log"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	Source      string `gorm:"column:source" json:"source" form:"source"`
+}
+
+func (XtAssessmentBeforeDislysisLog) TableName() string {
+	return "xt_assessment_before_dislysis_log"
+}
+
+type XtAssessmentAfterDialysisLog struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	ErrLog      string `gorm:"column:err_log" json:"err_log" form:"err_log"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Source      string `gorm:"column:source" json:"source" form:"source"`
+}
+
+func (XtAssessmentAfterDialysisLog) TableName() string {
+	return "xt_assessment_after_dialysis_log"
+}
+
+type XtDoctorAdviceLog struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Module      int64  `gorm:"column:module" json:"module" form:"module"`
+	ErrLog      string `gorm:"column:err_log" json:"err_log" form:"err_log"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Source      string `gorm:"column:source" json:"source" form:"source"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+}
+
+func (XtDoctorAdviceLog) TableName() string {
+	return "xt_doctor_advice_log"
+}
+
+type XtMonitorRecordLog struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Module      int64  `gorm:"column:module" json:"module" form:"module"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId   int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ErrLog      string `gorm:"column:err_log" json:"err_log" form:"err_log"`
+	Source      string `gorm:"column:source" json:"source" form:"source"`
+}
+
+func (XtMonitorRecordLog) TableName() string {
+	return "xt_monitor_record_log"
+}

models/sign.models.go

@@ -88,3 +88,44 @@ type Signers struct {
 		} `json:"keywordSignControls"`
 	} `json:"signFiles"`
 }
+
+type XtDeviceEnterprise struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	OrgType         int64  `gorm:"column:org_type" json:"org_type" form:"org_type"`
+	EnterpriseName  string `gorm:"column:enterprise_name" json:"enterprise_name" form:"enterprise_name"`
+	Code            string `gorm:"column:code" json:"code" form:"code"`
+	OrgCode         string `gorm:"column:org_code" json:"org_code" form:"org_code"`
+	LegalPersonName string `gorm:"column:legal_person_name" json:"legal_person_name" form:"legal_person_name"`
+	LegalIdCardNum  string `gorm:"column:legal_id_card_num" json:"legal_id_card_num" form:"legal_id_card_num"`
+	LegalPhone      string `gorm:"column:legal_phone" json:"legal_phone" form:"legal_phone"`
+	Creater         int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Enterpriseid    string `gorm:"column:enterprise_id" json:"enterprise_id" form:"enterprise_id"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDeviceEnterprise) TableName() string {
+	return "xt_device_enterprise"
+}
+
+type XtDevicePersonEnterprise struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId  int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	DisplayName  string `gorm:"column:display_name" json:"display_name" form:"display_name"`
+	Phone        string `gorm:"column:phone" json:"phone" form:"phone"`
+	IdCardNum    string `gorm:"column:id_card_num" json:"id_card_num" form:"id_card_num"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Creater      int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserId       string `gorm:"column:user_id" json:"user_id" form:"user_id"`
+	Personsealid string `gorm:"column:person_seal_id" json:"person_seal_id" form:"person_seal_id"`
+	Sealid       string `gorm:"column:seal_id" json:"seal_id" form:"seal_id"`
+}
+
+func (XtDevicePersonEnterprise) TableName() string {
+	return "xt_device_person_enterprise"
+}

service/common_service.go

@@ -3486,6 +3486,22 @@ func GetModeIdCount(startime int64, endtime int64, orgid int64, page int64, limi
 	return order, err
 }
 
+func GetScheduleModeIdCount(startime int64, endtime int64, orgid int64, page int64, limit int64) (order []*models.BloodDialysisModeIdCount, err error) {
+
+	db := XTReadDB().Table("xt_schedule as s")
+	if orgid > 0 {
+		db = db.Where("s.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("s.schedule_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("s.schedule_date<=?", endtime)
+	}
+	err = db.Group(" s.patient_id,s.mode_id").Select("s.mode_id,s.patient_id,count(s.id) as count").Scan(&order).Error
+	return order, err
+}
+
 func GetTreatModeList(startime int64, endtime int64, orgid int64) (order []*models.BloodDialysisModeIdCount, err error) {
 
 	table := XTReadDB().Table("xt_schedule as s")

service/dialysis_service.go

@@ -2362,3 +2362,65 @@ func UpdateDoctorAdviceNoExecution(id int64, creator int64, end_time int64) erro
 
 	return err
 }
+
+func CreatePrescriptionLog(log models.XtDialysisPrescriptionLog) error {
+
+	ut := writeDb.Begin()
+	err := ut.Create(&log).Error
+
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func CreateBeforLog(log models.XtAssessmentBeforeDislysisLog) error {
+
+	ut := writeDb.Begin()
+	err := XTWriteDB().Create(&log).Error
+
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func CreateAfterDialysisLog(log models.XtAssessmentAfterDialysisLog) error {
+
+	ut := writeDb.Begin()
+	err := XTWriteDB().Create(&log).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func CreateDoctorAdviceLog(log models.XtDoctorAdviceLog) error {
+
+	ut := writeDb.Begin()
+	err := XTWriteDB().Create(&log).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
+func CreateMonitorRecordLog(log models.XtMonitorRecordLog) error {
+
+	ut := writeDb.Begin()
+	err := XTWriteDB().Create(&log).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}

service/gobal_config_service.go

@@ -1082,7 +1082,14 @@ func GetLastAfter(patient_id int64, schedule_date int64, user_org_id int64) (mod
 	return dislysis, err
 }
 
-func GetDialysisInformationByRecordDate(patient_id int64, record_date int64, user_org_id int64) (models.XtDialysisInformation, error) {
+func GetDialysisInformationByRecordDate(patient_id int64, record_date int64, user_org_id int64, module int64) (models.XtDialysisInformation, error) {
+
+	information := models.XtDialysisInformation{}
+	err := XTReadDB().Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1 and module = ?", patient_id, record_date, user_org_id, module).Find(&information).Error
+	return information, err
+}
+
+func GetDialysisInformationByRecordDateOne(patient_id int64, record_date int64, user_org_id int64) (models.XtDialysisInformation, error) {
 
 	information := models.XtDialysisInformation{}
 	err := XTReadDB().Where("patient_id = ? and record_date = ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Find(&information).Error

service/his_charge_service.go

@@ -157,43 +157,43 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 		switch item_type {
 		case 0:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 1:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 2:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 3:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 4:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 5:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 390", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 ", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 ", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 6:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 310 ", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
@@ -205,31 +205,31 @@ func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, k
 		switch item_type {
 		case 0:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 1:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 2:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 3:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
 		case 4:
 			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
+				return db.Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
 			break
@@ -624,3 +624,8 @@ func GetAllChargeDetailsTwo(org_id int64, start_time int64, end_time int64) (pat
 
 	return
 }
+
+func GetAllLisDataFor10191(org_id int64) (list []models.HisLabelPrintStatusInfo, err error) {
+	err = readDb.Model(&models.HisLabelPrintStatusInfo{}).Preload("Patient", "status = 1").Where("user_org_id = ? AND status = 1  and apply_code = ''", org_id).Find(&list).Error
+	return
+}

service/his_project_service.go

@@ -300,7 +300,7 @@ func GetAllProjectTeam(orgid int64) (project []*models.XtHisProjectTeam, err err
 }
 
 func GetProjectListById(orgid int64, ids []string) (project []*models.XtHisProjectList, err error) {
-	err = XTReadDB().Model(&project).Preload("XtHisProject", "status = 1").Preload("GoodInfo", "status=1").Where("user_org_id = ? and id in (?)", orgid, ids).Find(&project).Error
+	err = XTReadDB().Model(&project).Preload("XtHisProject", "status = 1").Preload("GoodInfo", "status=1").Where("user_org_id = ? and id in (?) and status = 1", orgid, ids).Find(&project).Error
 	return project, err
 }
 

service/mobile_dialysis_service.go

@@ -1303,6 +1303,14 @@ func DisableMonitor(orgID int64, patientID int64, recordID int64, admin_user_id
 	tx.Commit()
 	return nil
 }
+
+func GetMonitorById(id int64, orgId int64) (models.MonitoringRecord, error) {
+
+	record := models.MonitoringRecord{}
+	err := XTReadDB().Where("id = ? and user_org_id =?", id, orgId).Find(&record).Error
+	return record, err
+}
+
 func GetMonitor(orgID int64, patientID int64, id int64) (*models.MonitoringRecord, error) {
 	var monitor models.MonitoringRecord
 	var err error

service/new_warehouse_service.go

@@ -50,6 +50,11 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		if errThree != nil {
 			return errThree
 		}
+
+		if orgID == 10265 {
+			UpdateGoodInfoByPrice(warehouse.GoodId, orgID, warehouse.Price, warehouse.PackingPrice)
+		}
+
 		//更新his_prescripton_project出库状态值
 		UpdateHisPrescriptionProjectStatus(goods.GoodId, record_time, orgID, patient_id)
 
@@ -1326,6 +1331,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
+
 	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
 		if lastWarehouse.StockMinNumber >= drup.MinNumber {
 			var stockMax int64
@@ -1495,6 +1501,12 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			return errThree
 		}
 
+		//更改字典里面的价格
+		if advice.UserOrgId == 10265 || advice.UserOrgId == 10215 {
+
+			UpdateBasePrice(lastWarehouse.DrugId, lastWarehouse.RetailPrice)
+		}
+
 		//查询剩余库存
 		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
 		var sum_count int64
@@ -4538,3 +4550,16 @@ func UpdateDrugWarehouseOutInfoTen(patient_id int64, sys_record_time int64, advi
 	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time  = ? and status=1 and advice_id = ?", patient_id, sys_record_time, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func UpdateBasePrice(id int64, min_price float64) error {
+
+	err := XTWriteDB().Model(models.XtBaseDrug{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"min_price": min_price}).Error
+
+	return err
+}
+
+func UpdateGoodInfoByPrice(id int64, org_id int64, price float64, packingprice float64) error {
+
+	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id=? and org_id = ? and status =1", id, org_id).Updates(map[string]interface{}{"buy_price": price, "packing_price": packingprice}).Error
+	return err
+}

service/patient_service.go

@@ -1675,6 +1675,13 @@ func FindDoctorAdviceByIdsTwety(orgID int64, ids []string) (advice []models.Doct
 	return
 }
 
+func GetBatchDoctorAdviceList(ids []string, user_org_id int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("id in(?) and user_org_id = ? and status =1", ids, user_org_id).Find(&advice).Error
+
+	return advice, err
+}
+
 func BatchDeleteDoctorAdvice(ids []string, user_id int64) (err error) {
 	ut := writeDb.Begin()
 	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix(), "modifier": user_id}).Error

service/sign_service.go

@@ -210,7 +210,7 @@ func CreatePersionSeal(user_id string, person_seal_type int64, person_seal_name
 
 	maprequest["personSealType"] = 1
 
-	maprequest["personSealName"] = "马云朋友的印章"
+	maprequest["personSealName"] = "小朋友的印章"
 
 	var url string
 
@@ -279,9 +279,10 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 
 	maprequest["signCount"] = 10
 
-	maprequest["docName"] = "电脑员工保密协议"
+	maprequest["docName"] = "日本员工保密协议"
 
 	file := "C:/Users/28169/Desktop/打印单.pdf"
+
 	fileBytes, err := ioutil.ReadFile(file) // 读取file
 
 	contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
@@ -479,7 +480,8 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 
 	signFiles := make(map[string]interface{})
 
-	signFiles["docId"] = "156190809375377646"
+	//创建合同返回
+	signFiles["docId"] = "157595002862567873"
 
 	inputDataArr := make([]map[string]interface{}, 0)
 
@@ -489,20 +491,21 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 		xySignControls["key"] = "1"
 		xySignControls["type"] = "autograph"
 		xySignControls["pageNum"] = 1
-		xySignControls["positionX"] = 100
-		xySignControls["positionY"] = 100
+		xySignControls["positionX"] = "100F"
+		xySignControls["positionY"] = "100F"
 		inputDataArr = append(inputDataArr, xySignControls)
+
 	}
 	inputDataArrTwo := make([]map[string]interface{}, 0)
 	for _, item := range signFiles {
 		fmt.Println(item)
 		keywordSignControls := make(map[string]interface{})
 		keywordSignControls["key"] = "2"
-		keywordSignControls["type"] = "autograph"
+		keywordSignControls["type"] = "date"
 		keywordSignControls["pageNum"] = 1
-		keywordSignControls["keyword"] = "盖章"
-		keywordSignControls["offsetX"] = 100
-		keywordSignControls["offsetY"] = 100
+		keywordSignControls["keyword"] = "医生签名"
+		keywordSignControls["offsetX"] = "100F"
+		keywordSignControls["offsetY"] = "100F"
 		inputDataArrTwo = append(inputDataArrTwo, keywordSignControls)
 	}
 	signFiles["xySignControls"] = inputDataArr
@@ -517,6 +520,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 	signersFiles["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
 	signersFiles["sequence"] = "8"
 	signersFiles["sendMsg"] = false
+	signersFiles["setting"] = true
 	signersFiles["signFiles"] = inputDataArrThree
 
 	inputDataArrFour := make([]map[string]interface{}, 0)
@@ -524,7 +528,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 	inputDataArrFour = append(inputDataArrFour, signersFiles)
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "156190809375377645"
+	maprequest["contractId"] = "157595002862567872"
 	maprequest["signers"] = inputDataArrFour
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -596,22 +600,26 @@ func CreateBackStageSign(contractId string, signers string) string {
 	signFiles["showTimestamp"] = false
 	signFiles["sealTimestamp"] = sealTimestampFiles
 	signControl := make(map[string]interface{})
-	signControl["1"] = "autograph"
+	signControl["1"] = "{sealId:157474548357267755}"
+	signControl["2"] = "姓名"
+
+	fmt.Println("signContorlwqowowo", signControl)
 	signFiles["signControl"] = signControl
-	signFiles["docId"] = "156190809375377646"
+	signFiles["docId"] = "157595002862567873"
 	inputDataArrThree := make([]map[string]interface{}, 0)
 	inputDataArrThree = append(inputDataArrThree, signFiles)
 
 	signer := make(map[string]interface{})
 
-	signer["signerId"] = "156190965067942129"
+	//添加合同签署人接口返回
+	signer["signerId"] = "157595142449004996"
 	signer["isUserWishes"] = true
 	signer["userWishesWay"] = 1
-	signer["codeNumber"] = "msg202308111745462623789"
-	signer["verifyCode"] = "930788"
+	signer["codeNumber"] = "msg202308261800395745892"
+	signer["verifyCode"] = "452399"
 	signer["signFiles"] = inputDataArrThree
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "156190809375377645"
+	maprequest["contractId"] = "157595002862567872"
 	maprequest["signer"] = signer
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -657,7 +665,7 @@ func GetVerificationCode() string {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "156190809375377645"
+	maprequest["contractId"] = "157595002862567872"
 	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -703,7 +711,7 @@ func CreateEnterprise() string {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "156190809375377645"
+	maprequest["contractId"] = "157413765980094742"
 	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 	maprequest["sealType"] = 1
 	maprequest["sealName"] = "测试用章"
@@ -742,3 +750,627 @@ func CreateEnterprise() string {
 
 	return str
 }
+
+func GetTestThrityMent(org_id int64) (base []*models.XtBaseDrug, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status=1", org_id).Find(&base).Error
+
+	return base, err
+}
+
+func UpdateDrugWarehouseInfoByDrugId(drug_id int64, min_price float64) error {
+
+	err := XTWriteDB().Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? and (stock_max_number>0 or stock_min_number>0) and status= 1 and is_check=1 and org_id =10375", drug_id).Updates(map[string]interface{}{"retail_price": min_price}).Error
+
+	return err
+}
+
+func GetEnterPriseByUserOrgId(user_org_id int64) (models.XtDeviceEnterprise, error) {
+
+	enterprise := models.XtDeviceEnterprise{}
+
+	err := XTReadDB().Where("user_org_id = ? and status =1", user_org_id).Find(&enterprise).Error
+
+	return enterprise, err
+}
+
+func CreateEnterPrise(enterprise models.XtDeviceEnterprise) error {
+
+	err := XTWriteDB().Create(&enterprise).Error
+
+	return err
+}
+
+func SaveEnerPrise(enterprise models.XtDeviceEnterprise) error {
+
+	err := XTWriteDB().Save(&enterprise).Error
+
+	return err
+}
+
+func CreateNewEnterPriseRealName(enterprise models.XtDeviceEnterprise) (string, string) {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/enterprise/createEnterpriseRealName"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+
+	customerReq := make(map[string]interface{})
+	customerReq["idCardType"] = "N"
+	customerReq["idCardNum"] = "430526199408156511"
+
+	maprequest["enterpriseName"] = enterprise.EnterpriseName
+	maprequest["authentication"] = true
+	maprequest["customerAuthReq"] = customerReq
+
+	fmt.Println("maprequest", maprequest)
+	byterequest, _ := json.Marshal(maprequest)
+
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var enterpriseId string
+	enterpriseId = respJSON["data"].(map[string]interface{})["enterpriseId"].(string)
+	fmt.Println("enterpriseId", enterpriseId)
+	return str, enterpriseId
+}
+
+func GetNewSignNameByPhone(phone string) (string, string) {
+
+	var url string
+	url = "http://demo-open.itruscloud.com/apigate/smsService/sendingSms"
+	var content string
+	content = "123456"
+	var autograph string
+	autograph = "【天威诚信】"
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["phone"] = phone
+	maprequest["content"] = content
+	maprequest["autograph"] = autograph
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(signatureStr)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var orderNumber string
+	orderNumber = respJSON["orderNumber"].(string)
+	fmt.Println("orderNumberWOWOWOWOWO", orderNumber)
+	return str, orderNumber
+}
+
+func SavePersonEnterPrise(enterprise models.XtDevicePersonEnterprise) error {
+
+	err := XTWriteDB().Save(&enterprise).Error
+
+	return err
+}
+
+func GetLastPersonEnterPrise(admin_user_id int64, orgId int64) (models.XtDevicePersonEnterprise, error) {
+
+	enterprise := models.XtDevicePersonEnterprise{}
+
+	err := XTReadDB().Where("admin_user_id = ? and user_org_id = ? and status = 1", admin_user_id, orgId).Find(&enterprise).Error
+
+	return enterprise, err
+}
+
+func CreateNewUserName(phone string, disPlayName string, code string, orderNumber string, id_card_number string) (string, string) {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/user/createUserRealName"
+
+	var authentication string
+	//测试环境用true
+	authentication = "true"
+
+	maprequest := make(map[string]interface{})
+
+	twAuthReq := make(map[string]interface{})
+
+	apiAuthReq := make(map[string]interface{})
+
+	customerReq := make(map[string]interface{})
+
+	fmt.Println("身份证id_card_number", id_card_number)
+	customerReq["idCardType"] = "0"
+	customerReq["idCardNum"] = id_card_number
+
+	apiAuthReq["realNameType"] = 3
+	apiAuthReq["idCardType"] = "0"
+	apiAuthReq["idCardNum"] = id_card_number
+	apiAuthReq["bankCard"] = "6225551675364804"
+	//验证码流水号
+	apiAuthReq["codeNumber"] = orderNumber
+	//验证码
+	apiAuthReq["verifyCode"] = code
+
+	twAuthReq["oneLineAuth"] = "false"
+
+	twAuthReq["apiAuthReq"] = apiAuthReq
+
+	maprequest["phone"] = phone
+	maprequest["displayName"] = disPlayName
+	maprequest["authentication"] = authentication
+
+	maprequest["twAuthReq"] = twAuthReq
+	maprequest["customerAuthReq"] = customerReq
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(signatureStr)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+	fmt.Println("appID", appId)
+	fmt.Println("serviceCode", serviceCode)
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var UserId string
+	UserId = respJSON["data"].(map[string]interface{})["userId"].(string)
+	fmt.Println("str", UserId)
+	return str, UserId
+
+}
+
+func CreateNewPersionSeal(userId string) (string, string) {
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["userId"] = userId
+
+	maprequest["personSealType"] = 1
+
+	maprequest["personSealName"] = "小马印章"
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/user/createPersonSeal"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(signatureStr)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var personSealId string
+	personSealId = respJSON["data"].(map[string]interface{})["personSealId"].(string)
+	fmt.Println("str", personSealId)
+	return str, personSealId
+}
+
+func UpdatePerseEnterPriseById(id int64, personSealId string) error {
+
+	err := XTWriteDB().Model(models.XtDevicePersonEnterprise{}).Where("id= ? and status =1", id).Updates(map[string]interface{}{"person_seal_id": personSealId}).Error
+
+	return err
+}
+
+func CreateNewEnterPrise(enterpriseId string, userId string) (string, string) {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/enterprise/createSeal"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	fmt.Println("enterpriseId", enterpriseId)
+	fmt.Println("userId", userId)
+	maprequest := make(map[string]interface{})
+	maprequest["enterpriseId"] = enterpriseId
+	maprequest["userId"] = userId
+	maprequest["sealType"] = 1
+	maprequest["sealName"] = "测试用章"
+
+	fmt.Println("request23222222222222222", maprequest)
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+
+	fmt.Println("request23222222222222222", request)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+	fmt.Println("strwowowowowo", str)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var sealId string
+	sealId = respJSON["data"].(map[string]interface{})["sealId"].(string)
+	fmt.Println("sealId", sealId)
+	return str, sealId
+}
+
+func UpdatePersonEnterPrise(id int64, sealId string) error {
+
+	err := XTWriteDB().Model(models.XtDevicePersonEnterprise{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"seal_id": sealId}).Error
+	return err
+}
+
+func GetContractId() string {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/search"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "157475501840007476"
+	maprequest["responseContractFile"] = true
+
+	fmt.Println("request23222222222222222", maprequest)
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+
+	fmt.Println("request23222222222222222", request)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+	fmt.Println("strwowowowowo", str)
+
+	return str
+}
+
+func EndEnterPrise() string {
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/finished"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "157475501840007476"
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+	fmt.Println("strwowowowowo", str)
+
+	return str
+}
+
+func GetEnterPriseDetail() (string, string) {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/preview"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "157594023610024377"
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+	fmt.Println("strwowowowowo", str)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var urlOne string
+	urlOne = respJSON["data"].(map[string]interface{})["url"].(string)
+	fmt.Println("url", urlOne)
+	return str, urlOne
+}
+
+func CreateNewUploadPact(name string) string {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/createByFile"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+
+	//maprequest["contractCode"] = "102020620701056856"
+
+	maprequest["contractName"] = "手机购买交易合同"
+
+	maprequest["signCount"] = 10
+
+	maprequest["docName"] = "美国员工保密协议"
+
+	//file := "C:/Users/28169/Desktop/打印单.pdf"
+	//
+	//fileBytes, err := ioutil.ReadFile(file) // 读取file
+	//
+	//contractBase64 := base64.StdEncoding.EncodeToString(fileBytes) // 加密成base64字符串
+
+	//fmt.Println(contractBase64)
+	maprequest["contractBase64"] = name
+
+	//添加企业成员 里面的USERID
+	maprequest["creator"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
+
+	maprequest["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
+
+	maprequest["signValidDays"] = 90
+
+	maprequest["sysnUrl"] = "https://kuyi.shengws.com/chenxuemin1.png"
+
+	maprequest["asyncUrl"] = "https://kuyi.shengws.com/chenxuemin1.png"
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	fmt.Println("strwwoowowow", str)
+	return str
+}