历史排班

controllers/dialysis_api_controller.go

@@ -123,6 +123,18 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/dialysis/patientsflow", &DialysisApiController{}, "Get:GetDialysisPatientsFlow")
 
 	beego.Router("/api/patient/getlongdialysisadvicetoday", &DialysisApiController{}, "Get:GetLongDialysisAdviceToday")
+
+	beego.Router("/api/patient/getpatientlist", &DialysisApiController{}, "Get:GetPatientList")
+
+	beego.Router("/api/patient/getprescriptionloglist", &DialysisApiController{}, "Get:GetPrescriptionLogList")
+
+	beego.Router("/api/patient/getbeforloglist", &DialysisApiController{}, "Get:GetBeforLogList")
+
+	beego.Router("/api/patient/getdocloglist", &DialysisApiController{}, "Get:GetDocLogList")
+
+	beego.Router("/api/patient/getmonitorloglist", &DialysisApiController{}, "Get:GetMonitorLogList")
+
+	beego.Router("/api/patient/getafterloglist", &DialysisApiController{}, "Get:GetAfterLogList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -7182,3 +7194,239 @@ func (this *DialysisApiController) GetLongDialysisAdviceToday() {
 		return
 	}
 }
+
+func (this *DialysisApiController) GetPatientList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	keyWord := this.GetString("keyword")
+	patientList, err := service.GetPrescriptionPatientList(orgId, keyWord)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"patientList": patientList,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetPrescriptionLogList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	record_date := this.GetString("record_date")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDateTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDateTime = theTime.Unix()
+	}
+
+	prescriptionlogList, total, err := service.GetPrescriptionLogList(patient_id, page, limit, recordDateTime, orgId)
+
+	patients, _ := service.GetAllPatientLog(orgId)
+
+	role, _ := service.GetAllDoctorLog(orgId)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescriptionlogList": prescriptionlogList,
+			"total":               total,
+			"patients":            patients,
+			"role":                role,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetBeforLogList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	record_date := this.GetString("record_date")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDateTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDateTime = theTime.Unix()
+	}
+	beforLogList, total, err := service.GetBeforLogList(patient_id, page, limit, recordDateTime, orgId)
+
+	patients, _ := service.GetAllPatientLog(orgId)
+
+	role, _ := service.GetAllDoctorLog(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"beforLogList": beforLogList,
+			"total":        total,
+			"patients":     patients,
+			"role":         role,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetDocLogList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	record_date := this.GetString("record_date")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDateTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDateTime = theTime.Unix()
+	}
+	adviceLogList, total, err := service.GetDocLogList(patient_id, page, limit, recordDateTime, orgId)
+
+	patients, _ := service.GetAllPatientLog(orgId)
+
+	role, _ := service.GetAllDoctorLog(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"adviceLogList": adviceLogList,
+			"total":         total,
+			"patients":      patients,
+			"role":          role,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetMonitorLogList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	record_date := this.GetString("record_date")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDateTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDateTime = theTime.Unix()
+	}
+	monitorLogList, total, err := service.GetMonitorLogList(patient_id, page, limit, recordDateTime, orgId)
+
+	patients, _ := service.GetAllPatientLog(orgId)
+
+	role, _ := service.GetAllDoctorLog(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"monitorLogList": monitorLogList,
+			"total":          total,
+			"patients":       patients,
+			"role":           role,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *DialysisApiController) GetAfterLogList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	record_date := this.GetString("record_date")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var recordDateTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordDateTime = theTime.Unix()
+	}
+	afterLogList, total, err := service.GetAfterLogList(patient_id, page, limit, recordDateTime, orgId)
+
+	patients, _ := service.GetAllPatientLog(orgId)
+
+	role, _ := service.GetAllDoctorLog(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"afterLogList": afterLogList,
+			"total":        total,
+			"patients":     patients,
+			"role":         role,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/his_print_api_controller.go

@@ -5,15 +5,9 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"bytes"
-	"encoding/json"
-	"encoding/xml"
 	"fmt"
 	"github.com/astaxie/beego"
-	"io/ioutil"
-	"net/http"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -32,205 +26,205 @@ func HisPrintApiRegistRouters() {
 	beego.Router("/api/his/prescription/summary", &HisPrintApiController{}, "get:GetUnChargePrescriptionSummary")
 	beego.Router("/api/his/label/create", &HisPrintApiController{}, "get:CreateLablePrint")
 	beego.Router("/api/his/label/get", &HisPrintApiController{}, "get:GetLablePrint")
-	beego.Router("/api/his/label/send", &HisPrintApiController{}, "get:SendApplyCode")
+	//beego.Router("/api/his/label/send", &HisPrintApiController{}, "get:SendApplyCode")
 }
 
-func (c *HisPrintApiController) SendApplyCode() {
-	list, _ := service.GetAllLisDataFor10191(c.GetAdminUserInfo().CurrentOrgId)
-	if len(list) > 0 {
-		//插入中间库中
-		for _, item := range list {
-			if len(item.ApplyCode) == 0 {
-				var apply models.JYApply
-				apply.BedCode = ""
-				apply.PatientName = item.Patient.Name
-				idCard := item.Patient.IdCardNo // 身份证号码示例
-				age, err := GetAge(idCard)
-				if err != nil {
-					age = int(item.Patient.Age)
-					fmt.Println("计算年龄时出错:", err)
-				}
-
-				apply.Age = strconv.FormatInt(int64(age), 10)
-				apply.AgeUnit = "岁"
-				if item.Patient.Gender == 1 {
-					apply.Sex = "男"
-				} else if item.Patient.Gender == 2 {
-					apply.Sex = "女"
-				} else {
-					apply.Sex = "不详"
-				}
-				apply.RegisterCode = ""
-				apply.Diagnosis = ""
-				apply.Ward = ""
-				role, _ := service.GetAdminUserRole(2398, c.GetAdminUserInfo().CurrentOrgId)
-				apply.SendDoctor = role.UserName
-				apply.PatientType = 1
-				apply.PatientPhone = item.Patient.Phone
-				//applys = append(applys, apply)
-				var jYApplyDetails []models.CustomerApplyDetail
-
-				if len(item.ItemIds) > 0 {
-					team_ids := strings.Split(item.ItemIds, ",")
-					for index, subItem := range team_ids {
-						//判断一些需要拆分的组套 血透体检(定量)：需要拆分出传染病检查(定性)，丙型肝炎抗体测试，血透体检(定量)
-						if subItem == "267" {
-							//血透体检(定量)
-							var jYApplyDetail models.CustomerApplyDetail
-							id, _ := strconv.ParseInt(subItem, 10, 64)
-							jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
-							jYApplyDetail.RowIndex = int64(index + 1)
-							jYApplyDetail.Barcode = ""
-							jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-							jYApplyDetail.Comment = ""
-							jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-							jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
-
-							//丙型肝炎抗体测定
-							var jYApplyDetail2 models.CustomerApplyDetail
-							id2, _ := strconv.ParseInt("26701", 10, 64)
-							jYApplyDetail2.CustomerChargeItemCode = strconv.FormatInt(id2, 10)
-							jYApplyDetail2.RowIndex = int64(index + 1)
-							jYApplyDetail2.Barcode = ""
-							jYApplyDetail2.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-							jYApplyDetail2.Comment = ""
-							jYApplyDetail2.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-							jYApplyDetails = append(jYApplyDetails, jYApplyDetail2)
-
-							//传染病检查(定性)
-							var jYApplyDetail3 models.CustomerApplyDetail
-							id3, _ := strconv.ParseInt("26700", 10, 64)
-							jYApplyDetail3.CustomerChargeItemCode = strconv.FormatInt(id3, 10)
-							jYApplyDetail3.RowIndex = int64(index + 1)
-							jYApplyDetail3.Barcode = ""
-							jYApplyDetail3.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-							jYApplyDetail3.Comment = ""
-							jYApplyDetail3.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-							jYApplyDetails = append(jYApplyDetails, jYApplyDetail3)
-
-						}
-
-						//判断一些需要拆分的组套 血透体检(定性)：需要拆分出传染病检查(定性)，丙型肝炎抗体测试，血透体检(定性)
-						if subItem == "424" {
-							//血透体检(定性)
-							var jYApplyDetail models.CustomerApplyDetail
-							id, _ := strconv.ParseInt(subItem, 10, 64)
-							jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
-							jYApplyDetail.RowIndex = int64(index + 1)
-							jYApplyDetail.Barcode = ""
-							jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-							jYApplyDetail.Comment = ""
-							jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-							jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
-
-							//丙型肝炎抗体测定
-							var jYApplyDetail2 models.CustomerApplyDetail
-							id2, _ := strconv.ParseInt("42401", 10, 64)
-							jYApplyDetail2.CustomerChargeItemCode = strconv.FormatInt(id2, 10)
-							jYApplyDetail2.RowIndex = int64(index + 1)
-							jYApplyDetail2.Barcode = ""
-							jYApplyDetail2.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-							jYApplyDetail2.Comment = ""
-							jYApplyDetail2.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-							jYApplyDetails = append(jYApplyDetails, jYApplyDetail2)
-
-							//传染病检查(定性)
-							var jYApplyDetail3 models.CustomerApplyDetail
-							id3, _ := strconv.ParseInt("42400", 10, 64)
-							jYApplyDetail3.CustomerChargeItemCode = strconv.FormatInt(id3, 10)
-							jYApplyDetail3.RowIndex = int64(index + 1)
-							jYApplyDetail3.Barcode = ""
-							jYApplyDetail3.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-							jYApplyDetail3.Comment = ""
-							jYApplyDetail3.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-							jYApplyDetails = append(jYApplyDetails, jYApplyDetail3)
-
-						}
-						var jYApplyDetail models.CustomerApplyDetail
-						id, _ := strconv.ParseInt(subItem, 10, 64)
-						jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
-						jYApplyDetail.RowIndex = int64(index + 1)
-						jYApplyDetail.Barcode = ""
-						jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-						jYApplyDetail.Comment = ""
-						jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-						jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
-					}
-				}
-
-				if len(item.ProjectIds) > 0 {
-					team_ids := strings.Split(item.ProjectIds, ",")
-					for index, subItem := range team_ids {
-						var jYApplyDetail models.CustomerApplyDetail
-						id, _ := strconv.ParseInt(subItem, 10, 64)
-						jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
-						jYApplyDetail.RowIndex = int64(index)
-						jYApplyDetail.Barcode = ""
-						jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
-						jYApplyDetail.Comment = ""
-						jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
-						jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
-					}
-				}
-				result := PostInspectApply(key, apply, jYApplyDetails)
-				if result.Res == 0 {
-					item.ApplyCode = result.JYApplyResult.ApplyCode
-					jsonData, err := json.Marshal(apply)
-					if err != nil {
-						fmt.Println("转换为JSON时发生错误:", err)
-					}
-					jsonStr := string(jsonData)
-					jsonData2, err2 := json.Marshal(jYApplyDetails)
-					if err2 != nil {
-						fmt.Println("转换为JSON时发生错误:", err2)
-					}
-					jsonStr2 := string(jsonData2)
-
-					jsonData3, err3 := json.Marshal(result)
-					if err3 != nil {
-						fmt.Println("转换为JSON时发生错误:", err3)
-					}
-					jsonStr3 := string(jsonData3)
-					saveSuccessLog(jsonStr3, jsonStr+"\r\n"+jsonStr2, "申清单成功日志", "申清单")
-					err1 := service.CreateLabelPrint(&item)
-					if err1 == nil {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "发送成功",
-						})
-					}
-					return
-				} else {
-					jsonData, err := json.Marshal(apply)
-					if err != nil {
-						fmt.Println("转换为JSON时发生错误:", err)
-
-					}
-					jsonStr := string(jsonData)
-
-					jsonData2, err2 := json.Marshal(jYApplyDetails)
-					if err2 != nil {
-						fmt.Println("转换为JSON时发生错误:", err2)
-
-					}
-					jsonStr2 := string(jsonData2)
-
-					jsonData3, err3 := json.Marshal(result)
-					if err3 != nil {
-						fmt.Println("转换为JSON时发生错误:", err3)
-
-					}
-					jsonStr3 := string(jsonData3)
-
-					SaveErrorLog(jsonStr3, jsonStr+"\r\n"+jsonStr2, "申清单错误日志", "申清单")
-
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-					return
-				}
-			}
-		}
-
-	}
-}
+//func (c *HisPrintApiController) SendApplyCode() {
+//	list, _ := service.GetAllLisDataFor10191(c.GetAdminUserInfo().CurrentOrgId)
+//	if len(list) > 0 {
+//		//插入中间库中
+//		for _, item := range list {
+//			if len(item.ApplyCode) == 0 {
+//				var apply models.JYApply
+//				apply.BedCode = ""
+//				apply.PatientName = item.Patient.Name
+//				idCard := item.Patient.IdCardNo // 身份证号码示例
+//				age, err := GetAge(idCard)
+//				if err != nil {
+//					age = int(item.Patient.Age)
+//					fmt.Println("计算年龄时出错:", err)
+//				}
+//
+//				apply.Age = strconv.FormatInt(int64(age), 10)
+//				apply.AgeUnit = "岁"
+//				if item.Patient.Gender == 1 {
+//					apply.Sex = "男"
+//				} else if item.Patient.Gender == 2 {
+//					apply.Sex = "女"
+//				} else {
+//					apply.Sex = "不详"
+//				}
+//				apply.RegisterCode = ""
+//				apply.Diagnosis = ""
+//				apply.Ward = ""
+//				role, _ := service.GetAdminUserRole(2398, c.GetAdminUserInfo().CurrentOrgId)
+//				apply.SendDoctor = role.UserName
+//				apply.PatientType = 1
+//				apply.PatientPhone = item.Patient.Phone
+//				//applys = append(applys, apply)
+//				var jYApplyDetails []models.CustomerApplyDetail
+//
+//				if len(item.ItemIds) > 0 {
+//					team_ids := strings.Split(item.ItemIds, ",")
+//					for index, subItem := range team_ids {
+//						//判断一些需要拆分的组套 血透体检(定量)：需要拆分出传染病检查(定性)，丙型肝炎抗体测试，血透体检(定量)
+//						if subItem == "267" {
+//							//血透体检(定量)
+//							var jYApplyDetail models.CustomerApplyDetail
+//							id, _ := strconv.ParseInt(subItem, 10, 64)
+//							jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
+//							jYApplyDetail.RowIndex = int64(index + 1)
+//							jYApplyDetail.Barcode = ""
+//							jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//							jYApplyDetail.Comment = ""
+//							jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//							jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
+//
+//							//丙型肝炎抗体测定
+//							var jYApplyDetail2 models.CustomerApplyDetail
+//							id2, _ := strconv.ParseInt("26701", 10, 64)
+//							jYApplyDetail2.CustomerChargeItemCode = strconv.FormatInt(id2, 10)
+//							jYApplyDetail2.RowIndex = int64(index + 1)
+//							jYApplyDetail2.Barcode = ""
+//							jYApplyDetail2.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//							jYApplyDetail2.Comment = ""
+//							jYApplyDetail2.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//							jYApplyDetails = append(jYApplyDetails, jYApplyDetail2)
+//
+//							//传染病检查(定性)
+//							var jYApplyDetail3 models.CustomerApplyDetail
+//							id3, _ := strconv.ParseInt("26700", 10, 64)
+//							jYApplyDetail3.CustomerChargeItemCode = strconv.FormatInt(id3, 10)
+//							jYApplyDetail3.RowIndex = int64(index + 1)
+//							jYApplyDetail3.Barcode = ""
+//							jYApplyDetail3.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//							jYApplyDetail3.Comment = ""
+//							jYApplyDetail3.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//							jYApplyDetails = append(jYApplyDetails, jYApplyDetail3)
+//
+//						}
+//
+//						//判断一些需要拆分的组套 血透体检(定性)：需要拆分出传染病检查(定性)，丙型肝炎抗体测试，血透体检(定性)
+//						if subItem == "424" {
+//							//血透体检(定性)
+//							var jYApplyDetail models.CustomerApplyDetail
+//							id, _ := strconv.ParseInt(subItem, 10, 64)
+//							jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
+//							jYApplyDetail.RowIndex = int64(index + 1)
+//							jYApplyDetail.Barcode = ""
+//							jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//							jYApplyDetail.Comment = ""
+//							jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//							jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
+//
+//							//丙型肝炎抗体测定
+//							var jYApplyDetail2 models.CustomerApplyDetail
+//							id2, _ := strconv.ParseInt("42401", 10, 64)
+//							jYApplyDetail2.CustomerChargeItemCode = strconv.FormatInt(id2, 10)
+//							jYApplyDetail2.RowIndex = int64(index + 1)
+//							jYApplyDetail2.Barcode = ""
+//							jYApplyDetail2.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//							jYApplyDetail2.Comment = ""
+//							jYApplyDetail2.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//							jYApplyDetails = append(jYApplyDetails, jYApplyDetail2)
+//
+//							//传染病检查(定性)
+//							var jYApplyDetail3 models.CustomerApplyDetail
+//							id3, _ := strconv.ParseInt("42400", 10, 64)
+//							jYApplyDetail3.CustomerChargeItemCode = strconv.FormatInt(id3, 10)
+//							jYApplyDetail3.RowIndex = int64(index + 1)
+//							jYApplyDetail3.Barcode = ""
+//							jYApplyDetail3.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//							jYApplyDetail3.Comment = ""
+//							jYApplyDetail3.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//							jYApplyDetails = append(jYApplyDetails, jYApplyDetail3)
+//
+//						}
+//						var jYApplyDetail models.CustomerApplyDetail
+//						id, _ := strconv.ParseInt(subItem, 10, 64)
+//						jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
+//						jYApplyDetail.RowIndex = int64(index + 1)
+//						jYApplyDetail.Barcode = ""
+//						jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//						jYApplyDetail.Comment = ""
+//						jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//						jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
+//					}
+//				}
+//
+//				if len(item.ProjectIds) > 0 {
+//					team_ids := strings.Split(item.ProjectIds, ",")
+//					for index, subItem := range team_ids {
+//						var jYApplyDetail models.CustomerApplyDetail
+//						id, _ := strconv.ParseInt(subItem, 10, 64)
+//						jYApplyDetail.CustomerChargeItemCode = strconv.FormatInt(id, 10)
+//						jYApplyDetail.RowIndex = int64(index)
+//						jYApplyDetail.Barcode = ""
+//						jYApplyDetail.CustomerBarcode = strconv.FormatInt(item.ID, 10)
+//						jYApplyDetail.Comment = ""
+//						jYApplyDetail.TakeSampleTime = time.Unix(item.Ctime, 0).Format("2006-01-02 15:04:05")
+//						jYApplyDetails = append(jYApplyDetails, jYApplyDetail)
+//					}
+//				}
+//				result := PostInspectApply(key, apply, jYApplyDetails)
+//				if result.Res == 0 {
+//					item.ApplyCode = result.JYApplyResult.ApplyCode
+//					jsonData, err := json.Marshal(apply)
+//					if err != nil {
+//						fmt.Println("转换为JSON时发生错误:", err)
+//					}
+//					jsonStr := string(jsonData)
+//					jsonData2, err2 := json.Marshal(jYApplyDetails)
+//					if err2 != nil {
+//						fmt.Println("转换为JSON时发生错误:", err2)
+//					}
+//					jsonStr2 := string(jsonData2)
+//
+//					jsonData3, err3 := json.Marshal(result)
+//					if err3 != nil {
+//						fmt.Println("转换为JSON时发生错误:", err3)
+//					}
+//					jsonStr3 := string(jsonData3)
+//					saveSuccessLog(jsonStr3, jsonStr+"\r\n"+jsonStr2, "申清单成功日志", "申清单")
+//					err1 := service.CreateLabelPrint(&item)
+//					if err1 == nil {
+//						c.ServeSuccessJSON(map[string]interface{}{
+//							"msg": "发送成功",
+//						})
+//					}
+//					return
+//				} else {
+//					jsonData, err := json.Marshal(apply)
+//					if err != nil {
+//						fmt.Println("转换为JSON时发生错误:", err)
+//
+//					}
+//					jsonStr := string(jsonData)
+//
+//					jsonData2, err2 := json.Marshal(jYApplyDetails)
+//					if err2 != nil {
+//						fmt.Println("转换为JSON时发生错误:", err2)
+//
+//					}
+//					jsonStr2 := string(jsonData2)
+//
+//					jsonData3, err3 := json.Marshal(result)
+//					if err3 != nil {
+//						fmt.Println("转换为JSON时发生错误:", err3)
+//
+//					}
+//					jsonStr3 := string(jsonData3)
+//
+//					SaveErrorLog(jsonStr3, jsonStr+"\r\n"+jsonStr2, "申清单错误日志", "申清单")
+//
+//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+//					return
+//				}
+//			}
+//		}
+//
+//	}
+//}
 
 func (c *HisPrintApiController) GetLablePrint() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -431,86 +425,86 @@ func calculateAge(birthDate time.Time) int {
 }
 
 // 送检单
