Merge branch '20211122' of D:\lijianchao\project\src\XT_New with conflicts.

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="@rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com" uuid="a5e97996-c706-42df-9eba-66746647237e">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <remarks>lijc de database</remarks>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com:3306</jdbc-url>
+    </data-source>
+  </component>
+</project>

.idea/vcs.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GitSharedSettings">
+    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
+      <list />
+    </option>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
+</project>

conf/app.conf

@@ -1,6 +1,7 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
+#dev/prod
 
 #
 copyrequestbody = true
@@ -126,7 +127,7 @@ redisport = 6379
 redispasswrod = 1Q2W3e4r!@#$
 redisdb = 1
 
-
+EnableRender= false
 niprocart =  63
 jms = 58
 fistula_needle_set = 65

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -69,36 +70,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 1//4，809
+		userAdmin.Mobile = "12222222222"
+		userAdmin.IsSuperAdmin = true
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 11
+		subscibe.OrgId = 14//机构id
+		subscibe.PeriodStart = 1547447814
+		subscibe.PeriodEnd = 1550039814
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14//4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
@@ -315,35 +316,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 1//4，809
+		userAdmin.Mobile = "12222222222"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 11
+		subscibe.OrgId = 14//机构id小英9675或4
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 14//机构id小英9675或4
+		adminUserInfo.CurrentAppId = 14//4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/base_controller.go

