Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/base_api_controller.go

@@ -73,7 +73,6 @@ func (this *BaseAuthAPIController) Prepare() {
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
 		userAdmin.Mobile = "15717313968"
-
 		userAdmin.Id = 1 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
@@ -82,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id
+		subscibe.OrgId = 3877 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 3877 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -328,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id小英9675或4
+		subscibe.OrgId = 3877 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 3877 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 3244 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

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() {
@@ -1161,6 +1173,9 @@ func (c *DialysisApiController) PostSoulution() {
 		Chaptalization:             chaptalization,
 	}
 
+	if prescription.Anticoagulant == 0 {
+		prescription.Anticoagulant = 3
+	}
 	//查询最近透析准备表里是否存在 透析器 灌流器
 
 	//splitStr := strings.Split(dialysis_dialyszers, ",")
@@ -1364,6 +1379,9 @@ func (c *DialysisApiController) PostSoulution() {
 		Chaptalization:             chaptalization,
 	}
 
+	if solution.Anticoagulant == 0 {
+		solution.Anticoagulant = 3
+	}
 	//针对河间咸得
 	if adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10090 || adminUserInfo.CurrentOrgId == 3877 {
 
@@ -7182,3 +7200,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/doctor_schedule_api_controller.go

@@ -552,9 +552,9 @@ func (this *DoctorScheduleApiController) SaveIsSchedule() {
 func (this *DoctorScheduleApiController) GetScheduleListTotal() {
 
 	start_time, _ := this.GetInt64("start_time")
-	fmt.Println(start_time)
+
 	end_time, _ := this.GetInt64("end_time")
-	fmt.Println("end_time", end_time)
+
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	//统计班次

controllers/gobal_config_api_controller.go

@@ -2426,7 +2426,7 @@ func (c *GobalConfigApiController) GetExportOutOrderDrugList() {
 	orderId := c.GetString("order_id")
 	ids := strings.Split(orderId, ",")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	//list, _ := service.GetExportOutOrderDrugList(ids)
+
 	list, _ := service.GetExportOutOrderDrugListOne(ids)
 	outInfoList, _ := service.GetDrugOutListFlow(ids, orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)

controllers/his_api_controller.go

@@ -1999,7 +1999,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												return
 											}
 
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+											if adminInfo.CurrentOrgId == 10215 {
 												if prescribing_number > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -2016,7 +2016,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
 											}
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+											if adminInfo.CurrentOrgId == 10215 {
 												if num > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -2085,7 +2085,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -2103,7 +2103,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
@@ -2159,7 +2159,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														// 查询该药品最后一次出库记录
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
 
@@ -2319,7 +2319,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -2337,7 +2337,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
@@ -2386,7 +2386,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														if (number_count - device_number) > batch_number_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -3068,10 +3068,29 @@ func (c *HisApiController) CreateHisPrescription() {
 									if p.Price != lastWarehouse.PackingPrice {
 										p.Price = lastWarehouse.PackingPrice
 									}
+									if p.Unit == "" {
+										goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+										p.Unit = goodInfoOne.PackingUnit
+									}
 								}
 
 							}
 
+							//if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10265 {
+							//
+							//	if p.Type == 3 {
+							//		//查询该耗材是否停用
+							//		goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
+							//		//表示该耗材已经停用，不能保存
+							//		if goodInfoSeven.ID == 0 {
+							//			goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
+							//			c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+							//			return
+							//		}
+							//	}
+							//
+							//}
+
 							service.CreateHisProjectTwo(&p)
 							//记录日志
 							byterequest, _ := json.Marshal(p)

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/manager_center_api_controller.go

@@ -37,6 +37,7 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/dictionary/updatechildconfig", &ManagerCenterApiController{}, "Post:UpdateChildConfig")
 	beego.Router("/api/dictionary/deletechildconfig", &ManagerCenterApiController{}, "Post:DeleteChildConfig")
 	beego.Router("/api/dictionary/updatetemplate", &ManagerCenterApiController{}, "Post:UpdateTemplate")
+	beego.Router("/api/dictionary/getmanageconfiglist", &ManagerCenterApiController{}, "get,post:GetManageConfigList")
 
 	//经销商
 	beego.Router("/api/stock/dealer/create", &ManagerCenterApiController{}, "post:CreateDealer")
@@ -681,6 +682,16 @@ func (c *ManagerCenterApiController) GetConfigList() {
 
 }
 
+func (c *ManagerCenterApiController) GetManageConfigList() {
+	adminUserInfo := c.GetAdminUserInfo()
+	configList, _ := service.GetConfigList(adminUserInfo.CurrentOrgId)
+	fmt.Println("configListwowowowowowowowowowowowo", configList)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"configlist": configList,
+	})
+	return
+}
+
 // CreateConfig  创建配置信息
 func (c *ManagerCenterApiController) CreateConfig() {
 	adminUserInfo := c.GetAdminUserInfo()

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:      "手机端修改保存透后评估",
 		}
@@ -9814,3 +9814,20 @@ func (c *DialysisAPIController) GetControlMonitorList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *DialysisAPIController) GetAdviceListNoExecution() {
+
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+
+	adviceList, _ := service.GetAdviceListNoExecution(timenow, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+
+}

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/mobile_api_router_register.go

@@ -201,4 +201,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/getcontrolmonitorlist", &DialysisAPIController{}, "Get:GetControlMonitorList")
 
+	beego.Router("/m/api/getadvicelistnoexecution", &DialysisAPIController{}, "Get:GetAdviceListNoExecution")
+
 }

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

@@ -56,14 +56,13 @@ func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
 	//fmt.Println("end_time",end_time)
 	start_time_one := this.GetString("start_time_one")
 	end_time_one := this.GetString("end_time_one")
-	fmt.Println("start_time_one--------", len(start_time_one))
-	fmt.Println("end_time_one-------", end_time_one)
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
 	if len(start_time_one) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_one+" 00:00:00", loc)
-		fmt.Println("err-----------", err)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
@@ -80,8 +79,7 @@ func (this *StaffScheduleApiController) GetMobileStaffScheduleList() {
 		}
 		endTime = theTime.Unix()
 	}
-	fmt.Println("starti_time233232323232", startTime)
-	fmt.Println("end_time2323223232323", endTime)
+
 	staffList, err := service.GetStaffScheduleList(orgId, startTime, endTime)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
@@ -491,8 +489,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.GetMobileAdminUserInfo().AdminUser.Id,
+		}
+		service.CreateScheduleLog(xtScheduleLog)
 		redis := service.RedisClient()
 		//处方
 		keyOne := strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(schedule.ScheduleDate, 10) + ":prescriptions_list_all"
@@ -634,12 +649,31 @@ func (this *StaffScheduleApiController) UpdateDialysisPrescription() {
 }
 
 func (this *StaffScheduleApiController) UpdateBloodScheduleMode() {
+
 	id, _ := this.GetInt64("id")
 	mode_id, _ := this.GetInt64("mode_id")
 	schedule := models.XtSchedule{
 		ModeId: mode_id,
 	}
 	service.UpdatedScheduleMode(schedule, id)
+
+	orgId := this.GetMobileAdminUserInfo().Org.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{}{
 		"msg": "保存成功",
 	})
@@ -663,6 +697,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 +1183,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 +1238,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/patient_api_controller.go

@@ -716,6 +716,36 @@ func (c *PatientApiController) EditLapseto() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+
+	start_time := c.GetString("start_time")
+
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	patient_address := c.GetString("patient_address")
+
 	adminUserInfo := c.GetAdminUserInfo()
 
 	patient, _ := service.FindPatientById(adminUserInfo.CurrentOrgId, id)
@@ -740,15 +770,8 @@ func (c *PatientApiController) EditLapseto() {
 		return
 	}
 	lapsetoType := int64(patientBody["lapseto_type"].(float64))