-func PostInspectApply(key string, apply models.JYApply, list []models.CustomerApplyDetail) models.InspectApplyData {
-	// 构建SOAP请求数据
-	requestData := &models.JYApplyEnvelope{
-		Soap: "http://schemas.xmlsoap.org/soap/envelope/",
-		Xsi:  "http://www.w3.org/2001/XMLSchema-instance",
-		Xsd:  "http://www.w3.org/2001/XMLSchema",
-		Body: models.JYApplyBody{
-			InspectApplyReq: models.InspectApplyReq{
-				XMLName: xml.Name{Local: "InspectApplyByInstituteItemCode", Space: "http://tempuri.org/"},
-				ApiKey:  key,
-				Apply:   apply,
-				ApplyDetailList: struct {
-					CustomerApplyDetail []models.CustomerApplyDetail `xml:"CustomerApplyDetail"`
-				}{
-					CustomerApplyDetail: list,
-				},
-				ApplyAdditional: nil,
-			},
-		},
-	}
-
-	// 将SOAP请求数据转换为XML格式
-	requestBody, err := xml.Marshal(requestData)
-	if err != nil {
-		fmt.Println("XML Marshal error:", err)
-	}
-	fmt.Println(string(requestBody))
-
-	// 创建POST请求
-	url := "http://gpis.cnhiqc.com:9799/InstituteLISService.asmx"
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
-	if err != nil {
-		fmt.Println("Request creation error:", err)
-	}
-
-	// 设置请求头
-	req.Header.Set("Content-Type", "text/xml; charset=utf-8")
-	req.Header.Set("Content-Length", "length")
-	req.Header.Set("SOAPAction", "http://tempuri.org/InspectApplyByInstituteItemCode")
-
-	// 发送请求
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		fmt.Println("Request error:", err)
-	}
-	defer resp.Body.Close()
-
-	// 读取响应数据
-	responseBody, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("Response read error:", err)
-
-	}
-	fmt.Println(string(responseBody))
-
-	// 解析XML数据
-	var envelope_four models.EnvelopeFour
-	err2 := xml.Unmarshal(responseBody, &envelope_four)
-	if err2 != nil {
-		fmt.Println("XML Unmarshal error:", err2)
-
-	}
-
-	// 获取GetReportListResult的JSON字符串
-	jsonStr := envelope_four.Body.InspectApplyByInstituteItemCodeResponse.InspectApply
-
-	// 解析JSON字符串到结构体
-	var reportData models.InspectApplyData
-	err = json.Unmarshal([]byte(jsonStr), &reportData)
-
-	if err != nil {
-		fmt.Println("JSON Unmarshal error:", err)
-	}
-	if reportData.Res != 0 {
-		fmt.Println("Data:", reportData)
-		//return reportData.JYApplyResult
-	}
-	return reportData
-}
+//func PostInspectApply(key string, apply models.JYApply, list []models.CustomerApplyDetail) models.InspectApplyData {
+//	// 构建SOAP请求数据
+//	requestData := &models.JYApplyEnvelope{
+//		Soap: "http://schemas.xmlsoap.org/soap/envelope/",
+//		Xsi:  "http://www.w3.org/2001/XMLSchema-instance",
+//		Xsd:  "http://www.w3.org/2001/XMLSchema",
+//		Body: models.JYApplyBody{
+//			InspectApplyReq: models.InspectApplyReq{
+//				XMLName: xml.Name{Local: "InspectApplyByInstituteItemCode", Space: "http://tempuri.org/"},
+//				ApiKey:  key,
+//				Apply:   apply,
+//				ApplyDetailList: struct {
+//					CustomerApplyDetail []models.CustomerApplyDetail `xml:"CustomerApplyDetail"`
+//				}{
+//					CustomerApplyDetail: list,
+//				},
+//				ApplyAdditional: nil,
+//			},
+//		},
+//	}
+//
+//	// 将SOAP请求数据转换为XML格式
+//	requestBody, err := xml.Marshal(requestData)
+//	if err != nil {
+//		fmt.Println("XML Marshal error:", err)
+//	}
+//	fmt.Println(string(requestBody))
+//
+//	// 创建POST请求
+//	url := "http://gpis.cnhiqc.com:9799/InstituteLISService.asmx"
+//	req, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBody))
+//	if err != nil {
+//		fmt.Println("Request creation error:", err)
+//	}
+//
+//	// 设置请求头
+//	req.Header.Set("Content-Type", "text/xml; charset=utf-8")
+//	req.Header.Set("Content-Length", "length")
+//	req.Header.Set("SOAPAction", "http://tempuri.org/InspectApplyByInstituteItemCode")
+//
+//	// 发送请求
+//	client := &http.Client{}
+//	resp, err := client.Do(req)
+//	if err != nil {
+//		fmt.Println("Request error:", err)
+//	}
+//	defer resp.Body.Close()
+//
+//	// 读取响应数据
+//	responseBody, err := ioutil.ReadAll(resp.Body)
+//	if err != nil {
+//		fmt.Println("Response read error:", err)
+//
+//	}
+//	fmt.Println(string(responseBody))
+//
+//	// 解析XML数据
+//	var envelope_four models.EnvelopeFour
+//	err2 := xml.Unmarshal(responseBody, &envelope_four)
+//	if err2 != nil {
+//		fmt.Println("XML Unmarshal error:", err2)
+//
+//	}
+//
+//	// 获取GetReportListResult的JSON字符串
+//	jsonStr := envelope_four.Body.InspectApplyByInstituteItemCodeResponse.InspectApply
+//
+//	// 解析JSON字符串到结构体
+//	var reportData models.InspectApplyData
+//	err = json.Unmarshal([]byte(jsonStr), &reportData)
+//
+//	if err != nil {
+//		fmt.Println("JSON Unmarshal error:", err)
+//	}
+//	if reportData.Res != 0 {
+//		fmt.Println("Data:", reportData)
+//		//return reportData.JYApplyResult
+//	}
+//	return reportData
+//}
 
 func SaveErrorLog(result string, request string, infno string, desc string) {
 	//org_id, _ := beego.AppConfig.Int64("org_id")

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -543,13 +543,13 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "物联网上传",
 					Status:      1,
 				}