@@ -37,3 +37,4 @@ func (this *BaseController) DebugLog(format string, a ...interface{}) {
 func (this *BaseController) TraceLog(format string, a ...interface{}) {
 	//beego.Trace(fmt.Sprintf(format, a...))
 }
+

controllers/drug_pharmacy_management_controller.go

@@ -41,18 +41,12 @@ func PharmacyApiControllersRegisterRouters() {
 
 func (this *PharmacyApiController) GetTodayAdviceList() {
 
-	keywords := this.GetString("keywords")
-
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-
 	//获取药房发药药品库数据
-	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-	list, err := service.GetPharmacyDrugList(houseConfig.DrugStorehouseOut, orgId, keywords)
 	appId := this.GetAdminUserInfo().CurrentAppId
-	doctorlist, _ := service.GetAllDoctorSix(orgId, appId)
+	doctorlist, err := service.GetAllDoctorSix(orgId, appId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":       list,
 			"doctorlist": doctorlist,
 		})
 	} else {
@@ -473,7 +467,12 @@ func (this *PharmacyApiController) GetReturnPharmacyBaseDrug() {
 }
 
 func (this *PharmacyApiController) SaveSetting() {
-
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
 	is_open, _ := this.GetInt64("is_open")
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
@@ -491,6 +490,9 @@ func (this *PharmacyApiController) SaveSetting() {
 	} else if errcode == nil {
 		service.UpdatePharmacyConfig(orgId, &config)
 	}
+	if is_open == 2 {
+		err = fmt.Errorf("用户关闭药房管理出库")
+	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"config": config,

controllers/drug_stock_api_contorller.go

@@ -1157,7 +1157,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
-
+	//创建一个出库单
 	warehouseOut := models.DrugWarehouseOut{
 		WarehouseOutOrderNumber: warehousing_out_order,
 		OperationTime:           operation_time,
@@ -1185,9 +1185,9 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-
+	//出库单详情
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
-
+	//把前端的参数加工为出库单详情
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
 

controllers/his_deposit_controller.go

@@ -78,8 +78,6 @@ func (this *HisDepositApiController) GetHisUser() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	token := this.Ctx.Request.Header.Get("Cookie")
 	fmt.Println(token)
-	this.Ctx.SetCookie("ppp", "lilili")
-	this.Ctx.SetCookie("ppp01", "lilili01")
 	list, err := service.GetHisUser(orgid)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
@@ -504,7 +502,6 @@ func (this *HisDepositApiController) GetUserList() {
 //扣费明细查询
 func (this *HisDepositApiController) DeductionDetails() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
-	//orgid = 9675
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	keyword := this.GetString("keyword")

controllers/manager_center_api_controller.go

@@ -150,6 +150,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
 	is_user, _ := c.GetInt64("is_user")
+	is_pharmacy, _ := c.GetInt64("is_pharmacy")
 	adminInfo := c.GetAdminUserInfo()
 	drugLib := &models.BaseDrugLib{
 		DrugName:                    drug_name,
@@ -215,6 +216,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		LmtUsedFlag:                 lmt_used_flag,
 		PrescribingNumberUnit:       prescribing_number_unit,
 		IsUse:                       is_user,
+		IsPharmacy: 				 is_pharmacy,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
@@ -313,9 +315,10 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
 	is_user, _ := c.GetInt64("is_user")
-	sum_count, _ := c.GetInt64("sum_count")
-	sum_in_count, _ := c.GetInt64("sum_in_count")
-	adminInfo := c.GetAdminUserInfo()
+  sum_count, _ := c.GetInt64("sum_count")
+  sum_in_count, _ := c.GetInt64("sum_in_count")
+	is_pharmacy, _ := c.GetInt64("is_pharmacy")
+  adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 	drugLib := &models.BaseDrugLib{
 		ID:                          id,
@@ -386,6 +389,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsUse:                       is_user,
 		SumCount:                    sum_count,
 		SumInCount:                  sum_in_count,
+		IsPharmacy: is_pharmacy,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -550,11 +550,14 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	origin, _ := c.GetInt64("origin", 0)
 	groupno, _ := c.GetInt64("groupno", -1)
+	orgid := c.GetMobileAdminUserInfo().Org.Id
 
 	if origin != 2 {
+		adminUserInfo := c.GetMobileAdminUserInfo()
+		execution_staff := adminUserInfo.AdminUser.Id
 		var ids []string
+		advice_ids := c.GetString("advice_id")
 		if groupno == 0 {
-			advice_ids := c.GetString("advice_id")
 			ids = strings.Split(advice_ids, ",")
 		}
 		if groupno < 0 {
@@ -577,9 +580,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
-
-		adminUserInfo := c.GetMobileAdminUserInfo()
-
 		var advice models.DoctorAdvice
 
 		if groupno > 0 {
@@ -613,8 +613,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			return
 		}
 
-		execution_staff := adminUserInfo.AdminUser.Id
-
 		advices := models.DoctorAdvice{
 			ExecutionStaff: execution_staff,
 			ExecutionTime:  theTime.Unix(),
@@ -761,7 +759,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询是否出库按钮开启
 									prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
 									if prescriptionConfig.IsOpen == 1 {
-										if medical.IsUse == 2 {
+										if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 											//更新字典里面的库存
@@ -774,7 +772,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										}
 									}
 								} else {
-									if medical.IsUse == 2 {
+									if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -864,7 +862,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 
 							if prescribing_number_total <= total {
-								if medical.IsUse == 2 {
+								if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
 									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 
 									//更新字典里面的库存
@@ -1005,10 +1003,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		})
 		return
 	} else if origin == 2 {
+		adminInfo := c.GetMobileAdminUserInfo()
+		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		var ids []string
 		advice_ids := c.GetString("advice_id")
 		ids = strings.Split(advice_ids, ",")
-
 		if len(execution_time) <= 0 {
 			utils.ErrorLog("execution_time")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1023,8 +1022,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
-		adminInfo := c.GetMobileAdminUserInfo()
-		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		advices, _ := service.FindHisDoctorAdviceByIds(adminInfo.Org.Id, ids)
 		var err error
 		for _, item := range advices {
@@ -1169,7 +1166,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if prescribing_number_total <= total {
-							if medical.IsUse == 2 {
+							if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,orgid) {
 
 								if config.IsOpen != 1 {
 									service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)

controllers/patient_api_controller.go

@@ -1319,11 +1319,19 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.ExecutionFrequency = executionFrequency
 		}
 
+		if adviceNameM["way"] != nil && reflect.TypeOf(adviceNameM["way"]).String() == "string" {
+			way, _ := strconv.ParseFloat(adviceNameM["way"].(string), 64)
+			advice.Way = int64(way)
+		}
 		if adviceNameM["way"] != nil || reflect.TypeOf(adviceNameM["way"]).String() == "float64" {
 			way := int64(adviceNameM["way"].(float64))
 			advice.Way = way
 		}
 
+		if adviceNameM["drug_id"] != nil && reflect.TypeOf(adviceNameM["drug_id"]).String() == "string" {
+			drug_id, _ := strconv.ParseFloat(adviceNameM["drug_id"].(string), 64)
+			advice.DrugId = int64(drug_id)
+		}
 		if adviceNameM["drug_id"] != nil || reflect.TypeOf(adviceNameM["drug_id"]).String() == "float64" {
 			drug_id := int64(adviceNameM["drug_id"].(float64))
 			advice.DrugId = drug_id
@@ -1687,30 +1695,20 @@ func (c *PatientApiController) ExecGroupAdvice() {
 
 			}
 
-			if medical.IsUse == 1 {
+			if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "1",
+					"msg":    "3",
 					"advice": advice,
 				})
 				return
 			}
-			if medical.IsUse != 1 {
-				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "3",
-						"advice": advice,
-					})
-					return
-				}
-				if prescribing_number_total > total {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "2",
-						"advice": advice,
-					})
-					return
-				}
+			if prescribing_number_total > total {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":    "2",
+					"advice": advice,
+				})
+				return
 			}
-
 			if prescribing_number_total <= total {
 				if medical.IsUse == 2 {
 					service.DrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
@@ -1935,9 +1933,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if adviceSetting.IsAdviceOpen == 1 {
 						//查询是否出库按钮开启
 						prescriptionConfig, _ := service.FindPrescriptionConfigById(item.UserOrgId)
-
+						fmt.Println("prescriptionConfigwodweweeeweweweweweewewewwewew", prescriptionConfig)
 						if prescriptionConfig.IsOpen == 1 {
-							if medical.IsUse == 2 {
+							if medical.IsUse == 2 && !service.IsPharmacyDelivery(item.DrugId,item.UserOrgId){
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 								//查询默认仓库
 								storeHouseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
@@ -3307,6 +3305,11 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		advice.Remark = remark
 	}
 
+	if dataBody["drug_id"] != nil && reflect.TypeOf(dataBody["drug_id"]).String() == "string" {
+		drug_id, _ := dataBody["drug_id"].(string)
+		tmpDrugId,_ := strconv.ParseInt(drug_id,10,64)
+		advice.DrugId = tmpDrugId
+	}
 	if dataBody["drug_id"] != nil && reflect.TypeOf(dataBody["drug_id"]).String() == "float64" {
 		drug_id, _ := dataBody["drug_id"].(float64)
 		advice.DrugId = int64(drug_id)

controllers/pharmacy_controller.go

@@ -0,0 +1,474 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"github.com/astaxie/beego"
+	"time"
+)
+
+type PharmacyController struct {
+	BaseAuthAPIController
+}
+
+func PharmacyApiRegistRouters() {
+	beego.Router("/api/pharmacy/ceshili",&PharmacyController{},"get:Tlili")
+	beego.Router("/api/pharmacy/todaynumber",&PharmacyController{},"get:TodayNumber")//查询今天的待发药，已发药人数（
+	beego.Router("/api/pharmacy/waitingdrug",&PharmacyController{},"get:WaitingDrug")//获取当天待发药的所有患者（
+	beego.Router("/api/pharmacy/issueddrugs",&PharmacyController{},"get:IssuedDrug")//获取当天已发药的所有患者（
+	beego.Router("/api/pharmacy/getpharmacycontent",&PharmacyController{},"get:GetPharmacyContent")//获取当天该患者的所有信息（
+	beego.Router("/api/pharmacy/dispensingmedicine",&PharmacyController{},"get:DispensingMedicine")//患者发药按钮点击（
+	beego.Router("/api/pharmacy/drugwithdrawal",&PharmacyController{},"get:DrugWithdrawal")//退药按钮点击
+	beego.Router("/api/pharmacy/dispensingdetails",&PharmacyController{},"get:DispensingDetails")//获取发药明细的患者列表(
+	beego.Router("/api/pharmacy/prescriptiondetails",&PharmacyController{},"get:PrescriptionDetails")//发药明细-详情(
+	beego.Router("/api/pharmacy/dispensemedicine",&PharmacyController{},"get:DispenseMedicine")//获取当天已发药的药品(
+	beego.Router("/api/pharmacy/waitingmedicine",&PharmacyController{},"get:WaitingMedicine")//获取当天待发药的药品(
+	beego.Router("/api/pharmacy/getpatientswithdrugs",&PharmacyController{},"get:GetPatientsWithDrugs")//获取当天该药品的所有患者(
+	beego.Router("/api/pharmacy/medicinedeparture",&PharmacyController{},"get:MedicineDeparture")//药品发药按钮点击(
+	beego.Router("/api/pharmacy/getcurrentname",&PharmacyController{},"get:GetCurrentName")//获取当前登录账号的名字(
+}
+func (this *PharmacyController)Tlili(){
+	times := this.GetString("time","")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	//orgid := this.GetAdminUserInfo().CurrentOrgId
+	service.InitDrugidIsNil(9675,stime,etime)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "err",
+	})
+	return
+}
+func (this *PharmacyController)GetCurrentName(){
+	create := this.GetAdminUserInfo().AdminUser.Id
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": create,
+	})
+	return
+}
+//查询今天的待发药，已发药人数
+func (this *PharmacyController)TodayNumber(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	times := this.GetString("time","")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	//查询表里当天的数据
+	var wtotal int
+	wtotal,err = service.GetTodayPharmacy(stime,etime,orgid,1)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	var itotal int
+	itotal,err = service.GetTodayPharmacy(stime,etime,orgid,0)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"wtotal": wtotal,
+		"itotal": itotal,
+	})
+	return
+}
+func (this *PharmacyController)IssuedDrug(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	keyword := this.GetString("keyword","")
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	//查询表里当天的数据
+	var flist []*models.TmpPatient
+	flist,err = service.GetTodayDrug(stime,etime,orgid,1,keyword)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": flist,
+	})
+	return
+}
+func (this *PharmacyController)WaitingDrug(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	keyword := this.GetString("keyword","")
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	//查询表里当天的数据
+	var flist []*models.TmpPatient
+	flist,err = service.GetTodayDrug(stime,etime,orgid,0,keyword)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": flist,
+	})
+	return
+}
+//
+func (this *PharmacyController)GetPharmacyContent(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	patient_id,_ := this.GetInt64("patient_id",0)
+	is_medicine,_ := this.GetInt64("is_medicine",0)//0：待发药，1：已发药
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	var list []*models.PharmacyContent
+	list,err = service.GetPatientMedication(orgid,patient_id,stime,etime,is_medicine)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	return_value := make(map[string]interface{})
+	return_value["list"] = list
+	//if is_medicine == 1{发药时间先不展示
+	//	return_value["time"] = time
+	//}
+	this.ServeSuccessJSON(return_value)
+	return
+
+}
+//发药按钮点击
+func (this *PharmacyController)DispensingMedicine()  {
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	patient_id,_ := this.GetInt64("patient_id",0)
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	creater := this.GetAdminUserInfo().AdminUser.Id
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	err = service.DispensingMedicine(orgid,patient_id,stime,etime,creater)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "操作成功",
+	})
+	return
+}
+//退药按钮点击
+func (this *PharmacyController)DrugWithdrawal(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	patient_id,_ := this.GetInt64("patient_id",0)
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	creater := this.GetAdminUserInfo().AdminUser.Id
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	err = service.DrugWithdrawal(orgid,patient_id,stime,etime,creater)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "操作成功",
+	})
+	return
+
+}
+
+//发药明细列表
+func (this *PharmacyController)DispensingDetails(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	keyword := this.GetString("keyword","")//患者名称
+	start_time := this.GetString("start_time","")//开始时间
+	end_time := this.GetString("end_time","")//结束时间
+	page, _ := this.GetInt64("page",1)               //页码
+	limit, _ := this.GetInt64("limit",10)             //每一页查出来的条数
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if start_time == ""{
+		stime = 1
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		stime = stmp.Unix()
+	}
+	if end_time == ""{
+		_,etime = service.GetNowTime()
+	}else {
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59",loc)
+		etime = etmp.Unix()
+	}
+	var dislist []*models.DispensingList
+	var total int64
+	dislist,total,err = service.DispensingDetailsList(stime,etime,orgid,page,limit,keyword)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": dislist,
+		"total":total,
+	})
+	return
+}
+//处方详情
+func (this *PharmacyController)PrescriptionDetails(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	//患者姓名
+	patient_id,_ := this.GetInt64("patient_id",0)
+	//发药时间
+	record_date,_ := this.GetInt64("record_date",0)
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	if record_date == 0 || patient_id == 0{
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数不足")
+		return
+	}
+	var list []*models.PrescripDetails
+	list,err = service.PrescriptionDetails(patient_id,record_date,orgid)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}
+
+//已发药品的信息
+func (this *PharmacyController)DispenseMedicine(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	keyword := this.GetString("keyword","")
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	//查询表里当天的数据
+	var flist []*models.ListOfDrugs
+	flist,err = service.GetTodayMedicine(stime,etime,orgid,1,keyword)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": flist,
+	})
+	return
+}
+//待发药的药品信息
+func (this *PharmacyController)WaitingMedicine(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	keyword := this.GetString("keyword","")
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	//查询表里当天的数据
+	var flist []*models.ListOfDrugs
+	flist,err = service.GetTodayMedicine(stime,etime,orgid,0,keyword)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": flist,
+	})
+	return
+}
+
+//获取药品的所有患者信息
+func (this *PharmacyController)GetPatientsWithDrugs(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	drug_id,_ := this.GetInt64("drug_id",0)
+	is_medicine,_ := this.GetInt64("is_medicine",0)//0：待发药，1：已发药
+	times := this.GetString("time","")
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime,etime int64
+	if times == ""{
+		stime,etime = service.GetNowTime()
+	}else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	var list []*models.PatientInformation
+	list,err = service.FindMedicationList(orgid,drug_id,stime,etime,is_medicine)
+	if err != nil{
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}
+//药品管理发药按钮点击
+func (this *PharmacyController)MedicineDeparture(){
+	var err error
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
+	creater,_ := this.GetInt64("creater",0)//领药人
+	ids := this.GetString("ids","")//发药的数据
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	orgid = 9675
+	creater = 809
+	if ids == ""{
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数不足")
+		return
+	}
+	err = service.MedicineDeparture(ids,creater,orgid)
+	if err != nil{
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "修改成功",
+	})
+	return
+}

