2024/6/17

controllers/base_api_controller.go

@@ -72,10 +72,10 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 4745
+		userAdmin.Id = 4608
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 4745 //4，809
+		userAdmin.Id = 4608 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = true
 		userAdmin.Status = 1
@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10138 //机构id
+		subscibe.OrgId = 10644 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17513 //4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17260 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -318,10 +318,10 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 4745
+		userAdmin.Id = 4608
 		userAdmin.Mobile = "13318599895"
 
-		userAdmin.Id = 4745 //4，809
+		userAdmin.Id = 4608 //4，809
 		userAdmin.Mobile = "12222222222"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10138 //机构id小英9675或4
+		subscibe.OrgId = 10644 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 17513 //4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17260 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/data_api_controller.go

@@ -1,16 +1,17 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"reflect"
 	"strconv"
 	"time"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+
 	"github.com/astaxie/beego"
 )
 
@@ -1437,11 +1438,13 @@ func (c *DataApiController) GetAllAdviceConfigs() {
 	drugways, _, _ := service.GetDrugWayDics(adminUserInfo.CurrentOrgId)
 	efs, _, _ := service.GetExecutionFrequencyDics(adminUserInfo.CurrentOrgId)
 	adviceTemplates, _ := service.FindOtherAllAdviceTemplate(adminUserInfo.CurrentOrgId)
+	dics, _, _ := service.GetDrugWayDics(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"drugs":            drugs,
 		"drugways":         drugways,
 		"efs":              efs,
 		"advice_templates": adviceTemplates,
+		"dics":             dics,
 	})
 }
 

controllers/doctors_api_controller.go

@@ -1,17 +1,18 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type DoctorsApiController struct {
@@ -70,6 +71,10 @@ func DoctorApiRegistRouters() {
 
 	beego.Router("/api/schedule/getpatientbyname", &DoctorsApiController{}, "Get:GetPatientByName")
 	beego.Router("/api/schedule/getdocadvicebypatientid", &DoctorsApiController{}, "Get:GetDoctorAdviceByPatientId")
+
+	beego.Router("/api/schedule/getdoctoradvicemonthlist", &DoctorsApiController{}, "Get:GetDoctorAdivceMonthList")
+
+	beego.Router("/api/schedule/gethisprescriptionprojectmonthlist", &DoctorsApiController{}, "Get:GetHisPrescriptionProjectMonthList")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -1697,12 +1702,6 @@ func (c *DoctorsApiController) GetDoctorAdviceByPatientId() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	end_time := c.GetString("end_time")
 
-	fmt.Println("patient_id", patient_id)
-	fmt.Println("startdateunix", start_time)
-	fmt.Println("enddateunix", end_time)
-	fmt.Println("limit", limit)
-	fmt.Println("page", page)
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -1733,3 +1732,85 @@ func (c *DoctorsApiController) GetDoctorAdviceByPatientId() {
 		"total": total,
 	})
 }
+
+func (c *DoctorsApiController) GetDoctorAdivceMonthList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	start_time := c.GetString("start_time")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	end_time := c.GetString("end_time")
+	var startTimeUnix 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
+		}
+		startTimeUnix = theTime.Unix()
+	}
+
+	var endTimeUnix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTimeUnix = theTime.Unix()
+	}
+
+	adviceList, _ := service.GetDoctorAdivceMonthList(orgId, startTimeUnix, endTimeUnix)
+
+	hisAdviceList, _ := service.GetHisDoctorAdivceMonthList(orgId, startTimeUnix, endTimeUnix)
+
+	drugs, _ := service.GetAllBaseDrugLibList(orgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	_, config := service.FindXTHisRecordByOrgId(orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"adviceList":       adviceList,
+		"hisAdviceList":    hisAdviceList,
+		"config":           config,
+		"drugs":            drugs,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (c *DoctorsApiController) GetHisPrescriptionProjectMonthList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	start_time := c.GetString("start_time")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	end_time := c.GetString("end_time")
+	var startTimeUnix 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
+		}
+		startTimeUnix = theTime.Unix()
+	}
+
+	var endTimeUnix int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTimeUnix = theTime.Unix()
+	}
+
+	projectMonthList, _ := service.GetHisPrescriptionProjectMonthList(orgId, startTimeUnix, endTimeUnix)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"projectMonthList": projectMonthList,
+	})
+}

controllers/gobal_config_api_controller.go

@@ -134,6 +134,8 @@ func GobalConfigRegistRouters() {
 	beego.Router("/api/changeselfprescriptionoutopen", &GobalConfigApiController{}, "Get:ChangeSelfPrescriptionOutOpen")
 
 	beego.Router("/api/getselfprintlist", &GobalConfigApiController{}, "Get:GetSelfPrintList")
+
+	beego.Router("/api/changedrugcodeopen", &GobalConfigApiController{}, "Get:ChangeDrugCodeOpen")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1665,6 +1667,8 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	drugSettleConfig, _ := service.FindeDrugSettleConfigById(adminUserInfo.CurrentOrgId)
 
 	goodOutConfig, _ := service.FindGoodOutConfigById(adminUserInfo.CurrentOrgId)
+
+	drugCodeOpen, _ := service.GetDrugCodeOpen(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,
 		"is_open_xt_his_project": project_config.IsOpen,
@@ -1674,6 +1678,7 @@ func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 		"is_open":                drugOutConfig.IsOpen,
 		"is_seetle_open":         drugSettleConfig.IsOpen,
 		"is_out_open":            goodOutConfig.IsOpen,
+		"is_code_open":           drugCodeOpen.IsOpen,
 	})
 
 }
@@ -1759,6 +1764,7 @@ func (c *GobalConfigApiController) GetDrugInDetail() {
 	limit, _ := c.GetInt64("limit")
 
 	detail, total, err := service.GetDrugInOrderDetail(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
+
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
@@ -2776,3 +2782,41 @@ func (this *GobalConfigApiController) GetSelfPrintList() {
 		"selfPrescriptionOutOpen": selfPrescriptionOutOpen,
 	})
 }
+
+func (this *GobalConfigApiController) ChangeDrugCodeOpen() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	is_open, _ := this.GetInt64("is_open")
+	drugCodeOpen, _ := service.GetDrugCodeOpen(orgId)
+
+	if drugCodeOpen.ID == 0 {
+
+		codeOpen := models.XtDrugCodeOpen{
+			UserOrgId: orgId,
+			IsOpen:    is_open,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+		}
+
+		service.CreateDrugOpen(codeOpen)
+	}
+
+	if drugCodeOpen.ID == 1 {
+
+		codeOpen := models.XtDrugCodeOpen{
+			ID:        drugCodeOpen.ID,
+			UserOrgId: orgId,
+			IsOpen:    is_open,
+			Status:    1,
+			Ctime:     time.Now().Unix(),
+			Mtime:     time.Now().Unix(),
+		}
+
+		service.SaveDrugOpen(codeOpen)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugCodeOpen": drugCodeOpen,
+	})
+}

controllers/his_api_controller.go

@@ -3183,7 +3183,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10164 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3684,7 +3684,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 
 								//赤峰