@@ -634,13 +634,13 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "物联网上传",
 					Status:      1,
 				}
@@ -676,13 +676,13 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "物联网上传",
 					Status:      1,
 				}
@@ -717,13 +717,13 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			//记录日志
 			byterequest, _ := json.Marshal(dialysisPrescribe)
 			prescriptionLog := models.XtDialysisPrescriptionLog{
-				UserOrgId:   dialysisPrescribe.UserOrgId,
+				UserOrgId:   adminUserInfo.Org.Id,
 				Ctime:       time.Now().Unix(),
 				Mtime:       0,
 				ErrLog:      string(byterequest),
 				AdminUserId: adminUserInfo.AdminUser.Id,
 				RecordDate:  dialysisPrescribe.RecordDate,
-				PatientId:   dialysisPrescribe.PatientId,
+				PatientId:   id,
 				Source:      "物联网上传",
 				Status:      1,
 			}
@@ -849,13 +849,13 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		//记录日志
 		byterequest, _ := json.Marshal(evaluation)
 		beforLog := models.XtAssessmentBeforeDislysisLog{
-			UserOrgId:   evaluation.UserOrgId,
+			UserOrgId:   adminUserInfo.Org.Id,
 			Ctime:       time.Now().Unix(),
 			Mtime:       0,
 			ErrLog:      string(byterequest),
 			AdminUserId: adminUserInfo.AdminUser.Id,
 			RecordDate:  evaluation.AssessmentDate,
-			PatientId:   evaluation.PatientId,
+			PatientId:   id,
 			Source:      "物联网上传",
 			Status:      1,
 		}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1631,7 +1631,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 			Status:      1,
 			ErrLog:      string(byterequest),
 			AdminUserId: adminUserInfo.AdminUser.Id,