-	if lapsetoType <= 0 || lapsetoType > 3 {
-		utils.ErrorLog("lapsetoType <= 0 || lapsetoType > 3")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	lapseto.LapsetoType = lapsetoType
 
-	timeLayout := "2006-01-02 15:04:05"
-	loc, _ := time.LoadLocation("Local")
+	lapseto.LapsetoType = lapsetoType
 
 	if patientBody["lapseto_time"] == nil || reflect.TypeOf(patientBody["lapseto_time"]).String() != "string" {
 		utils.ErrorLog("lapseto_time")
@@ -756,11 +779,12 @@ func (c *PatientApiController) EditLapseto() {
 		return
 	}
 	lapsetoTime, _ := patientBody["lapseto_time"].(string)
-	if len(lapsetoTime) == 0 {
-		utils.ErrorLog("len(lapsetoTime) == 0")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
-		return
-	}
+
+	//if len(lapsetoTime) == 0 {
+	//	utils.ErrorLog("len(lapsetoTime) == 0")
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
+	//	return
+	//}
 
 	out_reason, _ := patientBody["out_reason"].(string)
 
@@ -771,11 +795,12 @@ func (c *PatientApiController) EditLapseto() {
 	//}
 
 	lapsetoTimeUnix, err := time.ParseInLocation(timeLayout, lapsetoTime, loc)
-	if err != nil {
-		utils.ErrorLog("lapsetoTimeUnix")
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
-		return
-	}
+
+	//if err != nil {
+	//	utils.ErrorLog("lapsetoTimeUnix")
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
+	//	return
+	//}
 	lapseto.LapsetoTime = lapsetoTimeUnix.Unix()
 	lapseto.UpdatedTime = time.Now().Unix()
 	lapseto.CreatedTime = time.Now().Unix()
@@ -783,6 +808,11 @@ func (c *PatientApiController) EditLapseto() {
 	patient.Lapseto = lapseto.LapsetoType
 	patient.OutReason = out_reason
 	patient.DeathTime = lapsetoTimeUnix.Unix()
+
+	patient.PatientStartTime = startTime
+	patient.PatientEndTime = endTime
+	patient.PatientAddress = patient_address
+
 	//if patient.Lapseto == 1 {
 	//	patientTotal := service.GetLapsetoPatientCount(adminUserInfo.CurrentOrgId, 1)
 	//	subscibes := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
@@ -806,6 +836,24 @@ func (c *PatientApiController) EditLapseto() {
 		service.UpdateScheduleItemByPatientId(id)
 	}
 
+	allergic := models.XtPatientAllergic{
+		UserOrgId:      adminUserInfo.CurrentOrgId,
+		PatientId:      patient.ID,
+		StartTime:      patient.PatientStartTime,
+		EndTime:        patient.PatientEndTime,
+		PatientSource:  patient.Lapseto,
+		PatientAddress: patient.PatientAddress,
+		Remake:         patient.Remark,
+		Status:         1,
+		Ctime:          time.Now().Unix(),
+	}
+	if lapseto.LapsetoType == 2 || lapseto.LapsetoType == 3 {
+		allergic.StartTime = lapseto.LapsetoTime
+		allergic.EndTime = lapseto.LapsetoTime
+	}
+
+	service.CreateAllergic(allergic)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeEditLapsetoFail)
 		return

controllers/patient_dataconfig_api_controller.go

@@ -5,7 +5,9 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"fmt"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -42,6 +44,10 @@ func PatientDataConfigAPIControllerRegistRouters() {
 
 	beego.Router("/api/patient/getpatientallagic", &PatientDataConfigAPIController{}, "Get:GetPatientAllagicList")
 
+	beego.Router("/api/patient/savesitemap", &PatientDataConfigAPIController{}, "Post:SaveSiteMap")
+
+	beego.Router("/api/patient/getpatientsitemap", &PatientDataConfigAPIController{}, "Get:GetPatientSitemap")
+
 }
 
 type PatientDataConfigAPIController struct {
@@ -1147,10 +1153,448 @@ func (this *PatientDataConfigAPIController) GetContextScheduleList() {
 func (this *PatientDataConfigAPIController) GetPatientAllagicList() {
 
 	id, _ := this.GetInt64("id")
-	fmt.Println("id2ooooooooooooooooooo", id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, _ := service.GetPatientAllagicList(id, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
 }
+
+func (this *PatientDataConfigAPIController) SaveSiteMap() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	patient_id := int64(dataBody["patient_id"].(float64))
+	user_org_id := this.GetAdminUserInfo().CurrentOrgId
+	id := int64(dataBody["id"].(float64))
+
+	if dataBody["a_left"] != nil && reflect.TypeOf(dataBody["a_left"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["a_left"].([]interface{})
+
+		service.UpdateValsualAleft(patient_id, user_org_id)
+		for _, item := range prescriptions {
+			var a_num float64
+			var mark_num float64
+			if item.(map[string]interface{})["a_num"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_num"]).String() == "float64" {
+				a_num = item.(map[string]interface{})["a_num"].(float64)
+			}
+			if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+				mark_num = item.(map[string]interface{})["markNum"].(float64)
+			}
+			fmt.Println(a_num, mark_num)
+
+			valsualALeft := models.XtDeviceValsualALeft{
+				ANum:      a_num,
+				MarkNum:   mark_num,
+				UserOrgId: user_org_id,
+				PatientId: patient_id,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				MapId:     0,
+				Status:    1,
+			}
+
+			service.CreateValsualAleft(valsualALeft)
+
+		}
+	}
+
+	is_append := int64(dataBody["is_append"].(float64))
+
+	is_img_v := int64(dataBody["is_img_v"].(float64))
+
+	is_img_a := int64(dataBody["is_img_a"].(float64))
+
+	a_top := dataBody["a_top"].(float64)
+
+	av_bkx := dataBody["av_bkx"].(float64)
+
+	av_bky := dataBody["av_bky"].(float64)
+
+	if dataBody["fangxiang_a"] != nil && reflect.TypeOf(dataBody["fangxiang_a"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fangxiang_a"].([]interface{})
+		service.ValsualMapFangxiangA(patient_id, user_org_id)
+		for _, item := range prescriptions {
+			var a_num float64
+			var mark_num float64
+			var mark_top float64
+			if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+				a_num = item.(map[string]interface{})["left"].(float64)
+			}
+			if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+				mark_num = item.(map[string]interface{})["markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+				mark_top = item.(map[string]interface{})["top"].(float64)
+			}
+
+			ValsualMapFangxiangA := models.XtDeviceValsualMapFangxiangA{
+
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Left:      a_num,
+				MarkNum:   mark_num,
+				Top:       mark_top,
+				MapId:     0,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+			}
+
+			service.CreateValsualMapFangxiangA(ValsualMapFangxiangA)
+		}
+
+	}
+
+	fangxiang_a_num := dataBody["fangxiang_a_num"].(float64)
+	fangxiang_a_top := dataBody["fangxiang_a_top"].(float64)
+
+	fangxiang_v_left := dataBody["fangxiang_v_left"].(float64)
+	fangxiang_v_num := dataBody["fangxiang_v_num"].(float64)
+	fangxiang_v_top := dataBody["fangxiang_v_top"].(float64)
+
+	if dataBody["fangxiang_v"] != nil && reflect.TypeOf(dataBody["fangxiang_v"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fangxiang_v"].([]interface{})
+		service.UpdateValsualMapFangxiangV(patient_id, user_org_id)
+		for _, item := range prescriptions {
+			var a_num float64
+			var mark_num float64
+			var mark_top float64
+			if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+				a_num = item.(map[string]interface{})["left"].(float64)
+			}
+			if item.(map[string]interface{})["markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["markNum"]).String() == "float64" {
+				mark_num = item.(map[string]interface{})["markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+				mark_top = item.(map[string]interface{})["top"].(float64)
+			}
+
+			ValsualMapFangxiangV := models.XtDeviceValsualMapFangxiangV{
+
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Left:      a_num,
+				MarkNum:   mark_num,
+				Top:       mark_top,
+				MapId:     0,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+			}
+
+			service.CreateValsualMapFangxiangV(ValsualMapFangxiangV)
+		}
+
+	}
+
+	fangxiang_a_left := dataBody["fangxiang_a_left"].(float64)
+
+	if dataBody["fuzhu_a"] != nil && reflect.TypeOf(dataBody["fuzhu_a"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fuzhu_a"].([]interface{})
+		service.UpdateValSualFuzhA(patient_id, user_org_id)
+		for _, item := range prescriptions {
+			var a_left float64
+			var a_markNum float64
+			var a_top float64
+			if item.(map[string]interface{})["a_left"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_left"]).String() == "float64" {
+				a_left = item.(map[string]interface{})["a_left"].(float64)
+			}
+			if item.(map[string]interface{})["a_markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_markNum"]).String() == "float64" {
+				a_markNum = item.(map[string]interface{})["a_markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["a_top"] != nil || reflect.TypeOf(item.(map[string]interface{})["a_top"]).String() == "float64" {
+				a_top = item.(map[string]interface{})["a_top"].(float64)
+			}
+
+			valsualFuzhuA := models.XtDeviceValsualFuzhuA{
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				ALeft:     a_left,
+				AMarkNum:  a_markNum,
+				ATop:      a_top,
+				MapId:     0,
+			}
+			service.CreateValSualFuzhA(valsualFuzhuA)
+		}
+	}
+
+	fuzhu_a_left := dataBody["fuzhu_a_left"].(float64)
+	fuzhu_a_num := dataBody["fuzhu_a_num"].(float64)
+	fuzhu_a_top := dataBody["fuzhu_a_top"].(float64)
+
+	left_a := dataBody["left_a"].(float64)
+	left_v := dataBody["left_v"].(float64)
+
+	if dataBody["fuzhu_v"] != nil && reflect.TypeOf(dataBody["fuzhu_v"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["fuzhu_v"].([]interface{})
+
+		service.UpdateVasuaLfuzhuV(patient_id, user_org_id)
+		for _, item := range prescriptions {
+			var v_left float64
+			var v_markNum float64
+			var v_top float64
+			if item.(map[string]interface{})["v_left"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_left"]).String() == "float64" {
+				v_left = item.(map[string]interface{})["v_left"].(float64)
+			}
+			if item.(map[string]interface{})["v_markNum"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_markNum"]).String() == "float64" {
+				v_markNum = item.(map[string]interface{})["v_markNum"].(float64)
+			}
+
+			if item.(map[string]interface{})["v_top"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_top"]).String() == "float64" {
+				v_top = item.(map[string]interface{})["v_top"].(float64)
+			}
+
+			fuzhuV := models.XtDeviceValsualFuzhuV{
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Mtime:     1,
+				VMarkNum:  v_markNum,
+				VLeft:     v_left,
+				VTop:      v_top,
+				MapId:     0,
+			}
+
+			service.CreateVasuaLfuzhuV(fuzhuV)
+
+		}
+	}
+
+	fuzhu_v_left := dataBody["fuzhu_v_left"].(float64)
+	fuzhu_v_num := dataBody["fuzhu_v_num"].(float64)
+	fuzhu_v_top := dataBody["fuzhu_v_top"].(float64)
+
+	scalea_num := dataBody["scalea_num"].(float64)
+	scalev_num := dataBody["scalev_num"].(float64)
+
+	if dataBody["text_arr"] != nil && reflect.TypeOf(dataBody["text_arr"]).String() == "[]interface {}" {
+		prescriptions, _ := dataBody["text_arr"].([]interface{})
+
+		service.UpdateTextArr(patient_id, user_org_id)
+		for _, item := range prescriptions {
+			var left float64
+			var text_markNum string
+			var v_top float64
+			var width float64
+			if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+				left = item.(map[string]interface{})["left"].(float64)
+			}
+			if item.(map[string]interface{})["text"] != nil || reflect.TypeOf(item.(map[string]interface{})["text"]).String() == "string" {
+				text_markNum = item.(map[string]interface{})["text"].(string)
+			}
+
+			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+				v_top = item.(map[string]interface{})["top"].(float64)
+			}
+
+			if item.(map[string]interface{})["width"] != nil || reflect.TypeOf(item.(map[string]interface{})["width"]).String() == "float64" {
+				width = item.(map[string]interface{})["width"].(float64)
+			}
+
+			textArr := models.XtDeviceValsualTextArr{
+				PatientId: patient_id,
+				UserOrgId: user_org_id,
+				Ctime:     time.Now().Unix(),
+				Mtime:     0,
+				Status:    1,
+				Left:      left,
+				Text:      text_markNum,
+				Top:       v_top,
+				Width:     width,
+				MapId:     0,
+			}
+
+			service.CreateTextArr(textArr)
+		}
+
+		text_left := dataBody["text_left"].(float64)
+		text_num := dataBody["text_num"].(float64)
+		text_top := dataBody["text_top"].(float64)
+
+		if dataBody["v_left"] != nil && reflect.TypeOf(dataBody["v_left"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["v_left"].([]interface{})
+			service.UpdateValsualVleft(patient_id, user_org_id)
+			for _, item := range prescriptions {
+				var v_num float64
+				var markNum float64
+
+				if item.(map[string]interface{})["v_num"] != nil || reflect.TypeOf(item.(map[string]interface{})["v_num"]).String() == "float64" {
+					v_num = item.(map[string]interface{})["v_num"].(float64)
+				}
+				if item.(map[string]interface{})["mark_num"] != nil || reflect.TypeOf(item.(map[string]interface{})["mark_num"]).String() == "float64" {
+					markNum = item.(map[string]interface{})["mark_num"].(float64)
+				}
+
+				valsualVLeft := models.XtDeviceValsualVLeft{
+					PatientId: patient_id,
+					UserOrgId: user_org_id,
+					Status:    1,
+					Ctime:     time.Now().Unix(),
+					Mtime:     time.Now().Unix(),
+					MarkNum:   markNum,
+					VNum:      v_num,
+					MapId:     0,
+				}
+
+				service.CreateValsualVleft(valsualVLeft)
+
+			}
+		}
+
+		if dataBody["aarr"] != nil && reflect.TypeOf(dataBody["aarr"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["aarr"].([]interface{})
+			service.UpdateValusalMapArr(patient_id, user_org_id)
+			for _, item := range prescriptions {
+				var mark_num float64
+				var is_status float64
+				var left float64
+				var top float64
+
+				if item.(map[string]interface{})["mark_num"] != nil || reflect.TypeOf(item.(map[string]interface{})["mark_num"]).String() == "float64" {
+					mark_num = item.(map[string]interface{})["mark_num"].(float64)
+				}
+				if item.(map[string]interface{})["is_status"] != nil || reflect.TypeOf(item.(map[string]interface{})["is_status"]).String() == "float64" {
+					is_status = item.(map[string]interface{})["is_status"].(float64)
+				}
+				if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+					left = item.(map[string]interface{})["left"].(float64)
+				}
+				if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+					top = item.(map[string]interface{})["top"].(float64)
+				}
+
+				mapArr := models.XtDeviceValusalMapArr{
+					PatientId: patient_id,
+					UserOrgId: user_org_id,
+					Status:    1,
+					MarkNum:   mark_num,
+					Left:      left,
+					Top:       top,
+					IsStatus:  is_status,
+					Ctime:     time.Now().Unix(),
+					Mtime:     0,
+				}
+				service.CreateDeviceValusalMapArr(mapArr)
+
+			}
+		}
+
+		if dataBody["varr"] != nil && reflect.TypeOf(dataBody["varr"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["varr"].([]interface{})
+			service.UpdateDeviceValusalMapVrr(patient_id, user_org_id)
+			for _, item := range prescriptions {
+				var mark_num float64
+				var is_status float64
+				var left float64
+				var top float64
+
+				if item.(map[string]interface{})["mark_num"] != nil || reflect.TypeOf(item.(map[string]interface{})["mark_num"]).String() == "float64" {
+					mark_num = item.(map[string]interface{})["mark_num"].(float64)
+				}
+				if item.(map[string]interface{})["is_status"] != nil || reflect.TypeOf(item.(map[string]interface{})["is_status"]).String() == "float64" {
+					is_status = item.(map[string]interface{})["is_status"].(float64)
+				}
+				if item.(map[string]interface{})["left"] != nil || reflect.TypeOf(item.(map[string]interface{})["left"]).String() == "float64" {
+					left = item.(map[string]interface{})["left"].(float64)
+				}
+				if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
+					top = item.(map[string]interface{})["top"].(float64)
+				}
+
+				mapVrr := models.XtDeviceValusalMapVrr{
+					PatientId: patient_id,
+					UserOrgId: user_org_id,
+					Status:    1,
+					MarkNum:   mark_num,
+					Left:      left,
+					Top:       top,
+					IsStatus:  is_status,
+					Ctime:     time.Now().Unix(),
+					Mtime:     0,
+				}
+				service.CreateDeviceValusalMapVrr(mapVrr)
+
+			}
+		}
+
+		v_num := dataBody["v_num"].(float64)
+		v_top := dataBody["v_top"].(float64)
+		xuanzhuan_a := dataBody["xuanzhuan_a"].(float64)
+		xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
+
+		img_url := dataBody["img_url"].(string)
+
+		deviceValsualMap := models.XtDeviceValsualMap{
+			ID:             id,
+			PatientId:      patient_id,
+			IsAppend:       is_append,
+			IsImgV:         is_img_v,
+			IsImgA:         is_img_a,
+			VNum:           v_num,
+			Status:         1,
+			UserOrgId:      user_org_id,
+			ATop:           a_top,
+			AvBkx:          av_bkx,
+			AvBky:          av_bky,
+			FangxiangALeft: fangxiang_a_left,
+			FangxiangANum:  fangxiang_a_num,
+			FangxiangATop:  fangxiang_a_top,
+			FangxiangVLeft: fangxiang_v_left,
+			FangxiangVNum:  fangxiang_v_num,
+			FangxiangVTop:  fangxiang_v_top,
+			FuzhuALeft:     fuzhu_a_left,
+			FuzhuANum:      fuzhu_a_num,
+			FuzhuATop:      fuzhu_a_top,
+			FuzhuVLeft:     fuzhu_v_left,
+			FuzhuVNum:      fuzhu_v_num,
+			FuzhuVTop:      fuzhu_v_top,
+			ScaleaNum:      scalea_num,
+			ScalevNum:      scalev_num,
+			TextLeft:       text_left,
+			TextNum:        text_num,
+			TextTop:        text_top,
+			VTop:           v_top,
+			XuanzhuanA:     xuanzhuan_a,
+			XuanzhuanV:     xuanzhuan_v,
+			ALeft:          left_a,
+			VLeft:          left_v,
+			ImgUrl:         img_url,
+		}
+
+		err = service.CreateDeviceValsualMap(deviceValsualMap)
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"deviceValsualMap": deviceValsualMap,
+		})
+
+	}
+}
+
+func (this *PatientDataConfigAPIController) GetPatientSitemap() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	sitemap, _ := service.GetPatientSitemap(patient_id, orgId)
+
+	patients, _ := service.GetPatientByIDOne(orgId, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sitemap":  sitemap,
+		"patients": patients,
+	})
+
+}

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
@@ -97,10 +97,9 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 
 			item.Schedule = &lastSchedule
 
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 {
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10495 || this.GetAdminUserInfo().CurrentOrgId == 10013 || this.GetAdminUserInfo().CurrentOrgId == 10014 {
 
 				if item.ScheduleDate <= 1672416000 {
-
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
@@ -145,7 +144,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 10495 && this.GetAdminUserInfo().CurrentOrgId != 10013 && this.GetAdminUserInfo().CurrentOrgId != 10014 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

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

controllers/self_drug_api_congtroller.go

@@ -2770,11 +2770,6 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 		ids = append(ids, it.ID)
 	}
 
-	//infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
-	//for _, it := range infoList {
-	//	goodIds = append(goodIds, it.GoodId)
-	//}
-
 	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids)
 
 	if err != nil {
@@ -3001,6 +2996,7 @@ func (this *SelfDrugApiController) GetGoodPurchaseStockQuery() {
 	}
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	list, total, err := service.GetGoodPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
+	storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	for _, item := range list {
 
 		//获取期初结余数量
@@ -3016,29 +3012,29 @@ func (this *SelfDrugApiController) GetGoodPurchaseStockQuery() {
 		}
 
 		//获取期间增加
-		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range goodWarehouseInfoList {
 			item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
 		}
 
 		//获取本期增加
-		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range WarehouseInfoFlowList {
 			item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
 		}
 		//获取本期减少
-		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range reduceWarehouseInfoList {
 			item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
 		}
 
 		//获取期中减少退库
-		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range lowInfo {
 			item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
 		}
 		//
-		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 		for _, it := range outInfo {
 			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 		}
@@ -3101,12 +3097,12 @@ func (this *SelfDrugApiController) GetGoodPurchaseStockQuery() {
 		}
 
 		//期中盘盈
-		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range profit {
 			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
 		}
 		//期中盘亏
-		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 		for _, it := range losses {
 			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 		}
@@ -3683,55 +3679,57 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 
 	if orgId == 10265 {
+		//storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
 		list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
 		for _, item := range list {
 
 			//获取期初结余
-			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+			low, _ := service.GetStartLastFLowTwenty(item.ID, orgId, startTime)
 
 			item.GoodStartFlowInfo = low
 
 			//获取期末结余
-			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+			flow, _ := service.GetEndLastFlowTwenty(item.ID, orgId, endTime)
 
 			item.GoodEndFlowInfo = flow
 
 			//获取期间增加
-			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoListTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range goodWarehouseInfoList {
 				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
 			}
 
 			//获取本期增加
-			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			WarehouseInfoFlowList, _ := service.GetAddStartFlowTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range WarehouseInfoFlowList {
 				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
 			}
 			//获取本期减少
-			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoListTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range reduceWarehouseInfoList {
 				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
 			}
 
 			//获取期中减少退库
-			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			lowInfo, _ := service.GetStartEndCancelFLowInfoTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range lowInfo {
 				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
 			}
 			//
-			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			outInfo, _ := service.FindeWarehouseOutInfoTwenty(item.ID, orgId, startTime)
 			for _, it := range outInfo {
 				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 			}
 
 			//期中盘盈
-			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			profit, _ := service.FindeEndStokInventoryProfitTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range profit {
 				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
 			}
 			//期中盘亏
-			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			losses, _ := service.FindeEndStockInventoryLossesTwenty(item.ID, orgId, startTime, endTime)
 			for _, it := range losses {
 				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 			}
@@ -3751,54 +3749,56 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 
 	if orgId != 10265 {
 		list, total, err := service.GetGoodNewPurchaseStockQueryOne(good_type, keyword, page, limit, orgId, ids, goodIds)
-
+		storeConfig, _ := service.GetAllStoreHouseConfig(orgId)
 		for _, item := range list {
 
 			//获取期初结余
-			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 
 			item.GoodStartFlowInfo = low
 
 			//获取期末结余
-			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime, storeConfig.StorehouseOutInfo)
 
 			item.GoodEndFlowInfo = flow
 
 			//获取期间增加
-			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
 			for _, it := range goodWarehouseInfoList {
 				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
 			}
 
 			//获取本期增加
-			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
+
 			for _, it := range WarehouseInfoFlowList {
 				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
 			}
 			//获取本期减少
-			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range reduceWarehouseInfoList {
 				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
 			}
 
 			//获取期中减少退库
-			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range lowInfo {
 				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
 			}
 			//
-			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime, storeConfig.StorehouseOutInfo)
 			for _, it := range outInfo {
 				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
 			}
 
 			//期中盘盈
-			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range profit {
 				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
 			}
 			//期中盘亏
-			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range losses {
 				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
 			}

controllers/sign_api_controller.go

@@ -72,6 +72,7 @@ func SignApiRegistRouters() {
 	beego.Router("/api/device/getenterprisedetail", &SignApiController{}, "Get:GetEnterPriseDetail")
 
 	beego.Router("/api/device/uploadprintorder", &SignApiController{}, "Post:UploadPrintOrder")
+
 }
 
 // 短信服务接口

controllers/verify_login_controller.go

@@ -188,7 +188,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 
 			//查询该机构是否存在医护排班
 			_, errcode := service.GetDoctorScheduleByOrgId(curOrg.Id)
-			fmt.Println("errcode2------------------", errcode)
+
 			//如果没有就插入
 			if errcode == gorm.ErrRecordNotFound {
 				err = service.BatchInsertDoctorSchedule(curOrg.Id)

models/good_models.go

@@ -35,37 +35,37 @@ func (NewGoodsType) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
-	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId             int64   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	BuyPrice               float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	SellPrice              float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
-	Remark                 string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	ExpiryDateWarnDayCount int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
-	StockWarnCount         int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
-	IsReuse                int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
-	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
-	FilmArea               string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
-	IsUse                  int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
-	FilmMaterialQuality    string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier               int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Creater                int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	GoodKind               int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-
+	ID                          int64                   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string                  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName           string                  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64                   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit                    int64                   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64                 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                      string                  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                       int64                   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64                   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer                int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64                   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64                   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64                   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64                   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64                   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string                  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64                   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string                  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64                   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64                   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string                  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string                  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64                   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64                   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string                  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string                  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	FirstLetter                 string                  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	IsSpecialDiseases           int64                   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
 	IsRecord                    int64                   `gorm:"column:is_record" json:"is_record" form:"is_record"`
 	StatisticsCategory          int64                   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
@@ -320,6 +320,7 @@ type GoodInformationFourty struct {
 	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`
 	Status            int64  `gorm:"column:status" json:"status"`
+	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 }
 
 func (GoodInformationFourty) TableName() string {

models/his_models.go

@@ -602,6 +602,7 @@ type HisProject struct {
 	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
 	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (HisProject) TableName() string {

models/new_stock_models.go

@@ -232,6 +232,7 @@ type VmStockFlowTwenty struct {
 	IsRead              int64              `gorm:"column:is_read" json:"is_read" form:"is_read"`
 	OverCount           int64              `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	Ctime               int64              `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	StorehouseId        int64              `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	WarehousingInfo     NewWarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"xt_warehouse_info"`
 }
 

models/patient_models.go

@@ -229,6 +229,7 @@ type Patients struct {
 	InfectiousRemark         string  `gorm:"column:infectious_remark" json:"infectious_remark" form:"infectious_remark"`
 	AllergicHistory          string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
 	PatientAddress           string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
+	FirstLetter              string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (Patients) TableName() string {
@@ -2107,3 +2108,223 @@ 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"
+}
+
+type XtDeviceValsualMap struct {
+	ID                           int64                           `gorm:"column:id" json:"id" form:"id"`
+	PatientId                    int64                           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	IsAppend                     int64                           `gorm:"column:is_append" json:"is_append" form:"is_append"`
+	IsImgV                       int64                           `gorm:"column:is_img_v" json:"is_img_v" form:"is_img_v"`
+	IsImgA                       int64                           `gorm:"column:is_img_a" json:"is_img_a" form:"is_img_a"`
+	VNum                         float64                         `gorm:"column:v_num" json:"v_num" form:"v_num"`
+	Status                       int64                           `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId                    int64                           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ATop                         float64                         `gorm:"column:a_top" json:"a_top" form:"a_top"`
+	AvBkx                        float64                         `gorm:"column:av_bkx" json:"av_bkx" form:"av_bkx"`
+	AvBky                        float64                         `gorm:"column:av_bky" json:"av_bky" form:"av_bky"`
+	FangxiangALeft               float64                         `gorm:"column:fangxiang_a_left" json:"fangxiang_a_left" form:"fangxiang_a_left"`
+	FangxiangANum                float64                         `gorm:"column:fangxiang_a_num" json:"fangxiang_a_num" form:"fangxiang_a_num"`
+	FangxiangATop                float64                         `gorm:"column:fangxiang_a_top" json:"fangxiang_a_top" form:"fangxiang_a_top"`
+	FangxiangVLeft               float64                         `gorm:"column:fangxiang_v_left" json:"fangxiang_v_left" form:"fangxiang_v_left"`
+	FangxiangVNum                float64                         `gorm:"column:fangxiang_v_num" json:"fangxiang_v_num" form:"fangxiang_v_num"`
+	FangxiangVTop                float64                         `gorm:"column:fangxiang_v_top" json:"fangxiang_v_top" form:"fangxiang_v_top"`
+	FuzhuALeft                   float64                         `gorm:"column:fuzhu_a_left" json:"fuzhu_a_left" form:"fuzhu_a_left"`
+	FuzhuANum                    float64                         `gorm:"column:fuzhu_a_num" json:"fuzhu_a_num" form:"fuzhu_a_num"`
+	FuzhuATop                    float64                         `gorm:"column:fuzhu_a_top" json:"fuzhu_a_top" form:"fuzhu_a_top"`
+	FuzhuVLeft                   float64                         `gorm:"column:fuzhu_v_left" json:"fuzhu_v_left" form:"fuzhu_v_left"`
+	FuzhuVNum                    float64                         `gorm:"column:fuzhu_v_num" json:"fuzhu_v_num" form:"fuzhu_v_num"`
+	FuzhuVTop                    float64                         `gorm:"column:fuzhu_v_top" json:"fuzhu_v_top" form:"fuzhu_v_top"`
+	ScaleaNum                    float64                         `gorm:"column:scalea_num" json:"scalea_num" form:"scalea_num"`
+	ScalevNum                    float64                         `gorm:"column:scalev_num" json:"scalev_num" form:"scalev_num"`
+	TextLeft                     float64                         `gorm:"column:text_left" json:"text_left" form:"text_left"`
+	TextNum                      float64                         `gorm:"column:text_num" json:"text_num" form:"text_num"`
+	TextTop                      float64                         `gorm:"column:text_top" json:"text_top" form:"text_top"`
+	VTop                         float64                         `gorm:"column:v_top" json:"v_top" form:"v_top"`
+	XuanzhuanA                   float64                         `gorm:"column:xuanzhuan_a" json:"xuanzhuan_a" form:"xuanzhuan_a"`
+	XuanzhuanV                   float64                         `gorm:"column:xuanzhuan_v" json:"xuanzhuan_v" form:"xuanzhuan_v"`
+	ALeft                        float64                         `gorm:"column:a_left" json:"a_left" form:"a_left"`
+	VLeft                        float64                         `gorm:"column:v_left" json:"v_left" form:"v_left"`
+	ImgUrl                       string                          `gorm:"column:img_url" json:"img_url" form:"img_url"`
+	XtDeviceValsualALeft         []*XtDeviceValsualALeft         `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualALeft"`
+	XtDeviceValsualMapFangxiangA []*XtDeviceValsualMapFangxiangA `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangA"`
+	XtDeviceValsualMapFangxiangV []*XtDeviceValsualMapFangxiangV `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangV"`
+	XtDeviceValsualFuzhuA        []*XtDeviceValsualFuzhuA        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualFuzhuA"`
+	XtDeviceValsualFuzhuV        []*XtDeviceValsualFuzhuV        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualFuzhuV"`
+	XtDeviceValsualTextArr       []*XtDeviceValsualTextArr       `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualTextArr"`
+	XtDeviceValsualVLeft         []*XtDeviceValsualVLeft         `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"XtDeviceValsualVLeft"`
+	DeviceValusalMapArr          []*XtDeviceValusalMapArr        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValusalMapArr"`
+	XtDeviceValusalMapVrr        []*XtDeviceValusalMapVrr        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValusalMapVrr"`
+}
+
+func (XtDeviceValsualMap) TableName() string {
+	return "xt_device_valsual_map"
+}
+
+type XtDeviceValsualALeft struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	ANum      float64 `gorm:"column:a_num" json:"a_num" form:"a_num"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	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"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDeviceValsualALeft) TableName() string {
+	return "xt_device_valsual_a_left"
+}
+
+type XtDeviceValsualMapFangxiangA struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDeviceValsualMapFangxiangA) TableName() string {
+	return "xt_device_valsual_map_fangxiang_a"
+}
+
+type XtDeviceValsualMapFangxiangV struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualMapFangxiangV) TableName() string {
+	return "xt_device_valsual_map_fangxiang_v"
+}
+
+type XtDeviceValsualFuzhuA struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	ALeft     float64 `gorm:"column:a_left" json:"a_left" form:"a_left"`
+	AMarkNum  float64 `gorm:"column:a_mark_num" json:"a_mark_num" form:"a_mark_num"`
+	ATop      float64 `gorm:"column:a_top" json:"a_top" form:"a_top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualFuzhuA) TableName() string {
+	return "xt_device_valsual_fuzhu_a"
+}
+
+type XtDeviceValsualFuzhuV struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	VMarkNum  float64 `gorm:"column:v_mark_num" json:"v_mark_num" form:"v_mark_num"`
+	VLeft     float64 `gorm:"column:v_left" json:"v_left" form:"v_left"`
+	VTop      float64 `gorm:"column:v_top" json:"v_top" form:"v_top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualFuzhuV) TableName() string {
+	return "xt_device_valsual_fuzhu_v"
+}
+
+type XtDeviceValsualTextArr struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	Text      string  `gorm:"column:text" json:"text" form:"text"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	Width     float64 `gorm:"column:width" json:"width" form:"width"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualTextArr) TableName() string {
+	return "xt_device_valsual_text_arr"
+}
+
+type XtDeviceValsualVLeft struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	VNum      float64 `gorm:"column:v_num" json:"v_num" form:"v_num"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualVLeft) TableName() string {
+	return "xt_device_valsual_v_left"
+}
+
+type XtDeviceValusalMapArr struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	IsStatus  float64 `gorm:"column:is_status" json:"is_status" form:"is_status"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDeviceValusalMapArr) TableName() string {
+	return "xt_device_valusal_map_arr"
+}
+
+type XtDeviceValusalMapVrr struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	IsStatus  float64 `gorm:"column:is_status" json:"is_status" form:"is_status"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDeviceValusalMapVrr) TableName() string {
+	return "xt_device_valusal_map_vrr"
+}

models/self_drug_models.go

@@ -586,6 +586,8 @@ type BloodDrugWarehouseOutInfo struct {
 	DoseUnit                string  `json:"dose_unit"`
 	LastPrice               float64 `json:"last_price"`
 	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	InPrice                 float64 `gorm:"column:price" json:"in_price" form:"price"`
+	WarehousingInfoId       int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 }
 
 type XtMonitorConfig struct {
@@ -650,6 +652,7 @@ type StDrugWarehouseInfo struct {
 	PackingUnit      string  `json:"packing_unit"`
 	Dosage           int64   `json:"dosage"`
 	LimaxUnit        string  `json:"limax_unit"`
+	WarehousingTime  int64   `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
 }
 
 type VmDrugWarehouseOutInfo struct {
@@ -929,36 +932,37 @@ type VmDrugInventory struct {
 }
 
 type SgjDrugWarehouseOutInfo struct {
-	ID                      int64      `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64      `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64      `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64      `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64      `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string     `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	Price                   float64    `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64    `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64      `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64      `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64      `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64      `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64      `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64      `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string     `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64      `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string     `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64      `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64      `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64      `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64      `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	RetailPrice             float64    `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice        float64    `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	WarehouseInfoId         int64      `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	Number                  string     `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PatientId               int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	IsCheck                 int64      `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	XtBaseDrug              XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	ID                      int64               `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64               `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64               `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64               `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64               `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string              `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64             `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64             `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64               `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64               `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64               `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64               `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64               `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64               `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string              `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64               `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string              `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64               `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64               `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64               `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64               `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64             `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64             `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	WarehouseInfoId         int64               `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string              `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string              `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	IsCheck                 int64               `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	XtBaseDrug              XtBaseDrug          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	XtDrugWarehouseInfo     XtDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"`
 }
 
 func (SgjDrugWarehouseOutInfo) TableName() string {

models/stock_models.go

@@ -106,12 +106,26 @@ type StWarehousingInfo struct {
 	LicenseNumber         string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
 	StorehouseId          int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	WarehousingTime       string  `json:"warehousing_time"`
 }
 
 func (StWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
 
+type XtWarehouse struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingOrder string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	OperationTime    int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	WarehousingTime  int64  `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
+}
+
+func (XtWarehouse) TableName() string {
+	return "xt_warehouse"
+}
+
 type WarehousingInfo struct {
 	ID                        int64       `gorm:"column:id" json:"id"`
 	WarehousingId             int64       `gorm:"column:warehousing_id" json:"warehousing_id"`
@@ -229,50 +243,51 @@ func (WarehouseOut) TableName() string {
 }
 
 type WarehouseOutInfo struct {
-	ID                      int64           `gorm:"column:id" json:"id"`
-	WarehouseOutId          int64           `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
-	WarehouseInfotId        int64           `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
-	GoodId                  int64           `gorm:"column:good_id" json:"good_id"`
-	GoodTypeId              int64           `gorm:"column:good_type_id" json:"good_type_id"`
-	WarehousingOutTarget    int64           `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
-	Count                   int64           `gorm:"column:count" json:"count"`
-	Price                   float64         `gorm:"column:price" json:"price"`
-	TotalPrice              float64         `gorm:"column:total_price" json:"total_price"`
-	ProductDate             int64           `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate              int64           `gorm:"column:expiry_date" json:"expiry_date"`
-	Mtime                   int64           `gorm:"column:mtime" json:"mtime"`
-	Ctime                   int64           `gorm:"column:ctime" json:"ctime"`
-	Status                  int64           `gorm:"column:status" json:"status"`
-	OrgId                   int64           `gorm:"column:org_id" json:"org_id"`
-	Remark                  string          `gorm:"column:remark" json:"remark"`
-	IsCancel                int64           `gorm:"column:is_cancel" json:"is_cancel"`
-	WarehouseOut            WarehouseOut    `ForeignKey:WarehouseOutId json:"WarehouseOut"`
-	WarehouseOutOrderNumber string          `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
-	GoodInfo                GoodInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
-	Type                    int64           `gorm:"column:type" json:"type"`
-	Dealer                  int64           `gorm:"column:dealer" json:"dealer"`
-	Manufacturer            int64           `gorm:"column:manufacturer" json:"manufacturer"`
-	IsSys                   int64           `gorm:"column:is_sys" json:"is_sys"`
-	SysRecordTime           int64           `gorm:"column:sys_record_time" json:"sys_record_time"`
-	PatientId               int64           `gorm:"column:patient_id" json:"patient_id"`
-	Number                  string          `gorm:"column:number" json:"number" form:"number"`
-	LicenseNumber           string          `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	ConsumableType          int64           `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	ProjectId               int64           `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	SupplyCancelOutId       int64           `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseId       int64           `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	IsSource                int64           `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	StorehouseId            int64           `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId   int64           `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	AdminUserId             int64           `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	BuyPrice                float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	StockCount              string          `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	IsCheck                 int64           `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	RegisterNumber          string          `gorm:"column:register_number" json:"register_number" form:"register_number"`
-	WarehousingInfo         WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
-	VmStockFlow             VmStockFlow     `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
-	OverCount               int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	OrderId                 int64           `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ID                      int64                `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseInfotId        int64                `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	GoodId                  int64                `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64                `gorm:"column:good_type_id" json:"good_type_id"`
+	WarehousingOutTarget    int64                `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
+	Count                   int64                `gorm:"column:count" json:"count"`
+	Price                   float64              `gorm:"column:price" json:"price"`
+	TotalPrice              float64              `gorm:"column:total_price" json:"total_price"`
+	ProductDate             int64                `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate              int64                `gorm:"column:expiry_date" json:"expiry_date"`
+	Mtime                   int64                `gorm:"column:mtime" json:"mtime"`
+	Ctime                   int64                `gorm:"column:ctime" json:"ctime"`
+	Status                  int64                `gorm:"column:status" json:"status"`
+	OrgId                   int64                `gorm:"column:org_id" json:"org_id"`
+	Remark                  string               `gorm:"column:remark" json:"remark"`
+	IsCancel                int64                `gorm:"column:is_cancel" json:"is_cancel"`
+	WarehouseOut            WarehouseOut         `ForeignKey:WarehouseOutId json:"WarehouseOut"`
+	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	GoodInfo                GoodInfo             `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	Type                    int64                `gorm:"column:type" json:"type"`
+	Dealer                  int64                `gorm:"column:dealer" json:"dealer"`
+	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer"`
+	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys"`
+	SysRecordTime           int64                `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64                `gorm:"column:patient_id" json:"patient_id"`
+	Number                  string               `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string               `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ConsumableType          int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	ProjectId               int64                `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	SupplyCancelOutId       int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64                `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64                `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64                `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	BuyPrice                float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StockCount              string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	IsCheck                 int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber          string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	WarehousingInfo         WarehousingInfo      `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
+	VmStockFlow             VmStockFlow          `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
+	OverCount               int64                `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	OrderId                 int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	WarehousingInfoNight    WarehousingInfoNight `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -541,6 +556,7 @@ type WarehouseOutInfoOne struct {
 	BuyPrice                    float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StockCount                  string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	WarehouseOutTime            int64   `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
 }
 
 type WarehouseOutInfoTwo struct {
@@ -1553,6 +1569,7 @@ type StartWarehousingInfo struct {
 	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
 	WarehousingUnit  string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
 	PackingPrice     float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (StartWarehousingInfo) TableName() string {
@@ -1656,3 +1673,17 @@ type NewWarehousingInfo struct {
 func (NewWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type WarehousingInfoNight struct {
+	ID              int64   `gorm:"column:id" json:"id"`
+	StockCount      int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId    int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	WarehouseInfoId int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice    float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	Price           float64 `gorm:"column:price" json:"price"`
+	Number          string  `gorm:"column:number" json:"number"`
+}
+
+func (WarehousingInfoNight) TableName() string {
+	return "xt_warehouse_info"
+}

service/common_service.go

@@ -481,7 +481,7 @@ func GetDialysisAgeData(orgID int64, lapsetotype int64, sourcetype int64) (count
 
 func GetCurentOrgPatients(orgid int64) (patients []*models.BloodXtPatients, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status =1 and lapseto = 1", orgid).Order("created_time desc").Find(&patients).Error
+	err = XTReadDB().Where("user_org_id = ? and status =1", orgid).Order("created_time desc").Find(&patients).Error
 	return patients, err
 }
 
@@ -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/dialysis_service.go

@@ -1527,7 +1527,7 @@ func SaveHisProject(advice *models.HisPrescriptionProject) (err error) {
 }
 
 func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (advice []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1 and user_org_id = ?", orgID).Preload("GoodInfo", "status = 1 and org_id = ?", orgID).Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1 and user_org_id = ?", orgID).Preload("XtHisProjectTeam", "user_org_id=? and status=1", orgID).Preload("GoodInfo", "status = 1 and org_id = ?", orgID).Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }
 
@@ -1848,7 +1848,7 @@ func GetSchedulePrintList(page int64, limit int64, schedulType int64, partitionT
 	if len(keywords) > 0 {
 		db = db.Where("p.name like ?", likeKey)
 	}
-	err = db.Count(&total).Select("x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.status,p.name").Offset(limit * (page - 1)).Limit(limit).Order("x.schedule_date desc").Find(&list).Error
+	err = db.Count(&total).Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.status,p.name").Offset(limit * (page - 1)).Limit(limit).Order("x.schedule_date desc").Find(&list).Error
 
 	return list, total, err
 }

service/drug_stock_service.go

@@ -273,6 +273,6 @@ func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64) (l
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
-	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
+	err = db.Preload("XtDrugWarehouseInfo", "status=1 and org_id =?", orgid).Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
 	return list, err
 }

service/gobal_config_service.go

@@ -366,10 +366,11 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1 and x.is_check = 1")
-	dbOne := XTReadDB().Table("xt_base_drug as b").Where("b.status =1")
-	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
-	fmt.Print(dbOne, dbTwo)
+	db := XTReadDB().Table("sgj_xt.xt_drug_warehouse_out_info as x").Where("x.status =1 and x.is_check = 1")
+	dbOne := XTReadDB().Table("sgj_xt.xt_base_drug as b").Where("b.status =1")
+	dbTwo := XTReadDB().Table("sgj_xt.xt_drug_warehouse_out as t").Where("t.status = 1")
+	dbThree := XTReadDB().Table("sgj_xt.xt_drug_warehouse_info as p").Where("p.status=1")
+	fmt.Print(dbOne, dbTwo, dbThree)
 	if startime > 0 {
 		db = db.Where("x.sys_record_time >=?", startime)
 	}
@@ -393,10 +394,11 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ?  or r.user_name like ?", likeKey, likeKey, likeKey)
 	}
 
+	db = db.Joins("left join sgj_xt.xt_drug_warehouse_info as p on p.id =x.warehouse_info_id")
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	} else {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	}
 
 	return outinfo, total, err
@@ -1146,3 +1148,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/his_service.go

@@ -107,15 +107,15 @@ func (VMHisOrder) TableName() string {
 }
 
 type Patients 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"`
-	Name         string `gorm:"column:name" json:"name" form:"name"`
-	Status       int64  `gorm:"column:status" json:"status" form:"status"`
-	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	Phone        int64  `gorm:"column:phone" json:"phone" form:"phone"`
-	Gender       int64  `gorm:"column:gender" json:"gender" form:"gender"`
-
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name                  string                `gorm:"column:name" json:"name" form:"name"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo              string                `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType          int64                 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Phone                 int64                 `gorm:"column:phone" json:"phone" form:"phone"`
+	Gender                int64                 `gorm:"column:gender" json:"gender" form:"gender"`
+	FirstLetter           string                `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
 	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescription"`
@@ -202,6 +202,7 @@ type PatientTwo struct {
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
 	HisPatient            []*HisPatientTwo      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+	FirstLetter           string                `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (PatientTwo) TableName() string {
@@ -805,6 +806,7 @@ type BaseDrugLib struct {
 	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
@@ -2815,3 +2817,10 @@ func GetChargeHisPatientList(org_id int64, record_date int64) (order []*HisOrder
 	err = readDb.Model(&models.HisOrder{}).Preload("Patients", "status = 1").Where("settle_accounts_date = ? and user_org_id = ? AND status = 1 and order_status = 2", record_date, org_id).Find(&order).Error
 	return
 }
+
+func GetGoodByIdIsStop(good_id int64, org_id int64) (models.GoodInfoSeven, error) {
+
+	goodInfoSeven := models.GoodInfoSeven{}
+	err = XTReadDB().Where("org_id = ? and status = 1 and find_in_set('停用',good_status) = 0 and id =?", org_id, good_id).Find(&goodInfoSeven).Error
+	return goodInfoSeven, err
+}

service/manage_service.go

@@ -1775,7 +1775,7 @@ func GetRegistrationDisinfectList(limit int64, page int64, start_time int64, end
 	if user_org_id > 0 {
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
 	return list, total, err
 }
 

service/new_stock_service.go

@@ -119,7 +119,11 @@ func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword
 		return db.Where("status = 1 and org_id = ? and is_check = 1", orgId)
 	})
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&good).Error
+	if orgId == 10489 {
+		err = db.Count(&total).Offset(offset).Limit(limit).Order("x.sum_count desc").Find(&good).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&good).Error
+	}
 
 	return good, total, err
 }

service/new_warehouse_service.go

@@ -51,9 +51,9 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			return errThree
 		}
 
-		if orgID == 10265 {
-			UpdateGoodInfoByPrice(warehouse.GoodId, orgID, warehouse.Price, warehouse.PackingPrice)
-		}
+		//if orgID == 10265 {
+		//	UpdateGoodInfoByPrice(warehouse.GoodId, orgID, warehouse.Price, warehouse.PackingPrice)
+		//}
 
 		//更新his_prescripton_project出库状态值
 		UpdateHisPrescriptionProjectStatus(goods.GoodId, record_time, orgID, patient_id)
@@ -1268,7 +1268,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 }
 
 // 药品自动出库 递归方式
-func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64) (err error) {
+func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64, unit string) (err error) {
 
 	drugError := models.XtDrugError{
 		UserOrgId:             orgID,
@@ -1304,7 +1304,10 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
-	if advice.PrescribingNumberUnit == drup.MaxUnit {
+	fmt.Println("总数量", countone)
+	fmt.Println("单位1", unit)
+	fmt.Println("单位2", drup.MaxUnit)
+	if unit == drup.MaxUnit {
 		deliver_number_one = countone * drup.MinNumber
 
 	} else {
@@ -1312,8 +1315,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
-	fmt.Println(deliver_number_one)
-
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
@@ -1389,6 +1390,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
+	fmt.Println("库存数量2嚄噢嚄噢噢哦哦嚄噢嚄o", stock_number)
+	fmt.Println("出库数咯哦我我我我嚄嚄嚄嚄", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -1517,95 +1520,67 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
-		warehouseOutInfo := &models.DrugWarehouseOutInfo{
-			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseout.ID,
-			Status:                  1,
-			Ctime:                   advice.RecordDate,
-			Mtime:                   time.Now().Unix(),
-			Remark:                  warehouse.Remark,
-			OrgId:                   orgID,
-			Type:                    1,
-			Manufacturer:            warehouse.Manufacturer,
-			Dealer:                  warehouse.Dealer,
-			IsSys:                   1,
-			SysRecordTime:           advice.RecordDate,
-			DrugId:                  advice.DrugId,
-			Number:                  warehouse.Number,
-			BatchNumber:             warehouse.BatchNumber,
-			Price:                   warehouse.RetailPrice,
-			CountUnit:               drup.MinUnit,
-			RetailPrice:             warehouse.RetailPrice,
-			ProductDate:             warehouse.ProductDate,
-			ExpiryDate:              warehouse.ExpiryDate,
-			PatientId:               advice.PatientId,
-			Count:                   deliver_number, //出最小单位
-			WarehouseInfoId:         warehouse.ID,
-			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-			StorehouseId:            storeConfig.DrugStorehouseOut,
-			IsCheck:                 1,
-			OverCount:               sum_count,
-			AdviceId:                advice.ID,
-		}
+		if orgID != 10188 && orgID != 10217 && orgID != 3877 && orgID != 9671 {
+			warehouseOutInfo := &models.DrugWarehouseOutInfo{
+				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+				WarehouseOutId:          warehouseout.ID,
+				Status:                  1,
+				Ctime:                   advice.RecordDate,
+				Mtime:                   time.Now().Unix(),
+				Remark:                  warehouse.Remark,
+				OrgId:                   orgID,
+				Type:                    1,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				IsSys:                   1,
+				SysRecordTime:           advice.RecordDate,
+				DrugId:                  advice.DrugId,
+				Number:                  warehouse.Number,
+				BatchNumber:             warehouse.BatchNumber,
+				Price:                   warehouse.RetailPrice,
+				CountUnit:               drup.MinUnit,
+				RetailPrice:             warehouse.RetailPrice,
+				ProductDate:             warehouse.ProductDate,
+				ExpiryDate:              warehouse.ExpiryDate,
+				PatientId:               advice.PatientId,
+				Count:                   deliver_number, //出最小单位
+				WarehouseInfoId:         warehouse.ID,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            storeConfig.DrugStorehouseOut,
+				IsCheck:                 1,
+				OverCount:               sum_count,
+				AdviceId:                advice.ID,
+			}
 
-		//查询今日该药品该患者是否有出库数据
-		lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
-		if lastDrugOutInfo.ID == 0 {
-			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-			if errOne != nil {
-				drugError := models.XtDrugError{
-					UserOrgId:             orgID,
-					DrugId:                advice.DrugId,
-					RecordDate:            advice.AdviceDate,
-					PatientId:             advice.PatientId,
-					Remark:                "创建出库单失败",
-					Status:                1,
-					Ctime:                 time.Now().Unix(),
-					Mtime:                 0,
-					SumCount:              0,
-					Prescribingnumber:     advice.PrescribingNumber,
-					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			//查询今日该药品该患者是否有出库数据
+			lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+			if lastDrugOutInfo.ID == 0 {
+				errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+				if errOne != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "创建出库单失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 				}
-				CreateDrugError(drugError)
-				return errOne
 			}
-		}
-		if lastDrugOutInfo.ID > 0 {
+			if lastDrugOutInfo.ID > 0 {
 
-			//删除在新增
-			UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
+				//删除在新增
+				UpdateDrugWarehouseOutInfoTen(lastDrugOutInfo.PatientId, lastDrugOutInfo.SysRecordTime, advice.ID)
 
-			AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+				AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 
-			//var his_count int64
-			//if lastDrugOutInfo.CountUnit == drup.MaxUnit {
-			//	his_count = lastDrugOutInfo.Count * drup.MinNumber
-			//}
-			//if lastDrugOutInfo.CountUnit == drup.MinUnit {
-			//	his_count = lastDrugOutInfo.Count
-			//}
-			//fmt.Println("deliver_number", deliver_number)
-			//fmt.Println("his_countwowowoowow", his_count)
-			//if deliver_number != his_count {
-			//	errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
-			//	if errThree != nil {
-			//		drugError := models.XtDrugError{
-			//			UserOrgId:             orgID,
-			//			DrugId:                advice.DrugId,
-			//			RecordDate:            advice.AdviceDate,
-			//			PatientId:             advice.PatientId,
-			//			Remark:                "更新出库单失败",
-			//			Status:                1,
-			//			Ctime:                 time.Now().Unix(),
-			//			Mtime:                 0,
-			//			SumCount:              0,
-			//			Prescribingnumber:     advice.PrescribingNumber,
-			//			PrescribingNumberUnit: advice.PrescribingNumberUnit,
-			//		}
-			//		CreateDrugError(drugError)
-			//		return errThree
-			//	}
-			//}
+			}
 		}
 
 		var out_count int64
@@ -1622,8 +1597,51 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
+		fmt.Println("总出口数量", deliver_number_one)
+		fmt.Println("出库数量", out_count)
+		fmt.Println("退款数来的发阿道夫", cancel_count)
+
+		fmt.Println("查收嗖嗖嗖哦", deliver_number_one-(out_count-cancel_count))
 		if deliver_number_one-(out_count-cancel_count) >= 0 {
-			if (deliver_number - out_count - cancel_count) != 0 {
+			if (deliver_number_one - out_count - cancel_count) != 0 {
+
+				if orgID == 10217 || orgID == 10188 || orgID == 3877 || orgID == 9671 {
+					warehouseOutInfo := &models.DrugWarehouseOutInfo{
+						WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+						WarehouseOutId:          warehouseout.ID,
+						Status:                  1,
+						Ctime:                   advice.RecordDate,
+						Mtime:                   time.Now().Unix(),
+						Remark:                  warehouse.Remark,
+						OrgId:                   orgID,
+						Type:                    1,
+						Manufacturer:            warehouse.Manufacturer,
+						Dealer:                  warehouse.Dealer,
+						IsSys:                   1,
+						SysRecordTime:           advice.RecordDate,
+						DrugId:                  advice.DrugId,
+						Number:                  warehouse.Number,
+						BatchNumber:             warehouse.BatchNumber,
+						Price:                   warehouse.RetailPrice,
+						CountUnit:               drup.MinUnit,
+						RetailPrice:             warehouse.RetailPrice,
+						ProductDate:             warehouse.ProductDate,
+						ExpiryDate:              warehouse.ExpiryDate,
+						PatientId:               advice.PatientId,
+						Count:                   deliver_number_one - (out_count - cancel_count), //出最小单位
+						WarehouseInfoId:         warehouse.ID,
+						SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+						StorehouseId:            storeConfig.DrugStorehouseOut,
+						IsCheck:                 1,
+						OverCount:               sum_count,
+						AdviceId:                advice.ID,
+					}
+
+					AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+
+				}
+				lastDrugOutInfo, _ := GetNewDrugWarehouseOutInfoSix(advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId, advice.ID, warehouse.ID)
+
 				drugflow := models.DrugFlow{
 					WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseout.ID,
@@ -1947,6 +1965,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			StockMinNumber:    0,
 			BatchNumber:       warehouse.BatchNumber,
 			MaxUnit:           warehouse.MaxUnit,
+			MinUnit:           drup.MinUnit,
 			WarehousingInfoId: warehouse.WarehousingInfoId,
 			SupplyWarehouseId: warehouse.SupplyWarehouseId,
 			StorehouseId:      storeConfig.DrugStorehouseOut,
@@ -2140,6 +2159,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
+		fmt.Println("deliver_nbumbwowowoowowow", deliver_number)
+		fmt.Println("out_coutnwoowowowowowow", out_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number > (out_count - cancel_count) {
 
@@ -2372,7 +2393,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
 
-		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber)
+		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber, unit)
 	}
 
 	return

service/patient_schedule_template_service.go

@@ -890,12 +890,13 @@ func SavePatientScheduleTemplateMode4To3(templateMode *models.PatientScheduleTem
 }
 
 type SchTemplatePatient 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"`
-	Name       string `gorm:"column:name" json:"name" form:"name"`
-	Lapseto    int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Lapseto      int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	DialysisNo   string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	IsInfectious int64  `gorm:"column:is_infectious" json:"is_infectious"`
 }
 
 func (SchTemplatePatient) TableName() string {

service/patient_service.go

@@ -768,14 +768,14 @@ func CreatePatientsNew(patientsNew *models.XtPatientsNew) error {
 
 func CreateAllergic(allergic models.XtPatientAllergic) error {
 
-	err := XTWriteDB().Model(&allergic).Create(&allergic).Error
+	err := XTWriteDB().Create(&allergic).Error
 
 	return err
 }
 
 func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto) (err error) {
 	utx := writeDb.Begin()
-	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto, "out_reason": patient.OutReason, "death_time": patient.DeathTime}).Error
+	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto, "out_reason": patient.OutReason, "death_time": patient.DeathTime, "patient_start_time": patient.PatientStartTime, "patient_end_time": patient.PatientEndTime, "patient_address": patient.PatientAddress}).Error
 	//err = utx.Model(&models.PatientLapseto{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto_type": patient.Lapseto, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		utx.Rollback()
@@ -1609,8 +1609,8 @@ func MobileGetMonitorsWithPatient(orgID int64, keyword string, page int) ([]*mod
 }
 
 func GetPatientByKeyWord(orgID int64, keywords string) (patient []*models.Patients, err error) {
-	db := readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID)
-	fmt.Println("keywords22222223322332322332322323323", 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 ? OR dialysis_no LIKE ? ", likekey, likekey).Find(&patient).Error
@@ -3074,3 +3074,143 @@ func GetBaseDrugByName(drug_name string, org_id int64) (models.BaseDrugLibSeven,
 
 	return libSeven, err
 }
+
+func CreateDeviceValsualMap(valsualMap models.XtDeviceValsualMap) error {
+
+	err := XTWriteDB().Save(&valsualMap).Error
+
+	return err
+}
+
+func GetPatientSitemap(patient_id int64, user_org_id int64) (models.XtDeviceValsualMap, error) {
+
+	valsualMap := models.XtDeviceValsualMap{}
+	err := XTReadDB().Where("patient_id = ? and status =1 and user_org_id = ?", patient_id, user_org_id).Preload("XtDeviceValsualALeft", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualVLeft", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualMapFangxiangA", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualMapFangxiangV", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualFuzhuA", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualFuzhuV", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualTextArr", "status=1 and user_org_id =?", user_org_id).Preload("DeviceValusalMapArr", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValusalMapVrr", "status=1 and user_org_id =?", user_org_id).Find(&valsualMap).Error
+	return valsualMap, err
+}
+
+func UpdateSiteMap(valsualMap models.XtDeviceValsualMap) error {
+
+	err := XTWriteDB().Save(&valsualMap).Error
+	return err
+}
+
+func CreateValsualAleft(left models.XtDeviceValsualALeft) error {
+
+	err := XTWriteDB().Create(&left).Error
+	return err
+}
+
+func UpdateValsualAleft(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualALeft{}).Where("patient_id = ? and user_org_id = ? and status =1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateValsualMapFangxiangA(a models.XtDeviceValsualMapFangxiangA) error {
+
+	err := XTWriteDB().Create(&a).Error
+	return err
+}
+
+func UpdateValsualMapFangxiangA(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualMapFangxiangA{}).Where("patient_id = ? and user_org_id = ? and status =1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateValsualMapFangxiangV(v models.XtDeviceValsualMapFangxiangV) error {
+
+	err := XTWriteDB().Create(&v).Error
+	return err
+}
+
+func UpdateValsualMapFangxiangV(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualMapFangxiangV{}).Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func ValsualMapFangxiangA(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(models.XtDeviceValsualMapFangxiangA{}).Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateValSualFuzhA(a models.XtDeviceValsualFuzhuA) error {
+
+	err := XTReadDB().Create(&a).Error
+	return err
+}
+
+func UpdateValSualFuzhA(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualFuzhuA{}).Where("patient_id =? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateVasuaLfuzhuV(v models.XtDeviceValsualFuzhuV) error {
+
+	err := XTReadDB().Create(&v).Error
+	return err
+}
+
+func UpdateVasuaLfuzhuV(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualFuzhuV{}).Where("patient_id = ? and user_org_id =? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateTextArr(arr models.XtDeviceValsualTextArr) error {
+
+	err := XTReadDB().Create(&arr).Error
+	return err
+}
+
+func UpdateTextArr(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualTextArr{}).Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateValsualVleft(left models.XtDeviceValsualVLeft) error {
+
+	err = XTReadDB().Create(&left).Error
+	return err
+}
+
+func UpdateValsualVleft(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualVLeft{}).Where("patient_id = ? and user_org_id =? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateValusalMapArr(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValusalMapArr{}).Where("patient_id =? and user_org_id =? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateDeviceValusalMapArr(vrr models.XtDeviceValusalMapArr) error {
+
+	err := XTWriteDB().Create(&vrr).Error
+	return err
+}
+
+func UpdateDeviceValusalMapVrr(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValusalMapVrr{}).Where("patient_id = ? and user_org_id =? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateDeviceValusalMapVrr(vrr models.XtDeviceValusalMapVrr) error {
+
+	err := XTWriteDB().Create(&vrr).Error
+	return err
+}
+
+func GetAdviceListNoExecution(advice_date int64, user_org_id int64) (advice []*models.XtDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("advice_date = ? and user_org_id = ? and status =1 and execution_state = 2", advice_date, user_org_id).Find(&advice).Error
+	return advice, err
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -302,7 +302,10 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 
 	db := p_service.XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
 	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+
+	tableOne := p_service.XTReadDB().Table("xt_warehouse_info as p").Where("p.status = 1")
 	fmt.Println(table)
+	fmt.Println("tableOne", tableOne)
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
@@ -312,7 +315,7 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 	if endtime > 0 {
 		db = db.Where("x.sys_record_time<=?", endtime)
 	}
-	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price,t.manufacturer,t.dealer,p.price").Joins("left join xt_warehouse_info as p on p.id =x.warehouse_info_id").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
 	return out, 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
+}

service/self_drug_service.go

@@ -1850,10 +1850,6 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 		db = db.Preload("DrugWarehouseInfo", "org_id = ? and status = 1 and is_check = 1", orgId)
 	}
 
-	//if len(goodIds) > 0 {
-	//	db = db.Where("id in(?)", goodIds)
-	//}
-
 	if len(keyword) > 0 {
 		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)
 	}
@@ -1861,19 +1857,36 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 	if orgId > 0 {
 		db = db.Where("x.org_id = ?", orgId)
 	}
-	err = db.Preload("XtDrugStockCount", func(db *gorm.DB) *gorm.DB {
-		if storehouse_id > 0 {
-			db = db.Where("storehouse_id = ?", storehouse_id)
-		}
-		return db.Where("status = 1 and user_org_id = ?", orgId)
 
-	}).Preload("DrugStockCount", func(db *gorm.DB) *gorm.DB {
-		if storehouse_id > 0 {
-			db = db.Where("storehouse_id = ?", storehouse_id)
-		}
-		return db.Where("status = 1 and user_org_id = ?", orgId).Group("drug_id,storehouse_id")
+	if orgId == 10489 {
+		err = db.Preload("XtDrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId)
+
+		}).Preload("DrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId).Group("drug_id,storehouse_id")
+
+		}).Count(&total).Offset(offset).Limit(limit).Order("x.sum_count desc").Find(&drug).Error
+	} else {
+		err = db.Preload("XtDrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId)
 
-	}).Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&drug).Error
+		}).Preload("DrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId).Group("drug_id,storehouse_id")
+
+		}).Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&drug).Error
+	}
 
 	return drug, total, err
 }
@@ -1904,6 +1917,7 @@ func GetDrugWarehouseOutInfoByIdList(good_id int64, limit int64, page int64, org
 func GetAllGoodListSeven(orgid int64) (good []*models.GoodInfoSeven, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&good).Error
+
 	return good, err
 }
 
@@ -2012,7 +2026,7 @@ func GetEndGoodWarehouseInfoList(good_id int64, orgid int64, endtime int64) (inf
 	return info, err
 }
 
-func GetAddGoodWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.StartWarehousingInfo, err error) {
+func GetAddGoodWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (info []*models.StartWarehousingInfo, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1 and is_check =1")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2026,12 +2040,33 @@ func GetAddGoodWarehouseInfoList(good_id int64, orgid int64, startime int64, end
 	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
 	err = db.Find(&info).Error
 	return info, err
 }
 
-func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
-	db := XTReadDB().Model(&info).Where("status = 1 and consumable_type =1")
+func GetAddGoodWarehouseInfoListTwenty(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.StartWarehousingInfo, err error) {
+	db := XTReadDB().Model(&info).Where("status = 1 and is_check =1")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}
+
+func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (info []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type =1 or consumable_type = 13)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
 	}
@@ -2044,11 +2079,54 @@ func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64)
 	if endtime > 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id =?", storehouse_id)
+	}
 	err = db.Find(&info).Error
 	return info, err
 }
 