-								if adminInfo.CurrentOrgId == 10265 {
+								if adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10489 {
 
 									drug, _ := service.FindNewBaseDrugLibRecord(adminInfo.CurrentOrgId, s.DrugId, tx)
 
@@ -3760,7 +3760,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									projectDetail, _ := service.GetHisPrescriptonProjectById(p.ID)
 									p.IsOut = projectDetail.IsOut
 								}
-								if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 10265 {
+								if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10489 {
 									storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 									if p.Type == 3 {
 										lastWarehouse, _ := service.FindFirstWarehousingInfoByStockThree(p.ProjectId, storeConfig.DrugStorehouseOut)
@@ -4218,6 +4218,57 @@ func (c *HisApiController) CreateHisPrescription() {
 									}
 								}
 
+								//插入检验数据
+								if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
+									//新增或者编辑项目，修改对应的标签数据
+									labelOrigin, _ := service.GetProjectById(p.UserOrgId, p.ID, patient_id, recordDateTime)
+									if labelOrigin.ID == 0 { //当天某个人的处方中的项目不存在
+										var label models.HisLabelPrintInfo
+										project, _ := service.GetProjectDetail(p.ProjectId)
+										if project.CostClassify == 3 { //类别为检验检查
+											if p.TeamId > 0 { //检验检查组套
+												tempLabel, _ := service.GetProjectByTeamId(p.UserOrgId, p.TeamId, patient_id, recordDateTime)
+												if tempLabel.ID == 0 {
+													team, _ := service.GetProjectTeamDetail(p.TeamId)
+													label.Number = tempPrescription.PrescriptionNumber
+													label.ProjectId = project.ID
+													label.Status = 1
+													label.IsPrint = 2
+													label.DoctorId = info.DoctorId
+													label.UserOrgId = p.UserOrgId
+													label.PatientId = patient_id
+													label.RecordDate = recordDateTime
+													label.Ctime = time.Now().Unix()
+													label.Mtime = time.Now().Unix()
+													label.ItemId = p.TeamId
+													label.FeedetlSn = p.FeedetlSn
+													label.PProjectId = p.ID
+													label.ProjectName = team.ProjectTeam
+													label.PatientName = patient.Name
+													service.CreateHisLabelRecord(&label)
+												}
+											} else { //单条检验检查项目
+												label.Number = tempPrescription.PrescriptionNumber
+												label.ProjectId = project.ID
+												label.Status = 1
+												label.DoctorId = info.DoctorId
+												label.UserOrgId = p.UserOrgId
+												label.PatientId = patient_id
+												label.RecordDate = recordDateTime
+												label.IsPrint = 2
+												label.Ctime = time.Now().Unix()
+												label.Mtime = time.Now().Unix()
+												label.FeedetlSn = p.FeedetlSn
+												label.PProjectId = p.ID
+												label.ItemId = p.TeamId
+												label.ProjectName = project.ProjectName
+												label.PatientName = patient.Name
+												service.CreateHisLabelRecord(&label)
+											}
+										}
+									}
+								}
+
 								service.CreateNewHisProjectTwo(&p, tx)
 								var randNum int
 								randNum = rand.Intn(10000) + 1000
@@ -4521,7 +4572,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 
 								//赤峰
-								if s.UserOrgId == 10265 {
+								if s.UserOrgId == 10265 || s.UserOrgId == 10489 {
 									drug, _ := service.GetDrugByGoodId(s.DrugId)
 									info, _ := service.GetWarehoseInfoByDrugId(s.DrugId, s.UserOrgId)
 									if info.RetailPrice > 0 {
@@ -10345,7 +10396,7 @@ func (this *HisApiController) GetLastOrNextHisPrescription() {
 	adminUserInfo := this.GetAdminUserInfo()
 	prescriptions, err := service.GetHisPrescriptionByType(change_type, record_time, adminUserInfo.CurrentOrgId, patient_id, p_type)
 
-	if adminUserInfo.CurrentOrgId == 10265 {
+	if adminUserInfo.CurrentOrgId == 10265 || adminUserInfo.CurrentOrgId == 10489 {
 		_, config := service.FindHisStockPriceRecordByOrgId(adminUserInfo.CurrentOrgId)
 		if config.ID > 0 && config.IsOpen == 1 {
 			for _, subitems := range prescriptions {
@@ -10418,7 +10469,7 @@ func (this *HisApiController) GetCallHisPrescription() {
 	//
 	//lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
 
-	if adminUserInfo.CurrentOrgId == 10265 {
+	if adminUserInfo.CurrentOrgId == 10265 || adminUserInfo.CurrentOrgId == 10489 {
 		_, config := service.FindHisStockPriceRecordByOrgId(adminUserInfo.CurrentOrgId)
 		if config.ID > 0 && config.IsOpen == 1 {
 			for _, subitems := range prescriptions {

controllers/manager_center_api_controller.go

@@ -1846,7 +1846,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	}
 	err, goodInfos := service.ModifyGoodInfo(&goodInfo)
 
-	if adminUserInfo.CurrentOrgId != 10653 {
+	if adminUserInfo.CurrentOrgId != 10653 && adminUserInfo.CurrentOrgId != 10644 {
 		list, _ := service.GetHisPrescripionProjectList(good_id, adminUserInfo.CurrentOrgId)
 		if len(list) > 0 {
 			for _, item := range list {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -716,7 +716,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//恒泰中医院
-				if item.UserOrgId == 10490 || item.UserOrgId == 10602 {
+				if item.UserOrgId == 10490 || item.UserOrgId == 10602 || item.UserOrgId == 10697 {
 					if item.DrugId == 0 || item.DrugNameId == 0 {
 						//从字典里面查找
 						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
@@ -745,8 +745,190 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				service.CreateDoctorAdviceLog(adviceLog)
 			}
+			advicesOne, _ := service.FindAllDoctorAdviceByGoroupNoOne(adminUserInfo.Org.Id, groupno)
+			for _, item := range advicesOne {
+
+				//自备药
+				selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+				if selfPrescriptionOutOpen.IsOpen == 1 {
+
+					db := service.XTWriteDB()
+					tx := db.Begin()
+					defer func() {
+						if r := recover(); r != nil {
+							tx.Rollback()
+						} else {
+							tx.Commit()
+						}
+					}()
+
+					selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId, tx)
+
+					if selfBasedrug.IsSelfDrug == 1 {
+
+						//查询是否有库存
+						infoList, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(item.DrugId, item.PatientId, item.UserOrgId, tx)
+
+						var total_count int64
+						var prescribing_number_total int64
+						for _, items := range infoList {
+							if items.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+								items.StockMaxNumber = items.StockMaxNumber * selfBasedrug.MinNumber
+							}
+
+							total_count += items.StockMaxNumber + items.StockMinNumber
+						}
+
+						if total_count == 0 {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": item,
+								"ids":    ids,
+							})
+							return
+						}
+
+						//判断单位是否相等
+						if selfBasedrug.MaxUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							//转化为最小单位
+							prescribing_number_total = count * selfBasedrug.MinNumber
+						}
+
+						if selfBasedrug.MinUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							prescribing_number_total = count
+
+						}
+
+						if selfBasedrug.MinUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							prescribing_number_total = count
+
+						}
+
+						if prescribing_number_total > total_count {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "3",
+								"advice": item,
+							})
+							return
+						}
+						var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+						//出库
+						if prescribing_number_total <= total_count {
+							timeStr := time.Now().Format("2006-01-02")
+							timeArr := strings.Split(timeStr, "-")
+							total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
+
+							total = total + 1
+							warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+							number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+							number = number + total
+							warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+							operation_time := time.Now().Unix()
+
+							creater := c.GetMobileAdminUserInfo().AdminUser.Id
+							//创建一个出库单
+							drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+								WarehouseOutOrderNumber: warehousing_out_order,
+								OperationTime:           operation_time,
+								OrgId:                   adminUserInfo.Org.Id,
+								Creater:                 creater,
+								Ctime:                   time.Now().Unix(),
+								Status:                  1,
+								WarehouseOutTime:        item.AdviceDate,
+								Type:                    0,
+								PatientId:               advice.PatientId,
+								IsCheck:                 1,
+								IsSys:                   1,
+							}
+
+							//查询今日是否有出库数据
+							lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+							if lastWarehouseOut.ID == 0 {
+								service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+							}
+
+							//查询今日是否有出库数据
+							lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+							var warehousing_out_order_str string
+							if lastWarehouseOut.ID == 0 {
+								warehousing_out_order_str = warehousing_out_order
+							} else {
+								warehousing_out_order_str = lastWarehouseOut.WarehouseOutOrderNumber
+							}
+
+							//出库
+							warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+								WarehouseOutId:          lastWarehouseOutOne.ID,
+								WarehouseOutOrderNumber: warehousing_out_order_str,
+								DrugId:                  item.DrugId,
+								Count:                   prescribing_number_total,
+								Price:                   0,
+								TotalPrice:              0,
+								Status:                  1,
+								Ctime:                   item.AdviceDate,
+								Mtime:                   item.AdviceDate,
+								Remark:                  "",
+								OrgId:                   item.UserOrgId,
+								Type:                    0,
+								Manufacturer:            selfBasedrug.Manufacturer,
+								Dealer:                  selfBasedrug.Dealer,
+								RetailPrice:             0,
+								RetailTotalPrice:        0,
+								CountUnit:               selfBasedrug.MinUnit,
+								ExpiryDate:              0,
+								ProductDate:             0,
+								Number:                  "",
+								BatchNumber:             "",
+								IsSys:                   0,
+								WarehouseInfoId:         0,
+								AdminUserId:             0,
+								StockCount:              "",
+								IsCheck:                 1,
+								SysRecordTime:           item.AdviceDate,
+								PatientId:               item.PatientId,
+								AdviceId:                item.ID,
+								ClassType:               "",
+							}
+							warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+							for _, it := range warehousingOutInfo {
+
+								medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+								drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+								//出库逻辑
+								service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+								//查询剩余库存
+								stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+								var sum_count int64
+								for _, its := range stockInfo {
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
+								}
+								service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+							}
+						}
+
+					}
+
+				}
+
+			}
+
 		} else {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+
 			for _, item := range advices {
 				//自备药
 				selfPrescriptionOutOpenOne, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
@@ -802,6 +984,188 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					advice = item
 				}
 			}
+
+			advicesOne, _ := service.FindDoctorAdviceByIdsOne(adminUserInfo.Org.Id, ids)
+			for _, item := range advicesOne {
+
+				//自备药
+				selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
+
+				if selfPrescriptionOutOpen.IsOpen == 1 {
+
+					db := service.XTWriteDB()
+					tx := db.Begin()
+					defer func() {
+						if r := recover(); r != nil {
+							tx.Rollback()
+						} else {
+							tx.Commit()
+						}
+					}()
+
+					selfBasedrug, _ := service.GetSelfBasedrugById(item.DrugId, item.UserOrgId, tx)
+
+					if selfBasedrug.IsSelfDrug == 1 {
+
+						//查询是否有库存
+						infoList, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(item.DrugId, item.PatientId, item.UserOrgId, tx)
+
+						var total_count int64
+						var prescribing_number_total int64
+						for _, items := range infoList {
+							if items.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+								items.StockMaxNumber = items.StockMaxNumber * selfBasedrug.MinNumber
+							}
+
+							total_count += items.StockMaxNumber + items.StockMinNumber
+						}
+
+						if total_count == 0 {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "2",
+								"advice": item,
+								"ids":    ids,
+							})
+							return
+						}
+
+						//判断单位是否相等
+						if selfBasedrug.MaxUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							//转化为最小单位
+							prescribing_number_total = count * selfBasedrug.MinNumber
+						}
+
+						if selfBasedrug.MinUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							prescribing_number_total = count
+
+						}
+
+						if selfBasedrug.MinUnit == item.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							prescribing_number_total = count
+
+						}
+
+						if prescribing_number_total > total_count {
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg":    "3",
+								"advice": item,
+							})
+							return
+						}
+						var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
+						//出库
+						if prescribing_number_total <= total_count {
+							timeStr := time.Now().Format("2006-01-02")
+							timeArr := strings.Split(timeStr, "-")
+							total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
+
+							total = total + 1
+							warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+							number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+							number = number + total
+							warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
+							operation_time := time.Now().Unix()
+
+							creater := c.GetMobileAdminUserInfo().AdminUser.Id
+
+							//创建一个出库单
+							drugWarehouseOut := models.XtSelfDrugWarehouseOut{
+								WarehouseOutOrderNumber: warehousing_out_order,
+								OperationTime:           operation_time,
+								OrgId:                   adminUserInfo.Org.Id,
+								Creater:                 creater,
+								Ctime:                   time.Now().Unix(),
+								Status:                  1,
+								WarehouseOutTime:        item.AdviceDate,
+								Type:                    0,
+								PatientId:               advice.PatientId,
+								IsCheck:                 1,
+								IsSys:                   1,
+							}
+
+							//查询今日是否有出库数据
+							lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+							if lastWarehouseOut.ID == 0 {
+								service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
+							}
+
+							//查询今日是否有出库数据
+							lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, item.AdviceDate, tx, 1)
+
+							var warehousing_out_order_str string
+							if lastWarehouseOut.ID == 0 {
+								warehousing_out_order_str = warehousing_out_order
+							} else {
+								warehousing_out_order_str = lastWarehouseOut.WarehouseOutOrderNumber
+							}
+
+							//出库
+							warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
+								WarehouseOutId:          lastWarehouseOutOne.ID,
+								WarehouseOutOrderNumber: warehousing_out_order_str,
+								DrugId:                  item.DrugId,
+								Count:                   prescribing_number_total,
+								Price:                   0,
+								TotalPrice:              0,
+								Status:                  1,
+								Ctime:                   item.AdviceDate,
+								Mtime:                   item.AdviceDate,
+								Remark:                  "",
+								OrgId:                   item.UserOrgId,
+								Type:                    0,
+								Manufacturer:            selfBasedrug.Manufacturer,
+								Dealer:                  selfBasedrug.Dealer,
+								RetailPrice:             0,
+								RetailTotalPrice:        0,
+								CountUnit:               selfBasedrug.MinUnit,
+								ExpiryDate:              0,
+								ProductDate:             0,
+								Number:                  "",
+								BatchNumber:             "",
+								IsSys:                   0,
+								WarehouseInfoId:         0,
+								AdminUserId:             0,
+								StockCount:              "",
+								IsCheck:                 1,
+								SysRecordTime:           item.AdviceDate,
+								PatientId:               item.PatientId,
+								AdviceId:                item.ID,
+								ClassType:               "",
+							}
+							warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
+
+							for _, it := range warehousingOutInfo {
+
+								medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
+								drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
+								//出库逻辑
+								service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
+
+								//查询剩余库存
+								stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
+								var sum_count int64
+								for _, its := range stockInfo {
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
+								}
+								service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
+							}
+						}
+
+					}
+
+				}
+
+			}
 		}
 
 		if advice.ExecutionState == 1 {
@@ -1361,174 +1725,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		//	}
 		//}
 
-		//自备药
-		selfPrescriptionOutOpen, _ := service.GetSelfPrescriptionOutOpen(adminUserInfo.Org.Id)
-
-		if selfPrescriptionOutOpen.IsOpen == 1 {
-
-			db := service.XTWriteDB()
-			tx := db.Begin()
-			defer func() {
-				if r := recover(); r != nil {
-					tx.Rollback()
-				} else {
-					tx.Commit()
-				}
-			}()
-
-			selfBasedrug, _ := service.GetSelfBasedrugById(advice.DrugId, advice.UserOrgId, tx)
-
-			if selfBasedrug.IsSelfDrug == 1 {
-
-				//查询是否有库存
-				infoList, _ := service.GetSelfWarehouseInfoByWarehouseInfoTwo(advice.DrugId, advice.PatientId, advice.UserOrgId, tx)
-
-				var total_count int64
-				var prescribing_number_total int64
-				for _, items := range infoList {
-					if items.MaxUnit == selfBasedrug.MaxUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
-						items.StockMaxNumber = items.StockMaxNumber * selfBasedrug.MinNumber
-					}
-
-					total_count += items.StockMaxNumber + items.StockMinNumber
-				}
-
-				if total_count == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "2",
-						"advice": advice,
-						"ids":    ids,
-					})
-					return
-				}
-
-				//判断单位是否相等
-				if selfBasedrug.MaxUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					//转化为最小单位
-					prescribing_number_total = count * selfBasedrug.MinNumber
-				}
-
-				if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit != selfBasedrug.MinUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					prescribing_number_total = count
-
-				}
-
-				if selfBasedrug.MinUnit == advice.PrescribingNumberUnit && selfBasedrug.MaxUnit == selfBasedrug.MinUnit {
-					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
-					prescribing_number_total = count
-
-				}
-
-				if prescribing_number_total > total_count {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "3",
-						"advice": advice,
-					})
-					return
-				}
-				var warehousingOutInfo []*models.XtSelfDrugWarehouseOutInfo
-				//出库
-				if prescribing_number_total <= total_count {
-					timeStr := time.Now().Format("2006-01-02")
-					timeArr := strings.Split(timeStr, "-")
-					total, _ := service.FindAllSelfDrugWarehouseOut(adminUserInfo.Org.Id, tx)
-
-					total = total + 1
-					warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-					number = number + total
-					warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-					operation_time := time.Now().Unix()
-
-					creater := c.GetMobileAdminUserInfo().AdminUser.Id
-					//创建一个出库单
-					drugWarehouseOut := models.XtSelfDrugWarehouseOut{
-						WarehouseOutOrderNumber: warehousing_out_order,
-						OperationTime:           operation_time,
-						OrgId:                   adminUserInfo.Org.Id,
-						Creater:                 creater,
-						Ctime:                   time.Now().Unix(),
-						Status:                  1,
-						WarehouseOutTime:        advice.AdviceDate,
-						Type:                    0,
-						PatientId:               advice.PatientId,
-						IsCheck:                 1,
-						IsSys:                   1,
-					}
-
-					//查询今日是否有出库数据
-					lastWarehouseOut, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, advice.AdviceDate, tx, 1)
-
-					if lastWarehouseOut.ID == 0 {
-						service.AddSelfSigleDrugWarehouseOut(&drugWarehouseOut, tx)
-					}
-
-					//查询今日是否有出库数据
-					lastWarehouseOutOne, _ := service.GetSelfDrugLastWarehouseOutTwety(adminUserInfo.Org.Id, advice.AdviceDate, tx, 1)
-					//出库
-					warehouseOutInfo := &models.XtSelfDrugWarehouseOutInfo{
-						WarehouseOutId:          lastWarehouseOutOne.ID,
-						WarehouseOutOrderNumber: warehousing_out_order,
-						DrugId:                  advice.DrugId,
-						Count:                   prescribing_number_total,
-						Price:                   0,
-						TotalPrice:              0,
-						Status:                  1,
-						Ctime:                   advice.AdviceDate,
-						Mtime:                   advice.AdviceDate,
-						Remark:                  "",
-						OrgId:                   advice.UserOrgId,
-						Type:                    0,
-						Manufacturer:            selfBasedrug.Manufacturer,
-						Dealer:                  selfBasedrug.Dealer,
-						RetailPrice:             0,
-						RetailTotalPrice:        0,
-						CountUnit:               selfBasedrug.MinUnit,
-						ExpiryDate:              0,
-						ProductDate:             0,
-						Number:                  "",
-						BatchNumber:             "",
-						IsSys:                   0,
-						WarehouseInfoId:         0,
-						AdminUserId:             0,
-						StockCount:              "",
-						IsCheck:                 1,
-						SysRecordTime:           advice.AdviceDate,
-						PatientId:               advice.PatientId,
-						AdviceId:                advice.ID,
-						ClassType:               "",
-					}
-					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
-
-					for _, it := range warehousingOutInfo {
-
-						medical, _ := service.GetSelfBaseDrugMedical(it.DrugId, tx)
-						drup, _ := service.FindSelfBaseDrugLibRecord(it.OrgId, it.DrugId, tx)
-						//出库逻辑
-						service.AutoSelfDrugDeliverInfoFourtyTwo(adminUserInfo.Org.Id, it.Count, &lastWarehouseOut, &drup, it, it.CountUnit, tx)
-
-						//查询剩余库存
-						stockInfo, _ := service.GetSelfDrugAllStockInfo(it.PatientId, it.OrgId, it.DrugId, tx)
-						var sum_count int64
-						for _, its := range stockInfo {
-							if its.MaxUnit == medical.MaxUnit {
-								its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-							}
-							sum_count += its.StockMaxNumber + its.StockMinNumber
-						}
-						service.UpdateSelfDrugStockCount(it.DrugId, it.OrgId, it.PatientId, sum_count, tx)
-					}
-				}
-
-			}
-
-		}
-
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg":    "1",
 			"advice": advice,