-			Ctime:       0,
+			Ctime:       time.Now().Unix(),
 			Mtime:       0,
 			Source:      "手机端修改保存透后评估",
 		}

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -211,7 +211,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		PatientId:   record.PatientId,
 		Module:      1,
 		AdminUserId: adminInfo.AdminUser.Id,
-		Ctime:       0,
+		Ctime:       time.Now().Unix(),
 		Mtime:       0,
 		Status:      1,
 		UserOrgId:   record.UserOrgId,
@@ -663,6 +663,24 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 				IsExport:     5,
 			}
 			createErr := service.CreateScheduleTwo(newSchedule)
+
+			//记录日志
+			byterequest, _ := json.Marshal(newSchedule)
+			scheduleLog := models.XtScheduleLog{
+				UserOrgId:   adminUserInfo.Org.Id,
+				RecordDate:  scheduleDate.Unix(),
+				Status:      1,
+				PatientId:   patientID,
+				Ctime:       time.Now().Unix(),
+				Mtime:       0,
+				ErrLog:      string(byterequest),
+				Source:      "手机端新增排班",
+				Module:      1,
+				AdminUserId: adminUserInfo.AdminUser.Id,
+			}
+
+			service.CreateScheduleLog(scheduleLog)
+
 			redis := service.RedisClient()
 			timeStr := time.Now().Format("2006-01-02")
 			key := "scheduals_" + timeStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
