接口提交

controllers/device_api_controller.go

@@ -53,7 +53,7 @@ type DeviceAPIController struct {
 // /api/device/initdata [get] GetDeviceManageInitData
 func (this *DeviceAPIController) GetDeviceManageInitData() {
 	adminInfo := this.GetAdminUserInfo()
-	zones, getZonesErr := service.GetAllValidDeviceZones(adminInfo.CurrentOrgId)
+	zones, getZonesErr := service.GetAllValidDeviceZonesOne(adminInfo.CurrentOrgId)
 	if getZonesErr != nil {
 		this.ErrorLog("获取设备分区列表失败:%v", getZonesErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -503,7 +503,7 @@ func (this *DeviceAPIController) DisableDevice() {
 // /api/device/zones [get] GetZones
 func (this *DeviceAPIController) GetZones() {
 	adminInfo := this.GetAdminUserInfo()
-	zones, getZonesErr := service.GetAllValidDeviceZones(adminInfo.CurrentOrgId)
+	zones, getZonesErr := service.GetAllValidDeviceZonesOne(adminInfo.CurrentOrgId)
 	if getZonesErr != nil {
 		this.ErrorLog("获取设备分区列表失败:%v", getZonesErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/his_summary_controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"XT_New/enums"
 	"XT_New/service"
+	"fmt"
 	"github.com/astaxie/beego"
 	"time"
 )
@@ -16,6 +17,9 @@ func HisSummaryApiRegistRouters() {
 	beego.Router("/api/gethissummarydetaillist", &HisSummaryApiController{}, "Get:GetHisSummaryDetailList")
 	beego.Router("/api/his/getgatherdetailist", &HisSummaryApiController{}, "Get:GetGatherDetaiList")
 	beego.Router("/api/his/getdetailpatients", &HisSummaryApiController{}, "Get:GetDetailPatients")
+
+	beego.Router("/api/his/gethisorderlist", &HisSummaryApiController{}, "Get:GetHisOrderList")
+	beego.Router("/api/his/gethisadviceorderlist", &HisSummaryApiController{}, "Get:GetHisAdviceOrderList")
 }
 
 func (this *HisSummaryApiController) GetHisSummaryDetailList() {
@@ -633,3 +637,79 @@ func (this *HisSummaryApiController) GetDetailPatients() {
 
 	}
 }
+
+func (this *HisSummaryApiController) GetHisOrderList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	groupList, _ := service.GetOrderInfoList(patient_id, startRecordDateTime, endRecordDateTime, orgId)
+	fmt.Println("groupList32332323232232332322323", groupList)
+	//list, err := service.GetHisOrderListTwenty(patient_id, startRecordDateTime, endRecordDateTime, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"groupList": groupList,
+			//   "list": list,
+
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+}
+
+func (this *HisSummaryApiController) GetHisAdviceOrderList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetOrderInfoList(patient_id, startRecordDateTime, endRecordDateTime, orgId)
+
+	//drugList, err := service.GetAllDrugLibList(orgId)
+	//
+	//goodList, err := service.GetAllGoodList(orgId)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+			//"drugList":drugList,
+			//"goodList":goodList,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -115,6 +115,11 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId
 				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId
 				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight // 衣物重
+
+				//从化益达 备注默认上一次数据
+				if adminUserInfo.Org.Id == 10318 {
+					evaluation.Remark = lastPredialysisEvaluation.Remark
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1160,7 +1160,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 					if prescribing_number_total <= total {
 						if medical.IsUse == 2 {
-							config, _ := service.GetDrugOpenConfig(adminInfo.Org.Id)
+							config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
 							if config.IsOpen != 1 {
 								service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 								//查询默认仓库

controllers/patient_api_controller.go

@@ -2124,7 +2124,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 				if prescribing_number_total <= total {
 					if medical.IsUse == 2 {
-						config, _ := service.GetDrugOpenConfig(adminUserInfo.CurrentOrgId)
+						config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
+
 						if config.IsOpen != 1 {
 							service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
 

models/his_models.go

@@ -2107,3 +2107,202 @@ type VmHisOrder struct {
 func (VmHisOrder) TableName() string {
 	return "his_order"
 }
+
+type HisOrderTenty 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"`
+	HisPatientId                 int64                        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	PsnCertType                  string                       `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	SettleAccountsDate           int64                        `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                        int64                        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                        int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                       int64                        `gorm:"column:status" json:"status" form:"status"`
+	Number                       string                       `gorm:"column:number" json:"number" form:"number"`
+	PatientId                    int64                        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode                      int64                        `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg                      string                       `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                       string                       `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                       string                       `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime                  string                       `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid                  string                       `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus                  int64                        `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId                      string                       `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                       string                       `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                        string                       `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName                      string                       `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Certno                       string                       `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                         string                       `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                         string                       `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                         time.Time                    `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                          float64                      `gorm:"column:age" json:"age" form:"age"`
+	Insutype                     string                       `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType                      string                       `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag                  string                       `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime                     string                       `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType                string                       `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType                      string                       `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt                 float64                      `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt              float64                      `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay               float64                      `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt                float64                      `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt                  float64                      `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc                   float64                      `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay                      float64                      `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay                   float64                      `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay              float64                      `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay                     float64                      `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay                     float64                      `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay                     float64                      `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                       float64                      `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                       float64                      `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt                float64                      `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt                   float64                      `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay                      float64                      `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay                   float64                      `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt                  float64                      `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                         float64                      `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay                float64                      `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId                 string                       `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins                    string                       `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                       string                       `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType                      string                       `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail                   string                       `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	PayWay                       int64                        `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice                     float64                      `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo                    string                       `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice                float64                      `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice            float64                      `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice                 float64                      `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice                   float64                      `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice        float64                      `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice                 float64                      `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	IsMedicineInsurance          int64                        `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	SettleType                   int64                        `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime              int64                        `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime                int64                        `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	Creator                      int64                        `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                       int64                        `gorm:"column:modify" json:"modify" form:"modify"`
+	SzChargeInfo                 string                       `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo                string                       `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo      string                       `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	AccountPrice                 string                       `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	MzNumber                     string                       `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber                string                       `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+	YiliaoNumber                 string                       `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	RefundLog                    string                       `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
+	DetailLog                    string                       `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
+	FaPiaoCode                   string                       `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber                 string                       `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	RequestLog                   string                       `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog             string                       `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+	PType                        int64                        `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre                        int64                        `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis                    string                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId          int64                        `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
+	Decimal                      float64                      `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	HisOrderInfoTwenty           []*HisOrderInfoTwenty        `gorm:"ForeignKey:OrderId;AssociationForeignKey:ID" json:"order_info"`
+	Patients                     Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisHospitalCheckRecordTwenty HisHospitalCheckRecordTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"hisPatient"`
+}
+
+func (HisOrderTenty) TableName() string {
+	return "his_order"
+}
+
+type HisOrderInfoTwenty struct {
+	ID                           int64                        `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber                  string                       `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate                   int64                        `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId                     int64                        `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt             float64                      `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                          float64                      `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                         float64                      `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId                    int64                        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt                 float64                      `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp                  float64                      `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt              float64                      `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt                   float64                      `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt                float64                      `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag                  string                       `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType               string                       `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag               string                       `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status                       int64                        `gorm:"column:status" json:"status" form:"status"`
+	Memo                         string                       `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn                    string                       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime                        int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt                  float64                      `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag                  string                       `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime                        int64                        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag               string                       `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag                 string                       `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag                  string                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv                    string                       `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId                    int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId                 int64                        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId                      int64                        `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId                    int64                        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type                         int64                        `gorm:"column:type" json:"type" form:"type"`
+	ItemId                       int64                        `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Creator                      int64                        `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                       int64                        `gorm:"column:modify" json:"modify" form:"modify"`
+	OverPricPsnPay               float64                      `gorm:"column:over_pric_psn_pay" json:"over_pric_psn_pay" form:"over_pric_psn_pay"`
+	AllowReimburse               float64                      `gorm:"column:allow_reimburse" json:"allow_reimburse" form:"allow_reimburse"`
+	SettleType                   int64                        `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	Patients                     Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisHospitalCheckRecordTwenty HisHospitalCheckRecordTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"hisPatient"`
+	HisOrderTenty                HisOrderTenty                `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order"`
+	HisPrescriptionProject       HisPrescriptionProject       `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"his_prescription_project"`
+	HisDoctorAdvice              HisDoctorAdvice              `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"his_doctor_advice"`
+}
+
+func (HisOrderInfoTwenty) TableName() string {
+	return "his_order_info"
+}
+
+type HisHospitalCheckRecordTwenty struct {
+	ID                   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name                 string `gorm:"column:name" json:"name" form:"name"`
+	MedicalTreatmentType int64  `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	RecordDate           int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IdCardNo             string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	AdminUserId          int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments          int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	UserOrgId            int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number               string `gorm:"column:number" json:"number" form:"number"`
+	Doctor               int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	PsnNo                string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType          string `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno               string `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName              string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                 string `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                 string `gorm:"column:naty" json:"naty" form:"naty"`
+	MedType              int64  `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	Brdy                 string `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                string `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo             string `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo             string `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	AdmBed               int64  `gorm:"column:adm_bed" json:"adm_bed" form:"adm_bed"`
+	IdCardType           int64  `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	Diagnosis            string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	InsutypeType         string `gorm:"column:insutype_type" json:"insutype_type" form:"insutype_type"`
+	SickType             int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	MdtrtCertType        string `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	InHosptialTime       string `gorm:"column:in_hosptial_time" json:"in_hosptial_time" form:"in_hosptial_time"`
+	OutHosptialTime      string `gorm:"column:out_hosptial_time" json:"out_hosptial_time" form:"out_hosptial_time"`
+	InHospitalStatus     int64  `gorm:"column:in_hospital_status" json:"in_hospital_status" form:"in_hospital_status"`
+	Certificates         int64  `gorm:"column:certificates" json:"certificates" form:"certificates"`
+	OutHospitalStatus    int64  `gorm:"column:out_hospital_status" json:"out_hospital_status" form:"out_hospital_status"`
+	OutWay               int64  `gorm:"column:out_way" json:"out_way" form:"out_way"`
+	Phone                string `gorm:"column:phone" json:"phone" form:"phone"`
+	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	InsuplcAdmdvs        string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+}
+
+func (HisHospitalCheckRecordTwenty) TableName() string {
+	return "his_hospital_check_record"
+}

models/patient_schedule_template_models.go

@@ -19,7 +19,7 @@ type PatientScheduleTemplateId struct {
 	OrgID      int64 `gorm:"column:org_id" json:"-" form:"org_id"`
 	Status     int8  `gorm:"column:status" json:"-" form:"status"`
 	CreateTime int64 `gorm:"column:ctime" json:"-" form:"ctime"`
-	ModifyTime int64 `gorm:"column:mtime" json:"-" form:"mtime"`
+	ModifyTime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
 }
 
 func (PatientScheduleTemplateId) TableName() string {

service/device_service.go

@@ -261,6 +261,15 @@ func GetAllValidDeviceZones(orgID int64) ([]*models.DeviceZone, error) {
 	return zones, nil
 }
 
+func GetAllValidDeviceZonesOne(orgID int64) ([]*models.DeviceZone, error) {
+	var zones []*models.DeviceZone
+	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ? and status = 1", orgID).Find(&zones).Error
+	if err != nil {
+		return nil, err
+	}
+	return zones, nil
+}
+
 func GetDeviceZoneByID(orgID int64, zoneID int64) (*models.DeviceZone, error) {
 	var zone models.DeviceZone
 	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ? AND id = ?", orgID, zoneID).First(&zone).Error

service/his_summary_service.go

@@ -352,3 +352,72 @@ func GetAllHisOrderList(org_id int64, patient_id int64, start_time int64, end_ti
 
 	return order, err
 }
+
+func GetHisOrderListByMedChrgitemType(patient_id int64, startime int64, endtime int64, orgid int64) (info []*models.HisOrderInfoTwenty, err error) {
+
+	db := XTReadDB().Model(&models.HisOrderInfoTwenty{}).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if startime > 0 {
+		db = db.Where("settle_accounts_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("settle_accounts_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Group("med_chrgitm_type").Preload("Patients", "status = 1").Preload("HisHospitalCheckRecordTwenty", "status = 1").Find(&info).Error
+	return info, err
+}
+
+func GetOrderInfoList(patient_id int64, startime int64, endtime int64, orgid int64) (info []*models.HisOrderInfoTwenty, err error) {
+	db := XTReadDB().Model(&models.HisOrderInfoTwenty{}).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if startime > 0 {
+		db = db.Where("upload_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("upload_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Preload("HisOrderTenty", "status = 1").Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1")
+	}).Preload("HisDoctorAdvice", "status = 1").Preload("Patients", "status = 1").Preload("HisHospitalCheckRecordTwenty", "status = 1").Find(&info).Error
+	return info, err
+}
+
+func GetHisOrderListTwenty(patient_id int64, startime int64, endtime int64, orgid int64) (info []*models.HisOrderTenty, err error) {
+
+	db := XTReadDB().Model(&models.HisOrderTenty{}).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if startime > 0 {
+		db = db.Where("settle_accounts_date>=?", startime)
+	}
+
+	if endtime > 0 {
+		db = db.Where("settle_accounts_date<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Preload("HisOrderInfoTwenty", "status=1").Preload("Patients", "status = 1").Preload("HisHospitalCheckRecordTwenty", "status=1").Order("settle_accounts_date asc").Find(&info).Error
+	return info, err
+}
+
+func GetHisAdviceOrderList() {
+
+}

service/stock_service.go

@@ -6901,6 +6901,14 @@ func GetDrugOpenConfig(orgid int64) (*models.DrugOutConfig, error) {
 	return &config, nil
 }
 
+func GetDrugOpenConfigOne(orgid int64) (models.DrugOutConfig, error) {
+
+	config := models.DrugOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+
+	return config, err
+}
+
 func CreateDrugOutConfig(config models.DrugOutConfig) error {
 
 	err := XTWriteDB().Create(&config).Error

service/user_service.go

@@ -49,7 +49,7 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }

service/warhouse_service.go

@@ -273,10 +273,12 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				if warehouse.StockMinNumber == 0 {
+					warehouse.StockMaxNumber = stock_max_number
+				}
 			}
-			if warehouse.StockMinNumber == 0 {
-				warehouse.StockMaxNumber = stock_max_number
-			}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -514,9 +516,13 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
-	if advice.PrescribingNumberUnit == drup.MaxUnit {
+	if advice.PrescribingNumberUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
 		deliver_number = count * drup.MinNumber
-	} else {
+	}
+	if advice.PrescribingNumberUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+		deliver_number = count * drup.MinNumber
+	}
+	if advice.PrescribingNumberUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
 		deliver_number = count
 	}
 
@@ -656,9 +662,10 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				return errors.New("库存数量不足")
 			}
 		}
-
+		fmt.Println("max_number23323232323232232323", maxNumber)
+		fmt.Println("max_number23323232323232232323", minNumber)
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-
+		fmt.Println("max_number23323232323232232323", warehouse.StockMaxNumber)
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
 		}
@@ -678,6 +685,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 			}
 
+			fmt.Println("deliver_number2332322323323232", deliver_number)
+
+			fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
 			if minNumber == 0 && maxNumber != 1 {
 				if (warehouse.StockMinNumber - deliver_number) > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
@@ -689,10 +699,10 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-			}
 
-			if warehouse.StockMinNumber == 0 {
-				warehouse.StockMaxNumber = stock_max_number
+				if warehouse.StockMinNumber == 0 {
+					warehouse.StockMaxNumber = stock_max_number
+				}
 			}
 		}
 
@@ -705,6 +715,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			warehouse.StockMinNumber = 0
 		}
 
+		fmt.Println("warehouse.StockMinNumber 2323323232233", warehouse.StockMinNumber)
+		fmt.Println("warehouse.StockMaxNumber 2323323232233", warehouse.StockMaxNumber)
+
 		//扣减库存232332332332
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 
@@ -2366,11 +2379,12 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-			}
 
-			if warehouse.StockMinNumber == 0 {
-				warehouse.StockMaxNumber = stock_max_number
+				if warehouse.StockMinNumber == 0 {
+					warehouse.StockMaxNumber = stock_max_number
+				}
 			}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -2722,10 +2736,12 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				if warehouse.StockMinNumber == 0 {
+					warehouse.StockMaxNumber = stock_max_number
+				}
 			}
-			if warehouse.StockMinNumber == 0 {
-				warehouse.StockMaxNumber = stock_max_number
-			}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -4444,11 +4460,12 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-			}
 
-			if warehouse.StockMinNumber == 0 {
-				warehouse.StockMaxNumber = stock_max_number
+				if warehouse.StockMinNumber == 0 {
+					warehouse.StockMaxNumber = stock_max_number
+				}
 			}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {
@@ -4763,10 +4780,12 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				if warehouse.StockMinNumber == 0 {
+					warehouse.StockMaxNumber = stock_max_number
+				}
 			}
-			if warehouse.StockMinNumber == 0 {
-				warehouse.StockMaxNumber = stock_max_number
-			}
+
 		}
 
 		if drup.MaxUnit != drup.MinUnit {