@@ -2235,8 +2431,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				}
 
-				////针对异常未出库问题的脚本
-				//if adminInfo.Org.Id == 10644 {
+				//针对异常未出库问题的脚本
+				//if adminInfo.Org.Id == 10265 {
 				//
 				//	newadviceInfo := &models.HisDoctorAdviceInfo{
 				//		ID:                    advice.ID,
@@ -2324,11 +2520,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				//	//按最小单位出库
 				//	//var cha_count = total_count - out_count
 				//
-				//	var cha_count = 100
-				//	fmt.Println("cha_count--------------------------------------", cha_count)
+				//	var cha_count = 40
+				//
 				//	newadviceInfo.PrescribingNumber = float64(cha_count)
 				//	newadviceInfo.PrescribingNumberUnit = medical.MinUnit
 				//	service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+				//
+				//	//查询剩余库存
+				//	stockInfo, _ := service.GetSelfDrugAllStockInfo(newadviceInfo.PatientId, newadviceInfo.UserOrgId, newadviceInfo.DrugId, tx)
+				//	var sum_count int64
+				//	for _, its := range stockInfo {
+				//		if its.MaxUnit == medical.MaxUnit {
+				//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+				//		}
+				//		sum_count += its.StockMaxNumber + its.StockMinNumber
+				//	}
+				//	service.UpdateSelfDrugStockCount(newadviceInfo.DrugId, newadviceInfo.UserOrgId, newadviceInfo.PatientId, sum_count, tx)
 				//}
 
 			}
@@ -5415,30 +5622,34 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 	lastSchedule, _ := service.FindLastSchedule(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
-	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
-		for _, item := range projects {
-			cnt, _ := strconv.ParseFloat(item.Count, 64)
-			var advice models.HisDoctorAdviceInfo
-			advice.ID = item.ID
-			advice.Checker = item.Checker
-			advice.CheckTime = item.CheckTime
-			advice.CheckState = item.CheckState
-			advice.ExecutionState = item.ExecutionState
-			advice.ExecutionStaff = item.ExecutionStaff
-			//advice.PrescribingNumber = float64(item.Count)
-			advice.PrescribingNumber = cnt
-			advice.PrescribingNumberUnit = item.Unit
-			advice.AdviceDoctor = item.Doctor
-			if item.Type == 3 {
-				advice.AdviceName = item.GoodInfo.GoodName
-				advice.PrescribingNumberUnit = item.GoodInfo.PackingUnit
-			} else if item.Type == 2 {
-				advice.AdviceName = item.HisProject.ProjectName
+
+	if adminUserInfo.Org.Id != 10489 {
+
+		if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
+			for _, item := range projects {
+				cnt, _ := strconv.ParseFloat(item.Count, 64)
+				var advice models.HisDoctorAdviceInfo
+				advice.ID = item.ID
+				advice.Checker = item.Checker
+				advice.CheckTime = item.CheckTime
+				advice.CheckState = item.CheckState
+				advice.ExecutionState = item.ExecutionState
+				advice.ExecutionStaff = item.ExecutionStaff
+				//advice.PrescribingNumber = float64(item.Count)
+				advice.PrescribingNumber = cnt
+				advice.PrescribingNumberUnit = item.Unit
+				advice.AdviceDoctor = item.Doctor
+				if item.Type == 3 {
+					advice.AdviceName = item.GoodInfo.GoodName
+					advice.PrescribingNumberUnit = item.GoodInfo.PackingUnit
+				} else if item.Type == 2 {
+					advice.AdviceName = item.HisProject.ProjectName
+				}
+				advice.StartTime = item.StartTime
+				hisAdvice = append(hisAdvice, &advice)
 			}
-			advice.StartTime = item.StartTime
-			hisAdvice = append(hisAdvice, &advice)
-		}
 
+		}
 	}
 
 	if len(DoctorAdvice) > 0 {

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -240,3 +240,141 @@ func (this *NewManageApiController) GetDeviceInformation() {
 		"devicetype":  devicetype,
 	})
 }
+
+func (this *NewManageApiController) SaveDisinfectionInfoOne() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	bedid, _ := this.GetInt64("bed_id")
+	start_time := this.GetString("start_time")
+	disinfectime, _ := this.GetInt64("disinfec_time")
+	endtime := this.GetString("end_time")
+	scheduledate, _ := this.GetInt64("schedule_date")
+	zoneid, _ := this.GetInt64("zone_id")
+	patientid, _ := this.GetInt64("patient_id")
+	modeid, _ := this.GetInt64("mode_id")
+	scheduletype, _ := this.GetInt64("schedule_type")
+
+	wayone, _ := this.GetInt64("way")
+
+	machine_disinfectant, _ := this.GetInt64("machine_disinfectant")
+
+	disinfectant_way, _ := this.GetInt64("disinfectant_way")
+
+	disinfectant, _ := this.GetInt64("disinfectant")
+
+	bed_way, _ := this.GetInt64("bed_way")
+
+	dialysis_checked, _ := this.GetInt64("dialysis_checked")
+
+	clean, _ := this.GetInt64("clean")
+
+	germ_checked, _ := this.GetInt64("germ_checked")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startdateunix int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04", start_time, loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startdateunix = theTime.Unix()
+	}
+	var enddateunix int64
+	if len(endtime) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04", endtime, loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		enddateunix = theTime.Unix()
+	}
+
+	//查询病人信息
+	patients, _ := service.GetPatientInfoMation(patientid)
+	var con = ""
+	if patients.IsInfectious == 0 {
+		con = ""
+	}
+	if patients.IsInfectious == 1 {
+		con = "无"
+	}
+	if patients.IsInfectious == 2 {
+		con = "有"
+	}
+	//查询病人上机信息
+	order, _ := service.GetPatientOrderInfo(scheduledate, patientid, orgid)
+	//查询病人今日透后评估数据
+	dislysis, _ := service.GetAssessmentAfterDissDataTwo(patientid, orgid, scheduledate)
+
+	assessmentBeforThrity, _ := service.GetAssessmentBeforThrity(orgid, patientid, scheduledate)
+
+	var weight_los float64
+
+	weight_los = assessmentBeforThrity.WeightBefore - dislysis.WeightAfter
+
+	fmt.Println("透析减少", dislysis.WeightLoss)
+	//			//根据床位号获取设备id
+	addmacher, _ := service.GetEquimentIDTwo(bedid, orgid)
+
+	_, errplan := service.GetDisinfectionTwo(addmacher.UnitType, scheduletype, orgid)
+
+	if errplan == gorm.ErrRecordNotFound {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msstatus"] = "2"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		information := models.DeviceInformation{
+			Date:                  scheduledate,
+			Zone:                  zoneid,
+			Class:                 scheduletype,
+			BedNumber:             bedid,
+			PatientId:             patientid,
+			DialysisMode:          modeid,
+			LongTime:              strconv.FormatInt(disinfectime, 10),
+			Disinfection:          1,
+			DialysisConcentration: 1,
+			DisinfectionStatus:    1,
+			Move:                  1,
+			UserOrgId:             orgid,
+			DisinfectType:         wayone,
+			DisinfectantType:      machine_disinfectant,
+			FluidPath:             disinfectant_way, //液路消毒方式
+			Disinfectant:          disinfectant,
+			Ctime:                 time.Now().Unix(),
+			Status:                1,
+			SignName:              order.FinishNurse,
+			EquimentId:            addmacher.ID,
+			DisinfectionResidue:   2,
+			Bed:                   addmacher.BedNumber,
+			StartTime:             order.StartTime,
+			EndTime:               order.EndTime,
+			Contagion:             con,
+			WeightLoss:            weight_los,
+			Hyperfiltratio:        dislysis.ActualUltrafiltration,
+			DialysisHour:          strconv.FormatInt(dislysis.ActualTreatmentHour, 10),
+			MachineRun:            1,
+			DisinfecStartime:      startdateunix,
+			DisinfecEndtime:       enddateunix,
+			BedWay:                bed_way,
+			DialysisChecked:       dialysis_checked,
+			Clean:                 clean,
+			GermChecked:           germ_checked,
+		}
+		service.DeleteInformation(patientid, scheduledate, orgid)
+		err := service.CreateInformationTwo(&information)
+		fmt.Println("报错", err)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"information": information,
+		})
+
+	}
+}