@@ -725,6 +743,23 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 					daySchedule.ScheduleType = scheduleType
 					daySchedule.UpdatedTime = time.Now().Unix()
 					err := service.UpdateSchedule(&daySchedule)
+
+					//记录日志
+					byterequest, _ := json.Marshal(daySchedule)
+					scheduleLog := models.XtScheduleLog{
+						UserOrgId:   adminUserInfo.Org.Id,
+						RecordDate:  scheduleDate.Unix(),
+						Status:      1,
+						PatientId:   patientID,
+						Ctime:       time.Now().Unix(),
+						Mtime:       0,
+						ErrLog:      string(byterequest),
+						Source:      "手机端修改排班",
+						Module:      1,
+						AdminUserId: adminUserInfo.AdminUser.Id,
+					}
+					service.CreateScheduleLog(scheduleLog)
+
 					redis := service.RedisClient()
 
 					timeStr := time.Now().Format("2006-01-02")

controllers/mobile_api_controllers/patient_api_controller.go

@@ -669,6 +669,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if item.ExecutionState == 2 {
 					advice = item
 				}
+
+				//记录日志
+				byterequest, _ := json.Marshal(item)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   item.UserOrgId,
+					PatientId:   item.PatientId,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      2,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端执行医嘱",
+					RecordDate:  item.AdviceDate,
+				}
+
+				service.CreateDoctorAdviceLog(adviceLog)
 			}
 		} else {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
@@ -737,22 +754,6 @@ 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()
@@ -802,11 +803,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			err = service.BatchExceOldDoctorAdvice(&advices, ids)
 
 			//记录日志
-			byterequest, _ := json.Marshal(advices)
+			byterequest, _ := json.Marshal(advice)
 			adviceLog := models.XtDoctorAdviceLog{
-				UserOrgId:   advices.UserOrgId,
-				PatientId:   advices.PatientId,
-				AdminUserId: advices.ExecutionStaff,
+				UserOrgId:   advice.UserOrgId,
+				PatientId:   advice.PatientId,
+				AdminUserId: adminUserInfo.AdminUser.Id,
 				Module:      2,
 				ErrLog:      string(byterequest),
 				Status:      1,
@@ -1994,6 +1995,22 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 				if item.CheckState == 0 {
 					advice = item
 				}
+
+				//记录日志
+				byterequest, _ := json.Marshal(advices)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   item.PatientId,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      3,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端核对医嘱",
+					RecordDate:  item.AdviceDate,
+				}
+				service.CreateDoctorAdviceLog(adviceLog)
 			}
 			if advice.CheckState == 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