-func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func GetAddStartFlowTwenty(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type =1)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+
+	err = db.Find(&info).Error
+	return info, err
+}
+
+func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type= 15)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
+func GetReduceWarehouseInfoListTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type= 15)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2066,7 +2144,28 @@ func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endt
 	return outinfo, err
 }
 
-func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 7)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id =?", storehouse_id)
+	}
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
+func GetStartEndCancelFLowInfoTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 7)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2179,7 +2278,7 @@ func FindEndCancelInfo(good_id int64, orgid int64, endtime int64) (info []*model
 	return info, err
 }
 
-func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type = 15)")
 	if good_id > 0 {
@@ -2191,6 +2290,26 @@ func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64) (outinfo
 	if startime > 0 {
 		db = db.Where("ctime <?", startime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id= ?", storehouse_id)
+	}
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
+func FindeWarehouseOutInfoTwenty(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3 or consumable_type = 15)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime <?", startime)
+	}
+
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
@@ -2211,7 +2330,7 @@ func FindeStartStockInventoryProfit(good_id int64, orgid int64, startime int64)
 	return outinfo, err
 }
 
-func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 10)")
 	if good_id > 0 {
@@ -2226,11 +2345,55 @@ func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, end
 	if endtime < 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
 
-func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+func FindeEndStokInventoryProfitTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 10)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime < 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
+func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, endtime int64, storehouse_id int64) (outinfo []*models.VmStockFlowTwenty, err error) {
+	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime < 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
+	return outinfo, err
+}
+
+func FindeEndStockInventoryLossesTwenty(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2244,6 +2407,7 @@ func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, en
 	if endtime < 0 {
 		db = db.Where("ctime <=?", endtime)
 	}
+
 	err = db.Preload("WarehousingInfo", "org_id = ? and status = 1", orgid).Find(&outinfo).Error
 	return outinfo, err
 }