controllers/new_mobile_api_controllers/new_manage_api_router.go

@@ -8,4 +8,5 @@ func NewManageApiControllersRegisterRouters() {
 	beego.Router("m/api/getdisinfection", &NewManageApiController{}, "Get:GetDisInfectionTime")
 	beego.Router("/m/api/savedisinfectioninfo", &NewManageApiController{}, "Get:SaveDisInfectionInfo")
 	beego.Router("/m/api/getdeviceinformation", &NewManageApiController{}, "Get:GetDeviceInformation")
+	beego.Router("/m/api/savedisinfectioninfoone", &NewManageApiController{}, "Get:SaveDisinfectionInfoOne")
 }

controllers/new_mobile_api_controllers/new_self_drug_api_router.go

@@ -0,0 +1,9 @@
+package new_mobile_api_controllers
+
+import "github.com/astaxie/beego"
+
+func NewDrugApiControllersRegisterRouters() {
+
+	beego.Router("/m/api/drug/getselfmedicallist", &NewDrugApiController{}, "Get:GetSelfMedicalList")
+	beego.Router("/m/api/getdrugdescbydrugname", &NewDrugApiController{}, "Get:GetDrugDescByDrugName")
+}

controllers/orginfo_api_controller.go

@@ -41,7 +41,7 @@ func (c *OrgInfoApiController) GetOrgInfo() {
 			districts, _ = service.GetDistrictsByUpid(orgInfo.City)
 		}
 	}
-	gallery, _ := service.GetUserGallery(orgInfo.Id)
+	gallery, _ := service.GetUserGallery(10633)
 
 	orgInfo.OrgGallery = gallery
 	orgtypes, _ := service.GetOrgTypes()

controllers/patient_api_controller.go

@@ -160,7 +160,7 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/deletepatientlapsorecord", &DialysisApiController{}, "Get:DeletePatientLapseRecord")
 