@@ -2011,6 +2028,22 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 					advice = item
 
 				}
+
+				//记录日志
+				byterequest, _ := json.Marshal(advices)
+				adviceLog := models.XtDoctorAdviceLog{
+					UserOrgId:   adminUserInfo.Org.Id,
+					PatientId:   item.PatientId,
+					AdminUserId: adminUserInfo.AdminUser.Id,
+					Module:      3,
+					ErrLog:      string(byterequest),
+					Status:      1,
+					Ctime:       time.Now().Unix(),
+					Mtime:       0,
+					Source:      "手机端核对医嘱",
+					RecordDate:  item.AdviceDate,
+				}
+				service.CreateDoctorAdviceLog(adviceLog)
 			}
 			if advice.CheckState == 1 {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
@@ -2059,22 +2092,6 @@ 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 值
@@ -2451,13 +2468,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			//记录日志
 			byterequest, _ := json.Marshal(newprescribe)
 			prescriptionLog := models.XtDialysisPrescriptionLog{
-				UserOrgId:   newprescribe.UserOrgId,
+				UserOrgId:   adminUserInfo.Org.Id,
 				Ctime:       time.Now().Unix(),
 				Mtime:       0,
 				ErrLog:      string(byterequest),
 				AdminUserId: adminUserInfo.AdminUser.Id,
 				RecordDate:  newprescribe.RecordDate,
-				PatientId:   newprescribe.PatientId,
+				PatientId:   id,
 				Source:      "手机端新增透前评估插入处方",
 				Status:      1,
 			}
@@ -2506,13 +2523,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			//记录日志
 			byterequest, _ := json.Marshal(newprescribe)
 			prescriptionLog := models.XtDialysisPrescriptionLog{
-				UserOrgId:   newprescribe.UserOrgId,
+				UserOrgId:   adminUserInfo.Org.Id,
 				Ctime:       time.Now().Unix(),
 				Mtime:       0,
 				ErrLog:      string(byterequest),
 				AdminUserId: adminUserInfo.AdminUser.Id,
 				RecordDate:  newprescribe.RecordDate,
-				PatientId:   newprescribe.PatientId,
+				PatientId:   id,
 				Source:      "手机端新增透前评估插入处方",
 				Status:      1,
 			}
@@ -2610,13 +2627,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "手机端新增透前评估插入处方",
 					Status:      1,
 				}
@@ -2660,13 +2677,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "手机端新增透前评估插入处方",
 					Status:      1,
 				}
@@ -2763,13 +2780,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "手机端新增透前评估插入处方",
 					Status:      1,
 				}
@@ -2816,13 +2833,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "手机端新增透前评估插入处方",
 					Status:      1,
 				}
@@ -2920,13 +2937,13 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
 				prescriptionLog := models.XtDialysisPrescriptionLog{
-					UserOrgId:   newprescribe.UserOrgId,
+					UserOrgId:   adminUserInfo.Org.Id,
 					Ctime:       time.Now().Unix(),
 					Mtime:       0,
 					ErrLog:      string(byterequest),
 					AdminUserId: adminUserInfo.AdminUser.Id,
 					RecordDate:  newprescribe.RecordDate,
-					PatientId:   newprescribe.PatientId,
+					PatientId:   id,
 					Source:      "手机端新增透前评估插入处方",
 					Status:      1,
 				}

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -491,8 +491,25 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 	id, _ := this.GetInt64("id")
 	org_id := this.GetMobileAdminUserInfo().Org.Id
 	err := service.DeleteSchedule(id)