@@ -2645,14 +2809,27 @@ func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64
 	return goodinfo, total, err
 }
 
-func GetStartLastFLow(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
+func GetStartLastFLow(goodid int64, orgid int64, startime int64, storehouse_id int64) (models.VmStockFlowTwenty, error) {
+
+	flwo := models.VmStockFlowTwenty{}
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ? and storehouse_id = ?", goodid, orgid, startime, storehouse_id).Last(&flwo).Error
+	return flwo, err
+}
+
+func GetStartLastFLowTwenty(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
 
 	flwo := models.VmStockFlowTwenty{}
 	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime < ?", goodid, orgid, startime).Last(&flwo).Error
 	return flwo, err
 }
 
-func GetEndLastFlow(goodid int64, orgid int64, endtime int64) (models.VmStockFlowTwenty, error) {
+func GetEndLastFlow(goodid int64, orgid int64, endtime int64, storehouse_id int64) (models.VmStockFlowTwenty, error) {
+	flwo := models.VmStockFlowTwenty{}
+	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ? and storehouse_id= ?", goodid, orgid, endtime, storehouse_id).Last(&flwo).Error
+	return flwo, err
+}
+
+func GetEndLastFlowTwenty(goodid int64, orgid int64, endtime int64) (models.VmStockFlowTwenty, error) {
 	flwo := models.VmStockFlowTwenty{}
 	err := XTReadDB().Where("good_id = ? and user_org_id = ? and status = 1 and ctime <= ?", goodid, orgid, endtime).Last(&flwo).Error
 	return flwo, err

service/sign_service.go

@@ -273,15 +273,13 @@ func CreateUploadPact(contractcode string, contractname string, signcount int64,
 
 	maprequest := make(map[string]interface{})
 
-	//maprequest["contractCode"] = "102020620701056856"
-
 	maprequest["contractName"] = "电脑购买交易合同"
 
 	maprequest["signCount"] = 10
 
 	maprequest["docName"] = "日本员工保密协议"
 
-	file := "C:/Users/28169/Desktop/打印单.pdf"
+	file := "C:/Users/28169/Desktop/2.pdf"
 
 	fileBytes, err := ioutil.ReadFile(file) // 读取file
 
@@ -481,7 +479,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 	signFiles := make(map[string]interface{})
 
 	//创建合同返回
-	signFiles["docId"] = "157595002862567873"
+	signFiles["docId"] = "158807311102510183"
 
 	inputDataArr := make([]map[string]interface{}, 0)
 
@@ -491,8 +489,8 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 		xySignControls["key"] = "1"
 		xySignControls["type"] = "autograph"
 		xySignControls["pageNum"] = 1
-		xySignControls["positionX"] = "100F"
-		xySignControls["positionY"] = "100F"
+		xySignControls["positionX"] = "120F"
+		xySignControls["positionY"] = "120F"
 		inputDataArr = append(inputDataArr, xySignControls)
 
 	}
@@ -503,7 +501,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 		keywordSignControls["key"] = "2"
 		keywordSignControls["type"] = "date"
 		keywordSignControls["pageNum"] = 1
-		keywordSignControls["keyword"] = "医生签名"
+		keywordSignControls["keyword"] = "王志文"
 		keywordSignControls["offsetX"] = "100F"
 		keywordSignControls["offsetY"] = "100F"
 		inputDataArrTwo = append(inputDataArrTwo, keywordSignControls)
@@ -528,7 +526,7 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 	inputDataArrFour = append(inputDataArrFour, signersFiles)
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157595002862567872"
+	maprequest["contractId"] = "158807311102510182"
 	maprequest["signers"] = inputDataArrFour
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -605,21 +603,21 @@ func CreateBackStageSign(contractId string, signers string) string {
 
 	fmt.Println("signContorlwqowowo", signControl)
 	signFiles["signControl"] = signControl
-	signFiles["docId"] = "157595002862567873"
+	signFiles["docId"] = "158807311102510183"
 	inputDataArrThree := make([]map[string]interface{}, 0)
 	inputDataArrThree = append(inputDataArrThree, signFiles)
 
 	signer := make(map[string]interface{})
 
 	//添加合同签署人接口返回
-	signer["signerId"] = "157595142449004996"
+	signer["signerId"] = "158807462500107405"
 	signer["isUserWishes"] = true
 	signer["userWishesWay"] = 1
-	signer["codeNumber"] = "msg202308261800395745892"
-	signer["verifyCode"] = "452399"
+	signer["codeNumber"] = "msg202309081937527315153"
+	signer["verifyCode"] = "252234"
 	signer["signFiles"] = inputDataArrThree
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157595002862567872"
+	maprequest["contractId"] = "158807311102510182"
 	maprequest["signer"] = signer
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -665,7 +663,7 @@ func GetVerificationCode() string {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157595002862567872"
+	maprequest["contractId"] = "158807311102510182"
 	maprequest["userId"] = "PBRLMBFVIRR3BV8JGGOX9C7N"
 
 	byterequest, _ := json.Marshal(maprequest)
@@ -1165,7 +1163,7 @@ func GetContractId() string {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157475501840007476"
+	maprequest["contractId"] = "158799561907766048"
 	maprequest["responseContractFile"] = true
 
 	fmt.Println("request23222222222222222", maprequest)
@@ -1261,7 +1259,7 @@ func GetEnterPriseDetail() (string, string) {
 	serviceCode := beego.AppConfig.String("serviceCode")
 
 	maprequest := make(map[string]interface{})
-	maprequest["contractId"] = "157594023610024377"
+	maprequest["contractId"] = "158807311102510182"
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)
@@ -1374,3 +1372,12 @@ func CreateNewUploadPact(name string) string {
 	fmt.Println("strwwoowowow", str)
 	return str
 }
+
+func GetDataConfigDisinfectionFluid(org_id int64) (models.Dataconfig, error) {
+
+	dataconfig := models.Dataconfig{}
+
+	err := XTReadDB().Where("org_id = ? and status =1 and id =12536", org_id).Find(&dataconfig).Error
+
+	return dataconfig, err
+}

service/stock_service.go

@@ -2939,6 +2939,7 @@ func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int6
 	}
 
 	db = db.Preload("WarehouseOut", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("WarehousingInfoNight", "status=1 and org_id = ?", orgId)
 	db = db.Preload("GoodInfo", "status = 1 AND org_id = ?", orgId)
 	db = db.Count(&total)
 	offset := (page - 1) * limit
@@ -4421,7 +4422,8 @@ func GetExprotStockListTwenty(orgid int64, orderid []string, startime int64, end
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
+
+	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name,p.warehousing_time").Joins("left join xt_warehouse as p on p.id =x.warehousing_id").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
 
 	return info, err
 }
@@ -4449,7 +4451,8 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 
 	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status =1 ")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
-	fmt.Println(table)
+	tableOne := XTReadDB().Table("xt_warehouse_out as p").Where("p.status=1")
+	fmt.Println(table, tableOne)
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
@@ -4464,7 +4467,7 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 		db = db.Where("x.ctime<=?", endtime)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,x.manufacturer,x.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,x.manufacturer,x.dealer,p.warehouse_out_time").Joins("left join xt_warehouse_out as p on p.id =x.warehouse_out_id").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
 	return out, err
 
 }
@@ -4888,11 +4891,14 @@ func ExportDrugList(warehouse_out_id []string) (out []*models.StDrugWarehouseInf
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status =1")
 
 	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+
+	tableOne := XTReadDB().Table("xt_drug_warehouse as p")
 	fmt.Println("table", table)
+	fmt.Println("tableOne", tableOne)
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehousing_id in(?)", warehouse_out_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.dealer,x.manufacturer,x.warehousing_order,x.batch_number,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.dealer,x.manufacturer,x.warehousing_order,x.batch_number,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,p.warehousing_time").Joins("left join xt_drug_warehouse as p on p.id =x.warehousing_id").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }
 

service/warhouse_service.go

@@ -619,7 +619,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
+			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit)
 
 		} else {
 			return errors.New("药品信息不存在")