-	beego.Router("/api/patient/getpatientlapselist", &DialysisApiController{}, "Get:GetPatientLapaseList")
+	beego.Router("/api/patient/getpatientlapeso", &DialysisApiController{}, "Get:GetPatientLapseList")
 
 }
 func (c *PatientApiController) GetExportList() {
@@ -4492,11 +4492,10 @@ func (c *PatientApiController) GetDoctorAdvices() {
 	endTime := c.GetString("end_time", "")
 	keywords := c.GetString("keywords", "")
 	page, _ := c.GetInt64("page")
-	fmt.Println("page", page)
 	limit, _ := c.GetInt64("limit")
-	fmt.Println("limit", limit)
 	adminUserInfo := c.GetAdminUserInfo()
 
+	delivery_way_one := c.GetString("delivery_way_one", "")
 	operatorIDs := make([]int64, 0)
 
 	timeLayout := "2006-01-02"
@@ -4526,8 +4525,8 @@ func (c *PatientApiController) GetDoctorAdvices() {
 	hisconfig, _ := service.GetHisDoctorConfig(adminUserInfo.CurrentOrgId)
 
 	if hisconfig.IsOpen == 1 {
-		advices, total, _ := service.GetDoctorAdviceListThree(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
-		advicestwo, _, _ := service.GetDoctorAdviceListFour(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+		advices, total, _ := service.GetDoctorAdviceListThree(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit, delivery_way_one)
+		advicestwo, _, _ := service.GetDoctorAdviceListFour(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page, delivery_way_one)
 
 		if len(advices) > 0 {
 			for _, item := range advices {
@@ -4561,8 +4560,8 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		})
 		return
 	} else {
-		advices, total, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
-		advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page)
+		advices, total, _ := service.GetDoctorAdviceListOne(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, page, limit, delivery_way_one)
+		advicestwo, _, _ := service.GetDoctorAdviceListTwo(adminUserInfo.CurrentOrgId, id, adviceType, stopType, theStartTIme, theEndtTIme, keywords, limit, page, delivery_way_one)
 
 		if len(advices) > 0 {
 			for _, item := range advices {
@@ -7899,13 +7898,82 @@ func (c *DialysisApiController) DeletePatientLapseRecord() {
 
 }
 
-func (c *DialysisApiController) GetPatientLapaseList() {
+func (c *DialysisApiController) GetPatientLapseList() {
 
-	orgId := c.GetAdminUserInfo().CurrentOrgId
+	fmt.Println("除非哈哈哈哈哈")
+
+	list, _ := service.GetAllpatientFivty()
+
+	if len(list) > 0 {
+
+		for _, item := range list {
 
-	list, _ := service.GetPatientAllagicListOne(orgId)
+			patientLaspseRecord := models.XtPatientLaspseRecord{
+				PatientId:      item.ID,
+				RecordDate:     0,
+				LapseDate:      item.CreatedTime,
+				LapseType:      1,
+				LapseClass:     0,
+				LapseReason:    "",
+				AdminUserId:    item.RegistrarsId,
+				Remark:         "",
+				UserOrgId:      item.UserOrgId,
+				Ctime:          time.Now().Unix(),
+				Mtime:          time.Now().Unix(),
+				Status:         1,
+				LapseTypeName:  "",
+				HisType:        0,
+				HisZone:        "",
+				HisBed:         "",
+				PatientAddress: "",
+				StartTime:      0,
+				EndTime:        0,
+				StartTimeOne:   0,
+				EndTimeOne:     0,
+			}
 
-	fmt.Println("lsit", list)
+			service.CreatePatientRecord(patientLaspseRecord)
+		}
+	}
+
+	//list, _ := service.GetPatientLapsorecordListOne()
+	//
+	//if len(list) > 0 {
+	//	for _, item := range list {
+	//		//查询患者的信息
+	//		patients, _ := service.GetPatientByIDTwoOne(item.PatientId)
+	//
+	//		if patients.Lapseto == 2 || patients.Lapseto == 3 {
+	//
+	//			patientLaspseRecord := models.XtPatientLaspseRecord{
+	//				PatientId:      item.PatientId,
+	//				RecordDate:     patients.DeathTime,
+	//				LapseDate:      patients.DeathTime,
+	//				LapseType:      patients.Lapseto,
+	//				LapseClass:     patients.Lapseto,
+	//				LapseReason:    patients.OutReason,
+	//				AdminUserId:    0,
+	//				Remark:         "",
+	//				UserOrgId:      patients.UserOrgId,
+	//				Ctime:          time.Now().Unix(),
+	//				Mtime:          time.Now().Unix(),
+	//				Status:         1,
+	//				LapseTypeName:  "",
+	//				HisType:        0,
+	//				HisZone:        "",
+	//				HisBed:         "",
+	//				PatientAddress: "",
+	//				StartTime:      patients.PatientStartTime,
+	//				EndTime:        patients.PatientEndTime,
+	//				StartTimeOne:   patients.PatientStartTime,
+	//				EndTimeOne:     patients.PatientEndTime,
+	//			}
+	//
+	//			service.CreatePatientRecord(patientLaspseRecord)
+	//		}
+	//	}
+	//}
+	//fmt.Println("lsit", list)
 
 	//for _, item := range list {
 	//

controllers/pharmacy_controller.go

@@ -44,6 +44,8 @@ func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/getdruginventorybydrugid", &PharmacyController{}, "Get:GetDrugInventoryByDrugId")
 
 	beego.Router("/api/pharmacy/updatedruginventorywarehouseinfo", &PharmacyController{}, "Get:UpdateDrugInventoryWarehouseInfo")
+
+	beego.Router("/api/pharmacy/changedrugcode", &PharmacyController{}, "Get:ChangeDrugCode")
 }
 
 // 测试
@@ -464,6 +466,7 @@ func (this *PharmacyController) DispensingMedicine() {
 	if orgid == 10480 || orgid == 10188 || orgid == 10217 || orgid == 10164 || orgid == 10666 {
 		//发药逻辑
 
+		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhh尽力")
 		service.DispensingMedicineOne(orgid, patient_id, stime, etime, creater)
 
 		//针对桑植盛康
@@ -757,7 +760,7 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 		return
 	}
 	listll, err := service.PartitionAndLayoutDrug(deliveryway, stime, etime, orgid, shift, partition, list)
-	fmt.Println("list1---------------------------", listll)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1166,8 +1169,6 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 
 	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 
-	fmt.Println("ord_total-----------------------------", ord_total)
-	fmt.Println("new_total-----------------------------", new_total)
 	//盘亏
 	if ord_total > new_total {
 
@@ -1355,3 +1356,24 @@ func (this *PharmacyController) UpdateDrugInventoryWarehouseInfo() {
 		"msg": "msg",
 	})
 }
+
+func (this *PharmacyController) ChangeDrugCode() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	data_source, _ := this.GetInt64("data_source")
+	drug_code := this.GetString("drug_code")
+
+	fmt.Println("data_source--------------------", data_source)
+	if data_source == 1 {
+		fmt.Println("HHAHAHAH")
+		service.ChangeHisDrugCode(id, drug_code, orgId)
+	}
+	if data_source == 2 {
+		service.ChangeAdivceDrugCode(id, drug_code, orgId)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "msg",
+	})
+}

controllers/self_drug_api_congtroller.go

@@ -182,6 +182,13 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/deleteselfwarehouseoutlist", &SelfDrugApiController{}, "Get:DeleteSelfWarehouseOutList")
 
 	beego.Router("/api/drug/getselfDrugwarehouseoutdetailbypatientid", &SelfDrugApiController{}, "Get:GetSelfDrugWarehouseOutDetailByPatientId")
+
+	beego.Router("/api/drug/getdruginventoryrecordlist", &SelfDrugApiController{}, "Get:GetDrugInventoryRecordList")
+
+	beego.Router("/api/drug/getdruginventoryrecordprintlist", &SelfDrugApiController{}, "Get:GetDrugInventoryRecordPrintList")
+
+	beego.Router("/api/drug/getdruginventorymodeprintlist", &SelfDrugApiController{}, "Get:GetDrugInventoryModePrintList")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2751,6 +2758,127 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 			})
 		}
 	}
+
+	newTableData, _ := dataBody["newTableData"].([]interface{})
+
+	if len(newTableData) > 0 {
+		for _, item := range newTableData {
+			items := item.(map[string]interface{})
+			drug_name := items["drug_name"].(string)
+			if items["drug_name"] == nil || reflect.TypeOf(items["drug_name"]).String() != "string" {
+				utils.ErrorLog("drug_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			fmt.Println("drug_name", drug_name)
+			specification_name := items["specification_name"].(string)
+			if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+				utils.ErrorLog("specification_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			max_unit := items["max_unit"].(string)
+			if items["max_unit"] == nil || reflect.TypeOf(items["max_unit"]).String() != "string" {
+				utils.ErrorLog("max_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			min_unit := items["min_unit"].(string)
+			if items["min_unit"] == nil || reflect.TypeOf(items["min_unit"]).String() != "string" {
+				utils.ErrorLog("min_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			drug_id := int64(items["drug_id"].(float64))
+
+			stock_max_number := int64(items["stock_max_number"].(float64))
+
+			stock_min_number := int64(items["stock_min_number"].(float64))
+
+			last_stock_max_number := int64(items["last_stock_max_number"].(float64))
+
+			last_stock_min_number := int64(items["last_stock_min_number"].(float64))
+
+			warehousing_order := items["warehousing_order"].(string)
+
+			price := items["price"].(float64)
+
+			manufacturer_name := items["manufacturer_name"].(string)
+
+			batch_number := items["batch_number"].(string)
+
+			id := int64(items["id"].(float64))
+
+			orgId := this.GetAdminUserInfo().CurrentOrgId
+
+			type_id := int64(items["type"].(float64))
+
+			if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "float64" {
+				utils.ErrorLog("expiry_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			expiry_date := int64(items["expiry_date"].(float64))
+
+			product_date := int64(items["product_date"].(float64))
+
+			storehouse_id := int64(items["storehouse_id"].(float64))
+
+			warehousing_count := int64(items["warehousing_count"].(float64))
+
+			warehouseing_unit := items["warehouseing_unit"].(string)
+
+			creater := this.GetAdminUserInfo().AdminUser.Id
+
+			var recordDateStr = time.Now().Format("2006-01-02")
+			recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+			drugStockInventoryList := models.XtDrugStockInventoryList{
+				DrugId:               drug_id,
+				WarehousingOrder:     warehousing_order,
+				WarehousingCount:     warehousing_count,
+				BatchNumber:          batch_number,
+				Price:                price,
+				StockMaxNumber:       stock_max_number,
+				StockMinNumber:       stock_min_number,
+				Reason:               type_id,
+				Creater:              creater,
+				RecordDate:           recordDate.Unix(),
+				UserOrgId:            orgId,
+				Ctime:                time.Now().Unix(),
+				Mtime:                time.Now().Unix(),
+				WarehouseInfoId:      id,
+				SpecificationName:    specification_name,
+				ManufacturerName:     manufacturer_name,
+				DrugName:             drug_name,
+				ExpiryDate:           expiry_date,
+				ProductDate:          product_date,
+				StorehouseId:         storehouse_id,
+				MaxUnit:              max_unit,
+				LastStockMaxNumber:   last_stock_max_number,
+				LastStockMinNumber:   last_stock_min_number,
+				WarehousingCountUnit: warehouseing_unit,
+				MinUnit:              min_unit,
+				Status:               1,
+			}
+
+			//查询今日的药品有没有
+			drugInvetory, _ := service.GetDrugStockInventoryList(drug_id, recordDate.Unix(), orgId)
+
+			if drugInvetory.ID == 0 {
+
+				service.CreatedDrugStockInventory(drugStockInventoryList)
+			}
+
+			if drugInvetory.ID > 0 {
+				drugStockInventoryList.ID = drugInvetory.ID
+				service.SaveDrugStockInventory(drugStockInventoryList)
+			}
+		}
+	}
 }
 
 func (this *SelfDrugApiController) GetDamageByDrugId() {
@@ -6114,6 +6242,7 @@ func (c *SelfDrugApiController) GetAllSelfDrugWarehouseOut() {
 	}
 
 	list, total, _ := service.GetAllSelfDrugWarehouseOut(startTime, endTime, orgId, page, limit, patient_id, keyword, check_type)
+	fmt.Println("list==================", list)
 	doctorList, _ := service.GetAllDoctorListSix(orgId, appId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":       list,
@@ -6156,3 +6285,146 @@ func (c *SelfDrugApiController) GetSelfDrugWarehouseOutDetailByPatientId() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (c *SelfDrugApiController) GetDrugInventoryRecordList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+	keyword := c.GetString("keyword")
+	storehouse_id, _ := c.GetInt64("storehouse_id")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	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 {
+			fmt.Println(err)
+			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()
+	}
+
+	list, total, _ := service.GetDrugInventoryRecordList(limit, page, keyword, storehouse_id, startTime, endTime, orgId)
+
+	houseList, _ := service.GetAllStoreHouseList(orgId)
+
+	appId := c.GetAdminUserInfo().CurrentAppId
+	doclist, _ := service.GetAllDoctorListSix(orgId, appId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":      list,
+		"total":     total,
+		"houseList": houseList,
+		"doclist":   doclist,
+	})
+}
+
+func (c *SelfDrugApiController) GetDrugInventoryRecordPrintList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+	keyword := c.GetString("keyword")
+	storehouse_id, _ := c.GetInt64("storehouse_id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	ids := c.GetString("ids")
+	idSplit := strings.Split(ids, ",")
+	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 {
+			fmt.Println(err)
+			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()
+	}
+
+	list, total, _ := service.GetDrugInventoryRecordPrintList(limit, page, keyword, storehouse_id, orgId, startTime, endTime, idSplit)
+	houseList, _ := service.GetAllStoreHouseList(orgId)
+	appId := c.GetAdminUserInfo().CurrentAppId
+	doclist, _ := service.GetAllDoctorListSix(orgId, appId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":      list,
+		"total":     total,
+		"houseList": houseList,
+		"doclist":   doclist,
+	})
+}
+
+func (c *SelfDrugApiController) GetDrugInventoryModePrintList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	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 {
+			fmt.Println(err)
+			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()
+	}
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, _ := service.GetInventoryModeList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	//查询本月入库
+	infoList, _ := service.GetDrugWarehosueInfoList(orgId, startTime, endTime)
+
+	//查询本月出库
+	outList, _ := service.GetDrugWarhouseHouseOutInfo(orgId, startTime, endTime)
+
+	drugList, _ := service.GetAllDrugList(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"outList":          outList,
+		"infoList":         infoList,
+		"drugList":         drugList,
+	})
+}

controllers/stock_in_api_controller.go

@@ -167,6 +167,12 @@ func StockManagerApiRegistRouters() {
 
 	beego.Router("/api/good/updategoodinfobyuserorgid", &StockManagerApiController{}, "Get:UpdateGoodInfoByUserOrgId")
 
+	beego.Router("/api/good/getgoodstockinventorylist", &StockManagerApiController{}, "Get:GetGoodStockInventoryList")
+
+	beego.Router("/api/good/getstockinventoryprintlist", &StockManagerApiController{}, "Get:GetStockInventoryPrintList")
+
+	beego.Router("/api/good/getstockinventoymodeprintlist", &StockManagerApiController{}, "Get:GetStockInventoryModePrintList")
+
 }
 func (c *StockManagerApiController) HandleRefundStock() {
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -6854,6 +6860,171 @@ func (this *StockManagerApiController) SaveStockInventoryList() {
 			})
 		}
 	}
+
+	newTableData, _ := dataBody["newTableData"].([]interface{})
+	if len(newTableData) > 0 {
+		for _, item := range newTableData {
+			items := item.(map[string]interface{})
+			good_name := items["good_name"].(string)
+			if items["good_name"] == nil || reflect.TypeOf(items["good_name"]).String() != "string" {
+				utils.ErrorLog("good_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			specification_name := items["specification_name"].(string)
+			if items["specification_name"] == nil || reflect.TypeOf(items["specification_name"]).String() != "string" {
+				utils.ErrorLog("specification_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			warehousing_unit := items["warehousing_unit"].(string)
+			if items["warehousing_unit"] == nil || reflect.TypeOf(items["warehousing_unit"]).String() != "string" {
+				utils.ErrorLog("warehousing_unit")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			warehousing_count := int64(items["warehousing_count"].(float64))
+			if items["warehousing_count"] == nil || reflect.TypeOf(items["warehousing_count"]).String() != "float64" {
+				utils.ErrorLog("warehousing_count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			stock_count := int64(items["stock_count"].(float64))
+			if items["stock_count"] == nil || reflect.TypeOf(items["stock_count"]).String() != "float64" {
+				utils.ErrorLog("stock_count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			price := items["price"].(float64)
+			if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "float64" {
+				utils.ErrorLog("price")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			manufacturer_name := items["manufacturer_name"].(string)
+			if items["manufacturer_name"] == nil || reflect.TypeOf(items["manufacturer_name"]).String() != "string" {
+				utils.ErrorLog("manufacturer_name")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			good_id := int64(items["good_id"].(float64))
+			if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
+				utils.ErrorLog("good_id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			warehousing_order := items["warehousing_order"].(string)
+			if items["warehousing_order"] == nil || reflect.TypeOf(items["warehousing_order"]).String() != "string" {
+				utils.ErrorLog("warehousing_order")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			number := items["number"].(string)
+			if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				utils.ErrorLog("number")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			id := int64(items["id"].(float64))
+			if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+				utils.ErrorLog("id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "float64" {
+				utils.ErrorLog("expiry_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			expiry_date := int64(items["expiry_date"].(float64))
+
+			if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "float64" {
+				utils.ErrorLog("product_date")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			product_date := int64(items["product_date"].(float64))
+
+			stock_type := int64(items["type"].(float64))
+			if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+				utils.ErrorLog("type")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			last_stock_count := int64(items["last_stock_count"].(float64))
+			if items["last_stock_count"] == nil || reflect.TypeOf(items["last_stock_count"]).String() != "float64" {
+				utils.ErrorLog("last_stock_count")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			storehouse_id := int64(items["storehouse_id"].(float64))
+			if items["storehouse_id"] == nil || reflect.TypeOf(items["storehouse_id"]).String() != "float64" {
+				utils.ErrorLog("storehouse_id")
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+
+			creater := this.GetAdminUserInfo().AdminUser.Id
+
+			recordDateStr := time.Now().Format("2006-01-02")
+			recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+			user_org_id := this.GetAdminUserInfo().CurrentOrgId
+
+			goodStockInventory := models.XtGoodStockInventoryList{
+				GoodId:            good_id,
+				WarehousingOrder:  warehousing_order,
+				InCount:           warehousing_count,
+				BatchNumber:       number,
+				Price:             price,
+				BeforCount:        stock_count,
+				AfterCount:        last_stock_count,
+				Reason:            stock_type,
+				Creater:           creater,
+				RecordDate:        recordDate.Unix(),
+				UserOrgId:         user_org_id,
+				Ctime:             time.Now().Unix(),
+				Mtime:             time.Now().Unix(),
+				WarehouseInfoId:   id,
+				SpecificationName: specification_name,
+				ManufacturerName:  manufacturer_name,
+				GoodName:          good_name,
+				ExpiryDate:        expiry_date,
+				ProductDate:       product_date,
+				StorehouseId:      storehouse_id,
+				MaxUnit:           warehousing_unit,
+			}
+
+			//查询今日该耗材是否有记录
+
+			goodStock, _ := service.GetGoodStockInventoryByRecordate(good_id, recordDate.Unix(), user_org_id)
+
+			if goodStock.ID == 0 {
+
+				service.CreateGoodStockInventoryList(goodStockInventory)
+			}
+
+			if goodStock.ID > 0 {
+				goodStockInventory.ID = goodStock.ID
+
+				service.SaveGoodStockInventoryList(goodStockInventory)
+			}
+
+		}
+	}
 }
 
 func (this *StockManagerApiController) GetDamageDetailByGoodId() {
@@ -8112,3 +8283,147 @@ func (this *StockManagerApiController) UpdateGoodInfoByUserOrgId() {
 	//}
 
 }
+
+func (this *StockManagerApiController) GetGoodStockInventoryList() {
+
+	keyword := this.GetString("keyword")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+
+	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 {
+			this.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())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, total, _ := service.GetGoodStockInventoryList(keyword, limit, page, storehouse_id, startTime, endTime, orgId)
+	doclist, _ := service.GetAllDoctorListSix(orgId, appId)
+
+	storeHouseList, _ := service.GetAllStoreHouseList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":           list,
+		"total":          total,
+		"storeHouseList": storeHouseList,
+		"doclist":        doclist,
+	})
+}
+
+func (this *StockManagerApiController) GetStockInventoryPrintList() {
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	keyword := this.GetString("keyword")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	ids := this.GetString("ids")
+
+	p_ids_arr := strings.Split(ids, ",")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	list, total, _ := service.GetStockInventoryPrintList(storehouse_id, keyword, limit, page, p_ids_arr, orgId)
+
+	doclist, _ := service.GetAllDoctorListSix(orgId, appId)
+
+	storeHouseList, _ := service.GetAllStoreHouseList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":           list,
+		"total":          total,
+		"storeHouseList": storeHouseList,
+		"doclist":        doclist,
+	})
+}
+
+func (this *StockManagerApiController) GetStockInventoryModePrintList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.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 {
+			this.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())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	goodInfo, _ := service.FindAllGoodInfoThree(orgId)
+
+	//获取所有入库数量
+
+	list, _ := service.GetInventoryExportList(orgId)
+
+	infoList, _ := service.GetGoodWarehouseInfoList(startTime, endTime, orgId)
+
+	outinfo, _ := service.GetGoodWarhouseOutList(startTime, endTime, orgId)
+
+	//获取盘盈的数据
+	flowProList, _ := service.GetGoodStockFlowProList(startTime, endTime, orgId)
+
+	//获取盘亏的数据
+	flowNoProList, _ := service.GetGoodStockFlowNoProList(startTime, endTime, orgId)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"infoList":         infoList,
+		"outinfo":          outinfo,
+		"flowProList":      flowProList,
+		"flowNoProList":    flowNoProList,
+		"manufacturerList": manufacturerList,
+		"goodInfo":         goodInfo,
+	})
+
+}

models/device_models.go

@@ -694,6 +694,7 @@ type DeviceInformation struct {
 	EquimentId            int64   `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
 	Bed                   string  `gorm:"column:bed" json:"bed" form:"bed"`
 	Stime                 int64   `gorm:"column:stime" json:"stime" form:"stime"`
+	BedWay                int64   `gorm:"column:bed_way" json:"bed_way" form:"bed_way"`
 }
 
 func (DeviceInformation) TableName() string {

models/dialysis.go

@@ -464,6 +464,7 @@ type DoctorAdvice struct {
 	PushStartTime         int64           `gorm:"column:push_start_time" json:"push_start_time" form:"push_start_time"`
 	IsSettle              int64           `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 	IsPrescription        int64           `gorm:"column:is_prescription" json:"is_prescription" form:"is_prescription"`
+	DrugCode              string          `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (DoctorAdvice) TableName() string {
@@ -1327,6 +1328,7 @@ type HisDoctorAdvice struct {
 	IsMobile              int64              `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 	IsSelfDrug            int64              `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	IsMedicine            int64              `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	Drug                  Drug               `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 }
 
 func (HisDoctorAdvice) TableName() string {

models/drug_stock.go

@@ -743,3 +743,70 @@ type XtDrugError struct {
 func (XtDrugError) TableName() string {
 	return "xt_drug_error"
 }
+
+type XtDrugFlowList struct {
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64   `gorm:"column:count" json:"count" form:"count"`
+	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"`
+	SystemTime                int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64   `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	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"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64   `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64   `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	AdviceId                  int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	SupplyCancelOutId         int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	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"`
+	LastPrice                 float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsRead                    int64   `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount                 int64   `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RetailPrice               float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	OrderId                   int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	FlushOverCount            int64   `gorm:"column:flush_over_count" json:"flush_over_count" form:"flush_over_count"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time" form:"operate_time"`
+	IsSale                    int64   `gorm:"column:is_sale" json:"is_sale" form:"is_sale"`
+	IsChange                  int64   `gorm:"column:is_change" json:"is_change" form:"is_change"`
+	SaleDate                  string  `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
+	Bchno                     string  `gorm:"column:bchno" json:"bchno" form:"bchno"`
+	BgBchno                   string  `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
+	DrugCode                  string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+}
+
+func (XtDrugFlowList) TableName() string {
+	return "xt_drug_flow"
+}

models/good_models.go

@@ -236,6 +236,92 @@ func (GoodInfoSevenThirty) TableName() string {
 	return "xt_good_information"
 }
 
+type XtGoodInformationFourty 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"`
+	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"`
+	GoodStatus                  string  `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64   `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64   `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	CommdityCode                string  `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string  `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string  `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string  `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 int64   `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	BatchRetaiPrice             float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	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"`
+	TotalCount                  int64   `gorm:"column:total_count" json:"total_count" form:"total_count"`
+	SumOutCount                 int64   `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
+	SumCancelCount              int64   `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
+	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	ZuobiaoId                   string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+	TotalCountOne               int64   `gorm:"column:total_count_one" json:"total_count_one" form:"total_count_one"`
+	DepartMent                  string  `gorm:"column:depart_ment" json:"depart_ment" form:"depart_ment"`
+	DepartMentCode              string  `gorm:"column:depart_ment_code" json:"depart_ment_code" form:"depart_ment_code"`
+	TotalCountTwo               int64   `gorm:"column:total_count_two" json:"total_count_two" form:"total_count_two"`
+	CodeName                    string  `gorm:"column:code_name" json:"code_name" form:"code_name"`
+	OrgName                     string  `gorm:"column:org_name" json:"org_name" form:"org_name"`
+	GoodTypeName                string  `gorm:"column:good_type_name" json:"good_type_name" form:"good_type_name"`
+	IsShow                      int64   `gorm:"column:is_show" json:"is_show" form:"is_show"`
+}
+
+func (XtGoodInformationFourty) TableName() string {
+	return "xt_good_information"
+}
+
 type GoodInfoSeven struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	GoodName          string `gorm:"column:good_name" json:"good_name" form:"good_name"`

models/his_models.go

@@ -274,6 +274,7 @@ type HisDoctorAdviceInfo struct {
 	IsSelfDrug            int64                  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	DrugWayCount          string                 `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
 	YbSyncStatus          int64                  `gorm:"column:yb_sync_status" json:"yb_sync_status" form:"yb_sync_status"`
+	DrugCode              string                 `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

models/pharmacy_models.go

@@ -46,6 +46,7 @@ func (TmpPatientOne) TableName() string {
 
 // 药品信息
 type PharmacyContent struct {
+	ID             int64
 	Name           string //名称
 	SingleDosage   string //单次用量
 	Usage          string //用法
@@ -60,6 +61,7 @@ type PharmacyContent struct {
 	ExecutionStaff int64
 	ExecutionState int64
 	Price          float64
+	DrugCode       string
 }
 
 // 发药明细列表
@@ -145,6 +147,8 @@ type PatientInformation struct {
 	People       string `json:"people"`        //领药人
 	Quantity     int64  `json:"quantity"`      //总量拆分——数据部分
 	Unit         string `json:"unit"`          //总量拆分——单位部分
+	DrugCode     string
+	ID           int64
 }
 type HisDoctorAdviceInfoL struct {
 	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
@@ -204,6 +208,7 @@ type HisDoctorAdviceInfoL struct {
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	People                int64   `gorm:"column:people" json:"people" form:"people"`
 	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (HisDoctorAdviceInfoL) TableName() string {
@@ -261,6 +266,7 @@ type XtDoctorAdviceL struct {
 	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
 	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (XtDoctorAdviceL) TableName() string {

models/self_drug_models.go

@@ -497,6 +497,7 @@ type BloodDrugWarehouseInfo struct {
 	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	CountUnit        string  `json:"count_unit"`
 	IsCheck          string  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 }
 
 type BloodDrugCancelStockInfo struct {
@@ -600,6 +601,7 @@ type BloodDrugWarehouseOutInfo struct {
 	WarehousingInfoId       int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	InforPrice              float64 `json:"infor_price"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 }
 
 type XtMonitorConfig struct {
@@ -999,6 +1001,7 @@ type PatientDrugWarehouseInfo struct {
 	DoseUnit       string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	Manufacturer   int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Dealer         int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	SumCount       int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 }
 
 type NewGoodInformation struct {

models/stock_models.go

@@ -1768,3 +1768,80 @@ type XtWarehouseInfoEight struct {
 func (XtWarehouseInfoEight) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type XtGoodStockInventoryList struct {
+	ID                int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	InCount           int64   `gorm:"column:in_count" json:"in_count" form:"in_count"`
+	BatchNumber       string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Price             float64 `gorm:"column:price" json:"price" form:"price"`
+	BeforCount        int64   `gorm:"column:befor_count" json:"befor_count" form:"befor_count"`
+	AfterCount        int64   `gorm:"column:after_count" json:"after_count" form:"after_count"`
+	Reason            int64   `gorm:"column:reason" json:"reason" form:"reason"`
+	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	RecordDate        int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	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"`
+	WarehouseInfoId   int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	ManufacturerName  string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
+	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	MaxUnit           string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	Status            int64   `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtGoodStockInventoryList) TableName() string {
+	return "xt_good_stock_inventory_list"
+}
+
+type XtDrugStockInventoryList struct {
+	ID                   int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugId               int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOrder     string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	BatchNumber          string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Price                float64 `gorm:"column:price" json:"price" form:"price"`
+	Reason               int64   `gorm:"column:reason" json:"reason" form:"reason"`
+	Creater              int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	RecordDate           int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	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"`
+	WarehouseInfoId      int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	SpecificationName    string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	ManufacturerName     string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
+	DrugName             string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	ExpiryDate           int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate          int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	StorehouseId         int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	MaxUnit              string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	WarehousingCount     int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	WarehousingCountUnit string  `gorm:"column:warehousing_count_unit" json:"warehousing_count_unit" form:"warehousing_count_unit"`
+	StockMaxNumber       int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber       int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber   int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber   int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	MinUnit              string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Status               int64   `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDrugStockInventoryList) TableName() string {
+	return "xt_drug_stock_inventory_list"
+}
+
+type XtDrugCodeOpen 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"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	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"`
+}
+
+func (XtDrugCodeOpen) TableName() string {
+	return "xt_drug_code_open"
+}

service/doctor_advice_service.go

@@ -1,10 +1,11 @@
 package service
 
 import (
-	"XT_New/models"
 	"strings"
 	"time"
 
+	"XT_New/models"
+
 	"github.com/jinzhu/gorm"
 )
 
@@ -533,3 +534,59 @@ func GetDoctorAdviceByPatientId(patient_id int64, user_org_id int64, start_time
 
 	return advice, total, err
 }
+
+func GetDoctorAdivceMonthList(user_org_id int64, start_time int64, end_time int64) (list []*models.XtDoctorAdvice, err error) {
+
+	db := XTReadDB().Model(models.XtDoctorAdvice{}).Where("status=1 and (advice_type =2 or advice_type =3)")
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+
+	err = db.Find(&list).Error
+
+	return list, err
+}
+
+func GetHisDoctorAdivceMonthList(user_org_id int64, start_time int64, end_time int64) (list []*models.HisDoctorAdvice, err error) {
+
+	db := XTReadDB().Model(models.HisDoctorAdvice{}).Where("status=1")
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("advice_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("advice_date<=?", end_time)
+	}
+
+	err = db.Preload("Drug", "status=1 and org_id = ?", user_org_id).Find(&list).Error
+
+	return list, err
+}
+
+func GetHisPrescriptionProjectMonthList(user_org_id int64, start_time int64, end_time int64) (project []*models.HisPrescriptionProject, err error) {
+
+	db := XTReadDB().Model(&models.HisPrescriptionProject{}).Where("status=1 and type =3")
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("record_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date<=?", end_time)
+	}
+	err = db.Preload("GoodInfo", "org_id= ? and status=1", user_org_id).Find(&project).Error
+
+	return project, err
+}

service/gobal_config_service.go

@@ -349,9 +349,9 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.batch_number,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
 	} else {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.batch_number,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
 	}
 
 	return drugInfo, total, err
@@ -426,9 +426,9 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 
 	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,x.patient_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 as infor_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
+		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,x.patient_id,x.batch_number,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 as infor_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,x.patient_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 as infor_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
+		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,x.patient_id,x.batch_number,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 as infor_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

service/manage_service.go

@@ -931,6 +931,11 @@ func GetAllpatientFourty(orgid int64) (patients []*models.PatientsThirty, err er
 	return patients, err
 }
 
+func GetAllpatientFivty() (patients []*models.Patients, err error) {
+	err = XTReadDB().Where("status = 1").Find(&patients).Error
+	return patients, err
+}
+
 func GetInformation(eid int64, startdate int64, orgid int64, classtype int64) (*models.DeviceInformation, error) {
 	var information models.DeviceInformation
 	var err error

service/mobile_dialysis_service.go

@@ -1144,7 +1144,7 @@ func MobileGetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxD
 	assessment_after_dislysis_last_str, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis_last_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&record).Error
+		err := readDb.Model(&models.AssessmentAfterDislysis{}).Where(" patient_id = ? and user_org_id = ? and status = 1 and assessment_date>=1725120000 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if record.ID <= 0 {
@@ -3101,7 +3101,7 @@ func GetLastDialysisGoods(patient_id int64, orgID int64, record_time int64) (goo
 
 	var Id []*DialysisGoodsDetailDate
 
-	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
+	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 and  record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
 	if len(Id) > 0 {
 
 		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? and find_in_set('停用',good_status) = 0", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error

service/new_warehouse_service.go

@@ -1789,6 +1789,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 					AdviceId:                advice.ID,
 					LastPrice:               warehouse.Price,
 					OperateTime:             time.Now().Unix(),
+					DrugCode:                advice.DrugCode,
 				}
 
 				errThreeTy := CreateDrugFlowOne(drugflow)
@@ -1965,6 +1966,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
 				OperateTime:             time.Now().Unix(),
+				DrugCode:                advice.DrugCode,
 			}
 			errCodeflow := CreateDrugFlowOne(flow)
 			if errCodeflow != nil {
@@ -2312,6 +2314,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 				SystemTime:              advice.AdviceDate,
 				OperateTime:             time.Now().Unix(),
+				DrugCode:                advice.DrugCode,
 			}
 
 			CreateDrugFlowOne(drugflow)
@@ -2449,6 +2452,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
 				OperateTime:             time.Now().Unix(),
+				DrugCode:                advice.DrugCode,
 			}
 			errCodeFlows := CreateDrugFlowOne(flow)
 			if errCodeFlows != nil {
@@ -4667,6 +4671,8 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		}
 
+		fmt.Println("药品追溯码-------------------------------------------------------", advice.DrugCode)
+
 		drugflow := models.DrugFlow{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
@@ -4698,6 +4704,7 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			AdviceId:                advice.ID,
 			LastPrice:               warehouse.Price,
 			OperateTime:             time.Now().Unix(),
+			DrugCode:                advice.DrugCode,
 		}
 
 		CreateNewDrugFlowOne(drugflow, tx)
@@ -4886,6 +4893,7 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			LastPrice:               warehouse.Price,
 			SystemTime:              advice.AdviceDate,
 			OperateTime:             time.Now().Unix(),
+			DrugCode:                advice.DrugCode,
 		}
 
 		CreateNewDrugFlowOne(drugflow, tx)

service/patient_dataconfig_service.go

@@ -1,9 +1,10 @@
 package service
 
 import (
-	"XT_New/models"
 	"time"
 
+	"XT_New/models"
+
 	"github.com/jinzhu/gorm"
 )
 
@@ -27,6 +28,13 @@ func GetPatientByIDOne(orgID int64, patientID int64) (models.Patients, error) {
 	return patient, err
 }
 
+func GetPatientByIDTwoOne(patientID int64) (models.Patients, error) {
+	var patient models.Patients
+	err = readDb.Model(&models.Patients{}).Where("id = ? and status=1", patientID).First(&patient).Error
+
+	return patient, err
+}
+
 func GetPatientCourseOfDisease(orgID int64, patientID int64, startTime int64, endTime int64) ([]*models.PatientDiseaseCourse, error) {
 	var records []*models.PatientDiseaseCourse
 	err := readDb.Model(&models.PatientDiseaseCourse{}).Where("org_id = ? and patient_id = ? and record_time >= ? and record_time <= ? and status = 1", orgID, patientID, startTime, endTime).Order("record_time desc").Find(&records).Error

service/patient_service.go

@@ -1358,11 +1358,15 @@ func GetLongDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int
 	return
 }
 
-func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.DoctorAdvices, total int64, err error) {
+func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64, delive_way_one string) (advices []*models.DoctorAdvices, total int64, err error) {
 
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Print("table", table)
+
+	if len(delive_way_one) > 0 {
+		db = db.Where("delivery_way=?", delive_way_one)
+	}
 	if orgID > 0 {
 		db = db.Where("x.user_org_id=?", orgID)
 	}
@@ -1403,11 +1407,15 @@ func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int6
 	return
 }
 
-func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64) (advices []*models.DoctorAdvices, total int64, err error) {
+func GetDoctorAdviceListTwo(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64, delive_way_one string) (advices []*models.DoctorAdvices, total int64, err error) {
 
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println(table)
+
+	if len(delive_way_one) > 0 {
+		db = db.Where("delivery_way=?", delive_way_one)
+	}
 	if orgID > 0 {
 		db = db.Where("x.user_org_id=?", orgID)
 	}
@@ -1718,6 +1726,11 @@ func FindAllDoctorAdviceByGoroupNo(orgID int64, groupno int64) (advice []models.
 	return
 }
 
+func FindAllDoctorAdviceByGoroupNoOne(orgID int64, groupno int64) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 and execution_state =2", orgID, groupno).Find(&advice).Error
+	return
+}
+
 func UpdateDoctorAdviceByGoroupNo(id int64, drug_id int64) error {
 
 	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"drug_id": drug_id, "drug_name_id": drug_id, "way": 1}).Error
@@ -1734,6 +1747,11 @@ func FindDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdv
 	return
 }
 
+func FindDoctorAdviceByIdsOne(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("id IN (?) AND user_org_id = ? AND status = 1 and execution_state =2", ids, orgID).Find(&advice).Error
+	return
+}
+
 func FindDoctorAdviceByIdsTwety(orgID int64, ids []string) (advice []models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("id IN (?) AND user_org_id = ? AND status = 1 and (drug_id >0 or drug_name_id >0)", ids, orgID).Find(&advice).Error
 	return
@@ -2158,11 +2176,15 @@ func UpdateScheduleItemByPatientId(id int64) error {
 	return err
 }
 
-func GetDoctorAdviceListThree(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.HisDoctorAdvice, total int64, err error) {
+func GetDoctorAdviceListThree(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64, delivery_way_one string) (advices []*models.HisDoctorAdvice, total int64, err error) {
 
 	db := readDb.Table("his_doctor_advice_info as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Print("table", table)
+
+	if len(delivery_way_one) > 0 {
+		db = db.Where("delivery_way = ?", delivery_way_one)
+	}
 	if orgID > 0 {
 		db = db.Where("x.user_org_id=?", orgID)
 	}
@@ -2203,11 +2225,14 @@ func GetDoctorAdviceListThree(orgID, patientID, advice_type, stop, start, end in
 	return
 }
 
-func GetDoctorAdviceListFour(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64) (advices []*models.HisDoctorAdvice, total int64, err error) {
+func GetDoctorAdviceListFour(orgID int64, patientID int64, advice_type int64, stop int64, start int64, end int64, keywords string, limit int64, page int64, delive_way_one string) (advices []*models.HisDoctorAdvice, total int64, err error) {
 
 	db := readDb.Table("his_doctor_advice_info as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println(table)
+	if len(delive_way_one) > 0 {
+		db = db.Where("delivery_way = ?", delive_way_one)
+	}
 	if orgID > 0 {
 		db = db.Where("x.user_org_id=?", orgID)
 	}
@@ -4209,3 +4234,10 @@ func DeletePatientLapseRecord(id int64) error {
 
 	return err
 }
+
+func GetPatientLapsorecordListOne() (lapseto []*models.PatientLapseto, err error) {
+
+	err = XTReadDB().Where("status=1 and (lapseto_type=2 or lapseto_type =3)").Find(&lapseto).Error
+
+	return lapseto, err
+}

service/pharmacy_service.go

@@ -259,6 +259,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 
 		for _, v := range tmp {
 			pp = append(pp, &models.PharmacyContent{
+				ID:           v.ID,
 				Name:         v.AdviceName,
 				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
 				Usage:        v.DeliveryWay,
@@ -270,6 +271,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				Remarks:      v.Remark, //备注
 				DrugId:       v.DrugId,
 				Price:        v.Price,
+				DrugCode:     v.DrugCode,
 			})
 		}
 
@@ -290,6 +292,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 
 		for _, v := range tmp_advice {
 			pp = append(pp, &models.PharmacyContent{
+				ID:           v.ID,
 				Name:         v.AdviceName,
 				SingleDosage: config.ToString(v.SingleDose) + v.SingleDoseUnit,
 				Usage:        v.DeliveryWay,
@@ -300,6 +303,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				DataSources:  "临时医嘱",
 				Remarks:      v.Remark,
 				DrugId:       v.DrugId,
+				DrugCode:     v.DrugCode,
 			})
 		}
 		return
@@ -322,6 +326,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 
 		for _, v := range tmp {
 			pp = append(pp, &models.PharmacyContent{
+				ID:             v.ID,
 				Name:           v.AdviceName,
 				SingleDosage:   config.ToString(v.SingleDose) + v.SingleDoseUnit,
 				Usage:          v.DeliveryWay,
@@ -336,6 +341,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
 				Price:          v.Price,
+				DrugCode:       v.DrugCode,
 			})
 		}
 
@@ -356,6 +362,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 
 		for _, v := range tmp_advice {
 			pp = append(pp, &models.PharmacyContent{
+				ID:             v.ID,
 				Name:           v.AdviceName,
 				SingleDosage:   config.ToString(v.SingleDose) + v.SingleDoseUnit,
 				Usage:          v.DeliveryWay,
@@ -369,6 +376,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionState: v.ExecutionState,
 				ExecutionStaff: v.ExecutionStaff,
 				ExecutionTime:  v.ExecutionTime,
+				DrugCode:       v.DrugCode,
 				//Price:        v.Price,
 
 			})
@@ -688,6 +696,8 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 			People:       GetUserAdminName(v.People, orgid), //领药人！！！！！！！！！！！！！！！！！！！！！！
 			Quantity:     int64(v.PrescribingNumber),
 			Unit:         v.PrescribingNumberUnit,
+			DrugCode:     v.DrugCode,
+			ID:           v.ID,
 		})
 	}
 
@@ -710,6 +720,8 @@ func FindMedicationList(orgid, drug_id, stime, etime, is_medicine int64) (pp []*
 			People:       GetUserAdminName(v.People, orgid), //领药人
 			Quantity:     int64(v.PrescribingNumber),
 			Unit:         v.PrescribingNumberUnit,
+			DrugCode:     v.DrugCode,
+			ID:           v.ID,
 		})
 	}
 	return
@@ -2347,3 +2359,22 @@ func UpdateWarehouseInfoById(last_stock_count int64, id int64) (models.Warehousi
 	err := XTWriteDB().Model(&info).Where("id = ? and status =1", id).Updates(map[string]interface{}{"stock_count": last_stock_count}).Error
 	return info, err
 }
+
+func ChangeHisDrugCode(id int64, drug_code string, user_org_id int64) (models.HisDoctorAdviceInfo, error) {
+
+	adviceInfo := models.HisDoctorAdviceInfo{}
+
+	err := XTWriteDB().Model(&adviceInfo).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"drug_code": drug_code}).Error
+
+	fmt.Println("eeeeeeeeeeeeeeeeeeeeeeeeeeeeee", err)
+	return adviceInfo, err
+}
+
+func ChangeAdivceDrugCode(id int64, drug_code string, user_org_id int64) (models.DoctorAdvice, error) {
+
+	adviceInfo := models.DoctorAdvice{}
+
+	err := XTWriteDB().Model(&adviceInfo).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"drug_code": drug_code}).Error
+
+	return adviceInfo, err
+}

service/self_drug_service.go

@@ -1250,7 +1250,7 @@ func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo,
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+	err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
 	return info, err
 }
 
@@ -5175,3 +5175,114 @@ func SelfDrugAutoAddCancelInfoOne(advice *models.DoctorAdvice, creater int64) er
 	}
 	return err
 }
+
+func GetDrugInventoryRecordList(limit int64, page int64, keyword string, storehouse_id int64, startTime int64, endTime int64, orgId int64) (list []*models.XtDrugStockInventoryList, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&list).Where("status=1")
+
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ?", likeKey)
+	}
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	if startTime > 0 {
+		db = db.Where("record_date>=?", startTime)
+	}
+
+	if endTime > 0 {
+		db = db.Where("record_date<=?", endTime)
+	}
+
+	if orgId > 0 {
+		db = db.Where("user_org_id =?", orgId)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
+
+	return list, total, err
+
+}
+
+func GetDrugInventoryRecordPrintList(limit int64, page int64, keyword string, storehouse_id int64, orgId int64, startTime int64, endTime int64, idSplit []string) (list []*models.XtDrugStockInventoryList, total int64, err error) {
+
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+
+	db := XTReadDB().Model(&list).Where("status =1")
+	if len(keyword) > 0 {
+		db = db.Where("drug_name like ?", likeKey)
+	}
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+
+	if startTime > 0 {
+		db = db.Where("record_date>=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("record_date<=?", endTime)
+	}
+
+	if len(idSplit) > 0 {
+		db = db.Where("id in(?)", idSplit)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
+
+	return list, total, err
+
+}
+
+func GetDrugWarehosueInfoList(org_id int64, start_time int64, end_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=1 or consumable_type =10)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime >= ?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetDrugWarhouseHouseOutInfo(org_id int64, start_time int64, end_time int64) (flow []*models.XtDrugFlowList, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and (consumable_type=2 or consumable_type=3 or consumable_type=11)")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime >= ?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+
+	err = db.Find(&flow).Error
+
+	return flow, err
+
+}

service/stock_service.go

@@ -401,6 +401,11 @@ func FindAllGoodInfoTwo(org_id int64) (goodInfo []*models.GoodInfo, err error) {
 	return goodInfo, err
 }
 
+func FindAllGoodInfoThree(org_id int64) (goodInfo []*models.XtGoodInformationFourty, err error) {
+	err = XTReadDB().Model(&models.XtGoodInformationFourty{}).Where("org_id = ? AND status = 1 and find_in_set('停用',good_status) = 0", org_id).Find(&goodInfo).Error
+	return goodInfo, err
+}
+
 func FindAllWarehouseTotal(org_id int64) (total int64, err error) {
 	err = readDb.Model(&models.Warehousing{}).Where("org_id = ?", org_id).Count(&total).Error
 	return total, err
@@ -9490,3 +9495,203 @@ func UpdateStockFlowByList(good_id int64, packing_price float64) error {
 
 	return err
 }
+
+func GetGoodStockInventoryByRecordate(good_id int64, record_date int64, user_org_id int64) (models.XtGoodStockInventoryList, error) {
+
+	goodStockInventoryList := models.XtGoodStockInventoryList{}
+	err := XTReadDB().Where("good_id = ? and record_date = ? and user_org_id = ? and status=1", good_id, record_date, user_org_id).Find(&goodStockInventoryList).Error
+	return goodStockInventoryList, err
+}
+
+func CreateGoodStockInventoryList(list models.XtGoodStockInventoryList) error {
+
+	err := XTWriteDB().Create(&list).Error
+
+	return err
+}
+
+func SaveGoodStockInventoryList(list models.XtGoodStockInventoryList) error {
+
+	err := XTWriteDB().Save(&list).Error
+
+	return err
+}
+
+func GetGoodStockInventoryList(keyword string, limit int64, page int64, storehouse_id int64, startTime int64, endTime int64, orgId int64) (list []*models.XtGoodStockInventoryList, total int64, err error) {
+
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&models.XtGoodStockInventoryList{}).Where("status=1")
+
+	if storehouse_id > 0 {
+
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+
+	if startTime > 0 {
+		db = db.Where("record_date >=?", startTime)
+	}
+
+	if endTime > 0 {
+		db = db.Where("record_date<=?", endTime)
+	}
+
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or specification_name like ?", likeKey, likeKey)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
+
+	return list, total, err
+}
+
+func GetDrugStockInventoryList(drug_id int64, record_date int64, user_org_id int64) (models.XtDrugStockInventoryList, error) {
+
+	drugStockInventoryList := models.XtDrugStockInventoryList{}
+
+	err := XTReadDB().Where("drug_id = ? and record_date = ? and user_org_id = ? and status=1", drug_id, record_date, user_org_id).Find(&drugStockInventoryList).Error
+
+	return drugStockInventoryList, err
+}
+
+func CreatedDrugStockInventory(list models.XtDrugStockInventoryList) error {
+
+	err := XTWriteDB().Create(&list).Error
+
+	return err
+}
+
+func SaveDrugStockInventory(list models.XtDrugStockInventoryList) error {
+
+	err := XTWriteDB().Save(&list).Error
+
+	return err
+}
+
+func GetStockInventoryPrintList(storehouse_id int64, keyword string, limit int64, page int64, ids []string, orgId int64) (list []*models.XtGoodStockInventoryList, total int64, err error) {
+
+	db := XTReadDB().Model(&list).Where("status=1")
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ?", likeKey)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", ids)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
+
+	return list, total, err
+}
+
+func GetGoodWarehouseInfoList(startTime int64, endTime int64, orgId int64) (info []*models.WarehousingInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status=1 and is_check=1")
+
+	if startTime > 0 {
+		db = db.Where("ctime>=?", startTime)
+	}
+
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+
+	if orgId > 0 {
+		db = db.Where("org_id = ?", orgId)
+	}
+
+	err = db.Find(&info).Error
+
+	return info, err
+}
+
+func GetGoodWarhouseOutList(startTime int64, endTime int64, orgId int64) (outinfo []*models.WarehouseOutInfo, err error) {
+
+	db := XTReadDB().Model(&outinfo).Where("status=1 and is_check =1")
+
+	if startTime > 0 {
+		db = db.Where("ctime>=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+
+	if orgId > 0 {
+		db = db.Where("org_id = ?", orgId)
+	}
+
+	err = db.Find(&outinfo).Error
+
+	return outinfo, err
+}
+
+func GetGoodStockFlowProList(startTime int64, endTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 10")
+
+	if startTime > 0 {
+		db = db.Where("ctime>=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetGoodStockFlowNoProList(startTime int64, endTime int64, orgId int64) (flow []*models.VmStockFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1 and consumable_type = 11")
+
+	if startTime > 0 {
+		db = db.Where("ctime>=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}
+
+func GetDrugCodeOpen(user_org_id int64) (models.XtDrugCodeOpen, error) {
+
+	drugCodeOpen := models.XtDrugCodeOpen{}
+
+	err := XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&drugCodeOpen).Error
+
+	return drugCodeOpen, err
+}
+
+func CreateDrugOpen(open models.XtDrugCodeOpen) error {
+
+	err := XTWriteDB().Create(&open).Error
+
+	return err
+}
+
+func SaveDrugOpen(open models.XtDrugCodeOpen) error {
+
+	err := XTWriteDB().Save(&open).Error
+
+	return err
+}

service/warhouse_service.go

@@ -365,6 +365,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			OverCount:               sum_count,
 			AdviceId:                advice.ID,
 			OperateTime:             time.Now().Unix(),
+			DrugCode:                advice.DrugCode,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -543,6 +544,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			OverCount:               sum_count,
 			AdviceId:                advice.ID,
 			OperateTime:             time.Now().Unix(),
+			DrugCode:                advice.DrugCode,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -9327,6 +9329,7 @@ func HisFaDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvi
 				}
 			}
 
+			fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhwode", advice.DrugCode)
 			newadviceInfo := &models.HisDoctorAdviceInfo{
 				ID:                    advice.ID,
 				UserOrgId:             advice.UserOrgId,
@@ -9392,6 +9395,7 @@ func HisFaDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvi
 				IsMobile:              advice.IsMobile,
 				IsSelfDrug:            advice.IsSelfDrug,
 				DrugWayCount:          advice.DrugWayCount,
+				DrugCode:              advice.DrugCode,
 			}
 
 			db := XTWriteDB()