+
 	if err == nil {
 		schedule, _ := service.GetScheduleNight(org_id, id)
+
+		//记录日志
+		byterequest, _ := json.Marshal(schedule)
+		xtScheduleLog := models.XtScheduleLog{
+			UserOrgId:   org_id,
+			RecordDate:  schedule.ScheduleDate,
+			Status:      1,
+			PatientId:   schedule.PatientId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			Source:      "手机端删除排班",
+			Module:      5,
+			AdminUserId: this.GetAdminUserInfo().AdminUser.Id,
+		}
+		service.CreateScheduleLog(xtScheduleLog)
 		redis := service.RedisClient()
 		//处方
 		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
@@ -640,6 +657,24 @@ func (this *StaffScheduleApiController) UpdateBloodScheduleMode() {
 		ModeId: mode_id,
 	}
 	service.UpdatedScheduleMode(schedule, id)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//记录日志
+	byterequest, _ := json.Marshal(schedule)
+	scheduleLog := models.XtScheduleLog{
+		UserOrgId:   orgId,
+		RecordDate:  schedule.ScheduleDate,
+		Status:      1,
+		PatientId:   schedule.PatientId,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		ErrLog:      string(byterequest),
+		Source:      "手机端修改排班模式",
+		Module:      5,
+		AdminUserId: this.GetAdminUserInfo().AdminUser.Id,
+	}
+
+	service.CreateScheduleLog(scheduleLog)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "保存成功",
 	})
@@ -663,6 +698,23 @@ func (this *StaffScheduleApiController) UpdateBloodSchedule() {
 	_, errschedulecode := service.GetPatientScheduleIsExist(start_time, schedule_type, bed_id, orgid)
 	if errschedulecode == gorm.ErrRecordNotFound {
 		service.UpdatedSchedule(schedule, patient_id, start_time, schedule_type, bed_id)
+
+		//记录日志
+		byterequest, _ := json.Marshal(schedule)
+		scheduleLog := models.XtScheduleLog{
+			UserOrgId:   orgid,
+			RecordDate:  schedule.ScheduleDate,
+			Status:      1,
+			PatientId:   schedule.PatientId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			Source:      "手机修改排班班次",
+			Module:      5,
+			AdminUserId: this.GetMobileAdminUserInfo().AdminUser.Id,
+		}
+
+		service.CreateScheduleLog(scheduleLog)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msgerr": "保存成功",
 		})
@@ -1132,6 +1184,22 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 		}
 		schedu.DialysisMachineName = DialysisMachineName1
 		err := service.UpdateScheduleById(schedule.ID, schedu, id, sch)
+		//记录日志
+		byterequest, _ := json.Marshal(schedule)
+		scheduleLog := models.XtScheduleLog{
+			UserOrgId:   org_id,
+			RecordDate:  schedule.ScheduleDate,
+			Status:      1,
+			PatientId:   schedule.PatientId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			Source:      "手机端修改调班",
+			Module:      4,
+			AdminUserId: c.GetMobileAdminUserInfo().AdminUser.Id,
+		}
+
+		service.CreateScheduleLog(scheduleLog)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "ok",
@@ -1171,6 +1239,22 @@ func (c *StaffScheduleApiController) ChangeScheduleBed() {
 		}
 		var err error
 		err = service.CreateSchedule(&xtSchedule, id)
+		//记录日志
+		byterequest, _ := json.Marshal(schedule)
+		scheduleLog := models.XtScheduleLog{
+			UserOrgId:   org_id,
+			RecordDate:  schedule.ScheduleDate,
+			Status:      1,
+			PatientId:   schedule.PatientId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			Source:      "手机端新建调班",
+			Module:      1,
+			AdminUserId: c.GetMobileAdminUserInfo().AdminUser.Id,
+		}
+
+		service.CreateScheduleLog(scheduleLog)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "ok",

controllers/schedule_api_controller.go