controllers/secondary_order_api_contorller.go

@@ -277,6 +277,11 @@ func (this *SecondaryOrderApiController) AddStorehouse() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	defer func() {
+		if err != nil{
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
+		}
+	}()
 	var storehouse_status, admin_id int64
 	tmpstatus := dataBody["storehouse_status"]
 	tmpid := dataBody["storehouse_admin_id"] //管理员id
@@ -348,7 +353,9 @@ func (this *SecondaryOrderApiController) AddStorehouse() {
 		"list":  "保存成功",
 		"shiwu": shiwu,
 	})
+
 	return
+
 }
 
 //修改仓库

main.go

@@ -20,5 +20,6 @@ func main() {
 	//service.BeginAutoCreateStockJob()
 
 	//beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 6000
+	//beego.BConfig.WebConfig.AutoRender = false
 	beego.Run()
 }

models/dialysis.go

@@ -449,6 +449,7 @@ type DoctorAdvice struct {
 	Way                   int64           `gorm:"column:way" json:"way" form:"way"`
 	DrugId                int64           `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	DrugNameId            int64           `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	IsMedicine			  int64			  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 }
 
 func (DoctorAdvice) TableName() string {

models/doctor_schedule_models.go

@@ -77,7 +77,7 @@ type XTSgjUserAdminRole struct {
 }
 
 func (XTSgjUserAdminRole) TableName() string {
-	return "sgj_user_admin_role"
+	return "sgj_users.sgj_user_admin_role"
 }
 
 type ContinueSchedule struct {

models/drug.go

@@ -74,6 +74,7 @@ type BaseDrugLib struct {
 	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"`
+	IsPharmacy			  int64					`gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 }
 
 func (BaseDrugLib) TableName() string {

models/pharmacy_models.go

@@ -0,0 +1,254 @@
+package models
+
+//药房表
+type Pharmary struct {
+	ID			int64	`gorm:"column:id" json:"id" form:"id"`
+	UserOrgId	int64	`gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId  int64	`gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime 		int64	`gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime 		int64	`gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status 		int64	`gorm:"column:status" json:"status" form:"status"`
+	RecordDate  int64	`gorm:"column:record_date" json:"record_date" form:"record_date"`
+}
+
+func (Pharmary)TableName() string {
+	return "sgj_xt.xt_pharmacy"
+}
+
+type XtErrs struct {
+	OrgId			int64	`gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Route			string	`gorm:"column:route" json:"route" form:"route"`
+	Parameter		string	`gorm:"column:parameter" json:"parameter" form:"parameter"`
+	Text_err		string	`gorm:"column:text_err" json:"text_err" form:"text_err"`
+}
+func (XtErrs)TableName() string {
+	return "sgj_xt.xt_errs"
+}
+
+//病人
+type TmpPatient struct {
+	PatientID int64
+	Name string
+	DialysisNo string	//透析号
+}
+
+//药品信息
+type PharmacyContent struct {
+	Name string		//名称
+	SingleDosage string //单次用量
+	Usage string	//用法
+	Frequency string //频率
+	Days string	//天数
+	Total string //总量
+	Doctor string	//开立医生
+	DataSources string	//数据来源
+	Remarks string	//备注
+}
+//发药明细列表
+type DispensingList struct {
+	PatientID int64	//	患者id
+	Name string	//患者姓名
+	DoctorId	int64	//医生id
+	DoctorName string	//医生姓名
+	RecordTime	int64	//发药时间(转化前)
+	RecordDate 	string	//发药时间(转化后)
+}
+type PrescripDetailsList struct {
+	Name string //处方名
+	Id int64	//处方id
+	Pres []*PrescripDetails
+}
+//处方详情
+type PrescripDetails struct {
+	Drugname string		//药品名称
+	SingleDosage string //单次用量
+	Usage string	//用法
+	Frequency string //频率
+	Days string	//天数
+	Total string //总量
+	UnitPrice string//单价
+	Remarks string	//备注
+}
+//临时医嘱
+type StatOrder struct {
+	StartTime string//开始时间
+	Name string//医嘱名称
+	Specifications string //药品规格
+	PreQuantity string//开药数量
+	SingleDosage string//单次用量
+	RouteOfAdministration string//给药途径
+	ExecutionFrequency string//执行频率
+}
+//退库用的结构体
+type SpecialForStock struct {
+	BatchNumber 		string	`json:"batch_number"`
+	BatchNumberId		int64	`json:"batch_number_id"`
+	Dealer				string	`json:"dealer"`
+	DrugId				int64	`json:"drug_id"`
+	DrugName			string	`json:"drug_name"`
+	DrugType			int64	`json:"drug_type"`
+	DrugWarehouseInfo	interface{}	`json:"drug_warehouse_info"`
+	ExpiryDate			string	`json:"expiry_date"`
+	LastPrice			float64	`json:"last_price"`
+	Manufacturer		string	`json:"manufacturer"`
+	MaxUnit				string	`json:"max_unit"`
+	MinUnit				string	`json:"min_unit"`
+	Name 				string	`json:"name"`
+	Price 				string	`json:"price"`
+	ProductDate			string	`json:"product_date"`
+	RegisterAccount		string	`json:"register_account"`
+	Remark				string	`json:"remark"`
+	RetailPrice			string	`json:"retail_price"`
+	ReturnCount			string	`json:"return_count"`
+
+}
+//药品发药药品列表
+type ListOfDrugs struct {
+	ID int64	`json:"id"`		//药品id
+	Name string	`json:"name"`	//药品 名称
+	Specifications string	`json:"specifications"` //规格
+	Stock string	`json:"stock"`  //库存（当前的仓库库存）
+}
+//病人信息
+type PatientInformation struct {
+	Id			string  `json:"id"`//hid表示his_doctor_advice_info的id ,xid表示xt_doctor_advice的id
+	Name 		string  `json:"name"`//患者姓名
+	SingleDosage string	`json:"single_dosage"` //单次用量
+	Usage string		`json:"usage"`//用法
+	Frequency string `json:"frequency"`//频率
+	Days string	`json:"days"`//天数
+	Total string `json:"total"`//总量
+	DataSources string	`json:"data_sources"`//数据来源
+	People	string	`json:"people"`//领药人
+}
+type HisDoctorAdviceInfoL struct {
+	ID                    int64                  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64                  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64                  `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64                  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64                  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string                 `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string                 `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64                  `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64                `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string                 `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64                `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string                 `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string                 `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64                  `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64                  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64                  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64                  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string                 `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string                 `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64                  `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string                 `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64                  `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64                  `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64                  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64                  `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64                  `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64                  `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64                  `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64                  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64                  `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64                  `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64                  `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64                `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string                 `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64                  `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64                  `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64                  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64                  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string                 `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string                 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64                  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64                  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64                `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64                  `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string                 `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64                  `gorm:"column:day" json:"day" form:"day"`
+	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Way                   int64                  `gorm:"column:way" json:"way" form:"way"`
+	HospApprFlag          int64                  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	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"`
+}
+
+func (HisDoctorAdviceInfoL) TableName() string {
+	return "sgj_xt.his_doctor_advice_info"
+}
+
+type XtDoctorAdviceL struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	UserName              string  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	CheckerName           string  `gorm:"column:user_name" json:"name" form:"name"`
+	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	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"`
+}
+
+func (XtDoctorAdviceL) TableName() string {
+	return "sgj_xt.xt_doctor_advice"
+}
+type TmpTTT struct {
+	PatientID int64
+}
+type TmpLLL struct {
+	DrugId    int64
+}
+type TmpID struct {
+	Id    int64
+	DispensingTime int64
+}
+type TmpAdviceDoctor  struct {
+	AdviceDoctor    int64
+}

models/stock_models.go

@@ -988,7 +988,7 @@ type VmUserAdminRole struct {
 }
 
 func (VmUserAdminRole) TableName() string {
-	return "sgj_user_admin_role"
+	return "sgj_users.sgj_user_admin_role"
 }
 
 type VmStockAdjustPrice struct {

routers/router.go

@@ -83,4 +83,5 @@ func init() {
 	controllers.HisDepositApiRegistRouters()
 	controllers.HisSummaryApiRegistRouters()
 	controllers.PharmacyApiControllersRegisterRouters()
+	controllers.PharmacyApiRegistRouters()
 }

service/drug_pharmacy_management_service.go

@@ -14,7 +14,7 @@ import (
 
 func GetPharmacyDrugList(storehouse_id int64, orgid int64, keywords string) (drug []*models.PharmacyBaseDrug, err error) {
 
-	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用  and is_pharmacy = 1'", orgid)
+	db := XTReadDB().Model(&drug).Where("org_id=? and status=1  and drug_status<>'停用 and is_pharmacy = 1' ", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
@@ -1620,7 +1620,7 @@ func CreatePharmacyConfig(config *models.PharmacyConfig) error {
 
 func UpdatePharmacyConfig(orgid int64, config *models.PharmacyConfig) error {
 
-	err := XTWriteDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and status = 1", orgid).Update(map[string]interface{}{"is_open": config.IsOpen}).Error
+	err := XTWriteDB().Model(&models.PharmacyConfig{}).Where("user_org_id = ? and status = 1", orgid).Updates(map[string]interface{}{"is_open": config.IsOpen,"mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1628,6 +1628,22 @@ func GetPharmacyConfig(orgid int64) (models.PharmacyConfig, error) {
 
 	config := models.PharmacyConfig{}
 	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+	if err == gorm.ErrRecordNotFound {
+		tmp := models.PharmacyConfig{
+			UserOrgId: orgid,
+			IsOpen: 2,
+			Status: 1,
+			Ctime: time.Now().Unix(),
+			Mtime: time.Now().Unix(),
+		}
+		errs := XTWriteDB().Create(&tmp).Error
+		if errs != nil{
+			err = errs
+		}else {
+			err = nil
+		}
+		return tmp, err
+	}
 
 	return config, err
 }

service/mobile_dialysis_service.go

@@ -734,7 +734,7 @@ func MobileGetDoctorAdvices(orgID int64, patientID int64, recordDate int64) ([]*
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 or advice_type = 3)", patientID, orgID, recordDate).
-		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,way,drug_id,drug_name_id,IF(parent_id>0, parent_id, id) as advice_order,groupno").
+		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,way,drug_id,drug_name_id,IF(parent_id>0, parent_id, id) as advice_order,groupno,is_medicine").
 		Order("start_time asc, groupno desc, advice_order desc, id").
 		Scan(&records).Error
 
@@ -757,7 +757,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 	if len(doctor_advices_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DoctorAdvice{}).
 			Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 || advice_type = 3)", patientID, orgID, recordDate).
-			Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id,drug_name_id, IF(parent_id > 0, parent_id, id) as advice_order").
+			Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id,is_medicine,drug_name_id, IF(parent_id > 0, parent_id, id) as advice_order").
 			Order("start_time asc, groupno desc, advice_order desc, id asc").
 			Scan(&records).Error
 		if err != nil {
@@ -1334,6 +1334,7 @@ type MDoctorAdviceVM struct {
 	WeekDay               string  `gorm:"column:week_day" json:"week_day"`
 	TemplateId            string  `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsMedicine			  int64	  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 }
 
 func (MDoctorAdviceVM) TableName() string {
@@ -2887,7 +2888,7 @@ func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his
 	his_doctor_advice_str, _ := redis.Get(key).Result()
 
 	if len(his_doctor_advice_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Find(&his).Error
+		err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Find(&his).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(his) <= 0 {

service/patientmanage_service.go

@@ -835,7 +835,7 @@ func GetLongDialysisDetail(id int64) (models.XtDialysisSolution, error) {
 
 func GetPatientName(id int64) (models.Patients, error) {
 	patientsNew := models.Patients{}
-	err := XTReadDB().Model(&patientsNew).Where("id=? and status = 1", id).Find(&patientsNew).Error
+	err := XTReadDB().Model(&patientsNew).Where("id = ? and status = 1", id).Find(&patientsNew).Error
 	return patientsNew, err
 }
 

service/warhouse_service.go

@@ -500,7 +500,6 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 
 	return
 }
-
 // 药品出库 递归方式
 func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
 
@@ -2124,7 +2123,7 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 
 		maxNumber = goods.Count
 
-		if warehouse.StockCount < maxNumber {
+		if warehouse.StockCount < maxNumber {//这段逻辑根本不会执行，因为当库存数量大于或等于出库数量才会进入这个分支
 			return errors.New("库存数量不足")
 		}
 
@@ -5415,3 +5414,5 @@ func FindLastDrugWarehouseOutInfo(orgid int64) (models.DrugWarehouseOutInfo, err
 	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&info).Error
 	return info, err
 }
+
+

tests/default_test.go

@@ -1,37 +1,37 @@
 package test
-
-import (
-	_ "XT_New/routers"
-	"net/http"
-	"net/http/httptest"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/astaxie/beego"
-	. "github.com/smartystreets/goconvey/convey"
-)
-
-func init() {
-	_, file, _, _ := runtime.Caller(1)
-	apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator))))
-	beego.TestBeegoInit(apppath)
-}
-
-// TestBeego is a sample to run an endpoint test
-func TestBeego(t *testing.T) {
-	r, _ := http.NewRequest("GET", "/", nil)
-	w := httptest.NewRecorder()
-	beego.BeeApp.Handlers.ServeHTTP(w, r)
-
-	beego.Trace("testing", "TestBeego", "Code[%d]\n%s", w.Code, w.Body.String())
-
-	Convey("Subject: Test Station Endpoint\n", t, func() {
-		Convey("Status Code Should Be 200", func() {
-			So(w.Code, ShouldEqual, 200)
-		})
-		Convey("The Result Should Not Be Empty", func() {
-			So(w.Body.Len(), ShouldBeGreaterThan, 0)
-		})
-	})
-}
+//
+//import (
+//	_ "XT_New/routers"
+//	"net/http"
+//	"net/http/httptest"
+//	"path/filepath"
+//	"runtime"
+//	"testing"
+//
+//	"github.com/astaxie/beego"
+//	. "github.com/smartystreets/goconvey/convey"
+//)
+//
+//func init() {
+//	_, file, _, _ := runtime.Caller(1)
+//	apppath, _ := filepath.Abs(filepath.Dir(filepath.Join(file, ".."+string(filepath.Separator))))
+//	beego.TestBeegoInit(apppath)
+//}
+//
+//// TestBeego is a sample to run an endpoint test
+//func TestBeego(t *testing.T) {
+//	r, _ := http.NewRequest("GET", "/", nil)
+//	w := httptest.NewRecorder()
+//	beego.BeeApp.Handlers.ServeHTTP(w, r)
+//
+//	beego.Trace("testing", "TestBeego", "Code[%d]\n%s", w.Code, w.Body.String())
+//
+//	Convey("Subject: Test Station Endpoint\n", t, func() {
+//		Convey("Status Code Should Be 200", func() {
+//			So(w.Code, ShouldEqual, 200)
+//		})
+//		Convey("The Result Should Not Be Empty", func() {
+//			So(w.Body.Len(), ShouldBeGreaterThan, 0)
+//		})
+//	})
+//}