@@ -1558,6 +1558,23 @@ func (c *ScheduleApiController) CreateSchedule() {
 	schedule.IsExport = 1000
 	err = service.CreateScheduleTwo(&schedule)
 
+	//记录日志
+	byterequest, _ := json.Marshal(schedule)
+	scheduleLog := models.XtScheduleLog{
+		UserOrgId:   adminUserInfo.CurrentOrgId,
+		RecordDate:  schedule.ScheduleDate,
+		Status:      1,
+		PatientId:   schedule.PatientId,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		ErrLog:      string(byterequest),
+		Source:      "电脑端新增排班",
+		Module:      1,
+		AdminUserId: adminUserInfo.AdminUser.Id,
+	}
+
+	service.CreateScheduleLog(scheduleLog)
+
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 
 	redis.Set(key, "", time.Second)
@@ -1900,6 +1917,24 @@ func (c *ScheduleApiController) DeleteSchedule() {
 	schedule.Status = 0
 	schedule.UpdatedTime = time.Now().Unix()
 	err = service.UpdateSchedule(schedule)
+
+	//记录日志
+	byterequest, _ := json.Marshal(schedule)
+	scheduleLog := models.XtScheduleLog{
+		UserOrgId:   adminINfo.CurrentOrgId,
+		RecordDate:  schedule.ScheduleDate,
+		Status:      1,
+		PatientId:   schedule.PatientId,
+		Ctime:       time.Now().Unix(),
+		Mtime:       0,
+		ErrLog:      string(byterequest),
+		Source:      "电脑端删除排班",
+		Module:      5,
+		AdminUserId: adminINfo.AdminUser.Id,
+	}
+
+	service.CreateScheduleLog(scheduleLog)
+
 	redis := service.RedisClient()
 
 	//处方
@@ -2026,6 +2061,23 @@ func (c *ScheduleApiController) ChangeSchedule() {
 			return
 		}
 
+		//记录日志
+		byterequest, _ := json.Marshal(schedule)
+		scheduleLog := models.XtScheduleLog{
+			UserOrgId:   adminINfo.CurrentOrgId,
+			RecordDate:  schedule.ScheduleDate,
+			Status:      1,
+			PatientId:   schedule.PatientId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			Source:      "电脑端改变模式排班",
+			Module:      1,
+			AdminUserId: adminINfo.AdminUser.Id,
+		}
+
+		service.CreateScheduleLog(scheduleLog)
+
 	} else if changeAction == "change_device" {
 		order, err := service.GetOneDialysisOrder(adminINfo.CurrentOrgId, schedule.ScheduleDate, schedule.PatientId)
 		if err != nil {
@@ -2107,6 +2159,23 @@ func (c *ScheduleApiController) ChangeSchedule() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePointScheduleExist)
 			return
 		}
+
+		//记录日志
+		byterequest, _ := json.Marshal(schedule)
+		scheduleLog := models.XtScheduleLog{
+			UserOrgId:   adminINfo.CurrentOrgId,
+			RecordDate:  schedule.ScheduleDate,
+			Status:      1,
+			PatientId:   schedule.PatientId,
+			Ctime:       time.Now().Unix(),
+			Mtime:       0,
+			ErrLog:      string(byterequest),
+			Source:      "电脑端改变分区床位",
+			Module:      4,
+			AdminUserId: adminINfo.AdminUser.Id,
+		}
+
+		service.CreateScheduleLog(scheduleLog)
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return

models/patient_models.go

@@ -2107,3 +2107,21 @@ type XtMonitorRecordLog struct {
 func (XtMonitorRecordLog) TableName() string {
 	return "xt_monitor_record_log"
 }
+
+type XtScheduleLog 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"`
+	RecordDate  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	PatientId   int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
+	Source      string `gorm:"column:source" json:"source" form:"source"`
+	Module      int64  `gorm:"column:module" json:"module" form:"module"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+}
+
+func (XtScheduleLog) TableName() string {
+	return "xt_schedule_log"
+}

service/common_service.go

@@ -3488,7 +3488,7 @@ func GetModeIdCount(startime int64, endtime int64, orgid int64, page int64, limi
 
 func GetScheduleModeIdCount(startime int64, endtime int64, orgid int64, page int64, limit int64) (order []*models.BloodDialysisModeIdCount, err error) {
 
-	db := XTReadDB().Table("xt_schedule as s")
+	db := XTReadDB().Table("xt_schedule as s").Where("s.status = 1")
 	if orgid > 0 {
 		db = db.Where("s.user_org_id = ?", orgid)
 	}

service/gobal_config_service.go

@@ -1146,3 +1146,138 @@ func CheckMobileInformation(id int64, application_status int64, checker int64, c
 	err := XTWriteDB().Model(&models.XtDialysisInformation{}).Where("id = ? and status= 1", id).Update(map[string]interface{}{"application_status": application_status, "checker": checker, "check_time": checker_time}).Error
 	return err
 }
+
+func GetPrescriptionPatientList(orgID int64, keywords string) (patient []*models.Patients, err error) {
+	fmt.Println("keyworsosososo", keywords)
+	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1", orgID)
+	if len(keywords) > 0 {
+		likekey := "%" + keywords + "%"
+		err = db.Where("(name LIKE ?)", likekey).Find(&patient).Error
+	} else {
+		err = db.Find(&patient).Error
+	}
+	return
+}
+
+func GetPrescriptionLogList(patient_id int64, page int64, limit int64, record_date int64, orgId int64) (prescriptionlog []*models.XtDialysisPrescriptionLog, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(prescriptionlog).Where("status =1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if record_date > 0 {
+		db = db.Where("record_date = ?", record_date)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ? ", orgId)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&prescriptionlog).Error
+
+	return prescriptionlog, total, err
+
+}
+
+func GetBeforLogList(patient_id int64, page int64, limit int64, record_date int64, orgId int64) (befor []*models.XtAssessmentBeforeDislysisLog, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(befor).Where("status =1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if record_date > 0 {
+		db = db.Where("record_date = ?", record_date)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ? ", orgId)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&befor).Error
+
+	return befor, total, err
+}
+
+func GetAllPatientLog(orgid int64) (patients []*models.VMMonitorPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status =1", orgid).Find(&patients).Error
+
+	return patients, err
+}
+
+func GetAllDoctorLog(orgid int64) (appRole []*models.App_Role, err error) {
+	err = UserReadDB().Where("org_id = ? AND status = 1", orgid).Find(&appRole).Error
+	return appRole, err
+}
+
+func GetDocLogList(patient_id int64, page int64, limit int64, record_date int64, orgId int64) (doctorlist []*models.XtDoctorAdviceLog, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(doctorlist).Where("status =1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if record_date > 0 {
+		db = db.Where("record_date = ?", record_date)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ? ", orgId)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&doctorlist).Error
+
+	return doctorlist, total, err
+}
+
+func GetMonitorLogList(patient_id int64, page int64, limit int64, record_date int64, orgId int64) (monitorlist []*models.XtMonitorRecordLog, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(monitorlist).Where("status =1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if record_date > 0 {
+		db = db.Where("record_date = ?", record_date)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ? ", orgId)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&monitorlist).Error
+
+	return monitorlist, total, err
+}
+
+func GetAfterLogList(patient_id int64, page int64, limit int64, record_date int64, orgId int64) (afterlist []*models.XtMonitorRecordLog, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(afterlist).Where("status =1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if record_date > 0 {
+		db = db.Where("record_date = ?", record_date)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ? ", orgId)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&afterlist).Error
+
+	return afterlist, total, err
+}

service/schedule_service.go

@@ -1725,3 +1725,10 @@ func GetNumberListById(id int64, org_id int64) (number []*models.DeviceNumber, e
 
 	return number, err
 }
+
+func CreateScheduleLog(log models.XtScheduleLog) error {
+
+	err := XTWriteDB().Create(log).Error
+
+	return err
+}