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

controllers/his_config_api_controller.go

@@ -58,6 +58,20 @@ func HisConfigApiRegistRouters() {
 	beego.Router("/api/his/addstemplate", &HisConfigApiController{}, "post:AddsTemplate")                //批量添加
 	beego.Router("/api/his/ptemplateinformation", &HisConfigApiController{}, "get:PTemplateInformation") //根据患者id、透析模式获取处方模板信息
 	beego.Router("/api/his/deleteone", &HisConfigApiController{}, "get:DeleteOne")                       //删除单条处方模板
+
+	beego.Router("/api/his/exportmdtrtcerttype", &HisConfigApiController{}, "get:ExportMdtrtCertType") //删除单条处方模板
+
+}
+
+func (c *HisConfigApiController) ExportMdtrtCertType() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	start_time = start_time + " 00:00:00"
+	end_time = end_time + " 23:00:00"
+	os, _ := service.GetHisMdtrtCertType(start_time, end_time, c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": os,
+	})
 }
 
 func (c *HisConfigApiController) GetAllHisPatientsList() {

controllers/his_export_data_controller.go

@@ -0,0 +1,36 @@
+package controllers
+
+import (
+	"XT_New/service"
+	"github.com/astaxie/beego"
+)
+
+type HisExportDataController struct {
+	BaseAuthAPIController
+}
+
+func HisExportDataApiRegistRouters() {
+
+	beego.Router("/api/export", &HisExportDataController{}, "Get:GetExportData")
+}
+
+func (this *HisExportDataController) GetExportData() {
+	start_time := this.GetString("start_time")
+	start_time = start_time + " 00:00:00"
+	end_time := this.GetString("end_time")
+	end_time = end_time + " 23:59:59"
+
+	type_str := this.GetString("type")
+	if type_str == "1" {
+		ps, _ := service.GetHisOrderDetailFor310(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"order": ps,
+		})
+	} else {
+		ps, _ := service.GetHisOrderDetailFor390(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"order": ps,
+		})
+	}
+
+}

controllers/manager_center_api_controller.go

@@ -230,6 +230,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
 		Bbx01:                       bbx01,
+		Bck01b:                      "10",
 		IsProject:                   is_project,
 	}
 
@@ -416,6 +417,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		ZuobiaoId:                   bbx01,
 		Bby01:                       bby01,
 		Bbx01:                       bbx01,
+		Bck01b:                      "10",
 		IsProject:                   is_project,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {

controllers/statistics_api_controller.go

@@ -15,20 +15,192 @@ type StatisticsApiController struct {
 }
 
 func StatisticsApiRegistRouters() {
-
 	beego.Router("/api/statistisc/index", &StatisticsApiController{}, "get:GetStatistics")
 	beego.Router("/api/qc/statistiscall/get", &StatisticsApiController{}, "get:GetAllInspectionStatistisc")
 	beego.Router("/api/qc/statistiscperson/get", &StatisticsApiController{}, "get:GetPersonInspectionStatistisc")
-
+	beego.Router("/api/qc/statistiscperson/list", &StatisticsApiController{}, "get:GetInsepctionList")
 	beego.Router("/api/qc/patientstatistiscall/get", &StatisticsApiController{}, "get:GetPatientInspectionStatistisc")
+	beego.Router("/api/qc/patientinspectionstatistis/get", &StatisticsApiController{}, "get:GetFivePatientInspectionStatistisc")
 
-	//beego.Router("/api/qc/patientstatistiscall/get", &StatisticsApiController{}, "get:GetPatientInspectionStatistisc")
+	beego.Router("/api/commonqc/statistiscall/get", &StatisticsApiController{}, "get:GetAllCommonInspectionStatistisc")
+	beego.Router("/api/commonqc/statistiscperson/get", &StatisticsApiController{}, "get:GetPersonCommonInspectionStatistisc")
+	beego.Router("/api/commonqc/patientstatistiscall/get", &StatisticsApiController{}, "get:GetPatientCommonInspectionStatistisc")
 
-	//beego.Router("/api/qc/statistiscperson/export", &StatisticsApiController{}, "get:ExportPersonInspectionStatistisc")
+}
 
-	beego.Router("/api/qc/patientinspectionstatistis/get", &StatisticsApiController{}, "get:GetFivePatientInspectionStatistisc")
+// 配置检验数据查询
+func (this *StatisticsApiController) GetInsepctionList() {
+	adminUser := this.GetAdminUserInfo()
+	orgid := adminUser.CurrentOrgId
+	configurationlist, err := service.GetInsepctionConfigurationList(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"configurationlist": configurationlist,
+	})
+}
+func (c *StatisticsApiController) GetAllCommonInspectionStatistisc() {
+	start_date := c.GetString("start_date")
+	end_date := c.GetString("end_date")
+	project_id, _ := c.GetInt64("project_id")
+	item_id, _ := c.GetInt64("item_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_date+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	//患者总数
+	patientCount := service.GetPatientCount(c.GetAdminUserInfo().CurrentOrgId)
+	//获取配置
+	reference, _ := service.GetInspectionReferenceFour(project_id, item_id)
+	//获取数值在正常范围内的总数
+	config, _ := service.GetConfigurationById(project_id, item_id, c.GetAdminUserInfo().CurrentOrgId)
+	max, _ := strconv.ParseFloat(config.LargeRange, 64)
+	min, _ := strconv.ParseFloat(config.MinRange, 64)
+
+	normalTotal, _ := service.GetNormalInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min)
+	//获取数值异常的总数
+	unusualTotal, _ := service.GetUnusualInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min)
+	//获取没有检查的患者总数
+	noCheckTotal, _ := service.GetPatientNotInspectionTotal(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patient_count":  patientCount,
+		"normal_total":   normalTotal,
+		"unusual_total":  unusualTotal,
+		"no_check_total": noCheckTotal,
+		"reference":      reference,
+		"config":         config,
+	})
 
 }
+func (c *StatisticsApiController) GetPersonCommonInspectionStatistisc() {
+	start_date := c.GetString("start_time")
+	end_date := c.GetString("end_time")
+	project_id, _ := c.GetInt64("project_id")
+	item_id, _ := c.GetInt64("item_id")
+	patient_id, _ := c.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_date+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	patient, _ := service.GetFaPiaoPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
+	//获取配置
+	reference, _ := service.GetInspectionReferenceFour(project_id, item_id)
+	//获取数值在正常范围内的总数
+	inspections, _ := service.GetPatientInspectionByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.SysItemId, patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patient":     patient,
+		"reference":   reference,
+		"inspections": inspections,
+	})
+
+}
+func (c *StatisticsApiController) GetPatientCommonInspectionStatistisc() {
+	start_date := c.GetString("start_date")
+	end_date := c.GetString("end_date")
+	project_id, _ := c.GetInt64("project_id")
+	item_id, _ := c.GetInt64("item_id")
+	item_type, _ := c.GetInt64("item_type")
+	keyword := c.GetString("keyword")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_date+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	//获取配置
+	reference, _ := service.GetInspectionReferenceFour(project_id, item_id)
+	//获取数值在正常范围内的总数
+
+	config, _ := service.GetConfigurationById(project_id, item_id, c.GetAdminUserInfo().CurrentOrgId)
+	max, _ := strconv.ParseFloat(config.LargeRange, 64)
+	min, _ := strconv.ParseFloat(config.MinRange, 64)
+
+	//max, _ := strconv.ParseFloat(reference.RangeMax, 64)
+	//min, _ := strconv.ParseFloat(reference.RangeMin, 64)
+
+	switch item_type {
+	case 1:
+		list, _ := service.GetUnusualInspectionPatientList(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min, keyword)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"reference": reference,
+		})
+		break
+	case 2:
+		list, _ := service.GetPatientNotInspectionPatientList(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, keyword)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"reference": reference,
+		})
+		break
+	case 3:
+		list, _ := service.GetNormalInspectionPatientList(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min, keyword)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"reference": reference,
+		})
+		break
+	}
+}
 
 func (c *StatisticsApiController) GetFivePatientInspectionStatistisc() {
 	start_date := c.GetString("start_date")
@@ -60,7 +232,6 @@ func (c *StatisticsApiController) GetFivePatientInspectionStatistisc() {
 		"list": list,
 	})
 }
-
 func (c *StatisticsApiController) GetPatientInspectionStatistisc() {
 	start_date := c.GetString("start_date")
 	end_date := c.GetString("end_date")
@@ -170,7 +341,6 @@ func (c *StatisticsApiController) GetPatientInspectionStatistisc() {
 		break
 	}
 }
-
 func (c *StatisticsApiController) GetAllInspectionStatistisc() {
 	start_date := c.GetString("start_date")
 	end_date := c.GetString("end_date")
@@ -214,12 +384,9 @@ func (c *StatisticsApiController) GetAllInspectionStatistisc() {
 	if s_type == 2 {
 		normalTotal, _ := service.GetNormalKTVORURRInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1014, 10950, 1.2)
 		//获取数值异常的总数
-		//unusualTotal, _ := service.GetUnusualKTVORURRInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1.2)
 		unusualTotal, _ := service.GetUnusualKTVORURRInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1014, 10950, 1.2)
-
 		//获取没有检查的患者总数
 		noCheckTotal, _ := service.GetPatientNotKTVORURRInspectionTotal(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1014, 10950)
-
 		c.ServeSuccessJSON(map[string]interface{}{
 			"patient_count":  patientCount,
 			"normal_total":   normalTotal,
@@ -228,30 +395,24 @@ func (c *StatisticsApiController) GetAllInspectionStatistisc() {
 		})
 
 	} else if s_type == 3 {
-
 		normalTotal, _ := service.GetNormalKTVORURRInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1014, 10951, 65)
 		//获取数值异常的总数
 		//unusualTotal, _ := service.GetUnusualKTVORURRInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1.2)
 		unusualTotal, _ := service.GetUnusualKTVORURRInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1014, 10951, 65)
-
 		//获取没有检查的患者总数
 		noCheckTotal, _ := service.GetPatientNotKTVORURRInspectionTotal(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, 1014, 10951)
-
 		c.ServeSuccessJSON(map[string]interface{}{
 			"patient_count":  patientCount,
 			"normal_total":   normalTotal,
 			"unusual_total":  unusualTotal,
 			"no_check_total": noCheckTotal,
 		})
-
 	} else {
-
 		normalTotal, _ := service.GetNormalInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min)
 		//获取数值异常的总数
 		unusualTotal, _ := service.GetUnusualInspectionTotalByID(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID, max, min)
 		//获取没有检查的患者总数
 		noCheckTotal, _ := service.GetPatientNotInspectionTotal(startTime, endTime, c.GetAdminUserInfo().CurrentOrgId, reference.SystemProjectId, reference.ID)
-
 		c.ServeSuccessJSON(map[string]interface{}{
 			"patient_count":  patientCount,
 			"normal_total":   normalTotal,
@@ -259,7 +420,6 @@ func (c *StatisticsApiController) GetAllInspectionStatistisc() {
 			"no_check_total": noCheckTotal,
 			"reference":      reference,
 		})
-
 	}
 
 }
@@ -332,7 +492,6 @@ func (c *StatisticsApiController) GetPersonInspectionStatistisc() {
 	}
 
 }
-
 func (c *StatisticsApiController) GetStatistics() {
 	adminUserInfo := c.GetAdminUserInfo()
 

service/export_data_service.go

@@ -0,0 +1,127 @@
+package service
+
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+)
+
+type ExportPatient struct {
+	ID          int64          `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId   int64          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name        string         `gorm:"column:name" json:"name" form:"name"`
+	Lapseto     int64          `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status      int64          `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo    string         `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	XtCount     int64          `gorm:"column:-" json:"xt_count" form:"xt_count"`
+	SettleOrder []*SettleOrder `gorm:"ForeignKey:PatientID;AssociationForeignKey:ID" json:"orders"`
+}
+
+func (ExportPatient) TableName() string {
+	return "xt_patients"
+}
+
+type SettleOrder 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"`
+	Status              int64            `gorm:"column:status" json:"status" form:"status"`
+	PatientId           int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrderStatus         int64            `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId             string           `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	Number              string           `gorm:"column:number" json:"number" form:"number"`
+	SetlId              string           `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	Insutype            string           `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SetlTime            string           `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	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"`
+	IsMedicineInsurance int64            `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	OrderInfo9919       []*OrderInfo9919 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
+}
+
+func (SettleOrder) TableName() string {
+	return "his_order"
+}
+
+type OrderInfo9919 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"`
+	SettleType       int64   `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+}
+
+func (OrderInfo9919) TableName() string {
+	return "his_order_info"
+}
+
+func GetHisOrderDetailFor310(start_time string, end_time string, org_id int64) (patients []*ExportPatient, err error) {
+	err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND FROM_UNIXTIME(orders.ctime) >= ? AND FROM_UNIXTIME(orders.ctime) <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.insutype = 310", start_time, end_time, org_id).Preload("SettleOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1  AND setl_time >= ? AND setl_time <= ? AND user_org_id = ? AND order_status = 2 and insutype = 310", start_time, end_time, org_id).Preload("OrderInfo9919", "status = 1").Order("ctime")
+	}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
+
+	for _, item := range patients {
+		var total int64
+		readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? AND status = 1 AND stage = 2 AND FROM_UNIXTIME(dialysis_date) <= ? AND  FROM_UNIXTIME(dialysis_date) >= ?", item.ID, end_time, start_time).Count(&total)
+		item.XtCount = total
+
+	}
+	return
+}
+
+func GetHisOrderDetailFor390(start_time string, end_time string, org_id int64) (patients []*ExportPatient, err error) {
+	err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND FROM_UNIXTIME(orders.ctime) >= ? AND FROM_UNIXTIME(orders.ctime) <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.insutype = 390", start_time, end_time, org_id).Preload("SettleOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1  AND setl_time >= ? AND setl_time <= ? AND user_org_id = ? AND order_status = 2 and insutype = 390", start_time, end_time, org_id).Preload("OrderInfo9919", "status = 1").Order("ctime")
+	}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
+	for _, item := range patients {
+		var total int64
+		readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? AND status = 1 AND stage = 2 AND FROM_UNIXTIME(dialysis_date) <= ? AND  FROM_UNIXTIME(dialysis_date) >= ?", item.ID, end_time, start_time).Count(&total)
+		item.XtCount = total
+
+	}
+	return
+}

service/his_charge_service.go

@@ -157,7 +157,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 		switch item_type {
 		case 0:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
-				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 and o.is_medicine_insurance = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
@@ -165,7 +165,7 @@ func GetNewAllPatientDrugChargeDetails(org_id int64, start_time_str string, end_
 			break
 		case 1:
 			err = readDb.Table("his_order_info as oi").Select("oi.advice_id as advice_id, 0 as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,drug.drug_name as item_name,drug.dose as dose,drug.dose_unit as dose_unit, drug.min_number as min_number,drug.min_unit as min_unit, drug.max_unit as max_unit,drug.id as item_id").
-				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 and o.is_medicine_insurance = 1", start_time_str, end_time_str).
 				Joins(" JOIN his_doctor_advice_info a ON oi.advice_id = a.id").
 				Joins(" JOIN xt_patients pp on oi.patient_id = pp.id").
 				Joins(" JOIN  xt_base_drug drug on  a.drug_id = drug.id").
@@ -233,7 +233,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 2:
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
-				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 ", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 2").
 				Joins("left join xt_his_project project on  p.project_id = project.id").
 				Joins("left join  xt_good_information good on  p.project_id = good.id").
@@ -243,7 +243,7 @@ func GetNewAllPatientProjectAndGoodChargeDetails(org_id int64, start_time_str st
 			break
 		case 3:
 			err = readDb.Table("his_order_info as oi").Select("0 as advice_id, oi.project_id as project_id, oi.patient_id as p_id,oi.cnt as cnt,oi.pric as pric,pp.name as p_name,p.type as p_type,  (case p.type  when 2 then project.project_name  when 3 then good.good_name  END) as item_name,(case p.type  when 2 then ''  when 3 then good.specification_name  END) as specification_name, p.project_id as item_id").
-				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1", start_time_str, end_time_str).
+				Joins("JOIN his_order o ON oi.order_number = o.number   and o.setl_time BETWEEN  ? AND ?  and o.order_status = 2 and o.status = 1 and o.is_medicine_insurance <> 1", start_time_str, end_time_str).
 				Joins(" JOIN his_prescription_project p ON oi.project_id = p.id and p.type = 3").
 				Joins("left join xt_his_project project on  p.project_id = project.id").
 				Joins("left join  xt_good_information good on  p.project_id = good.id").

service/his_config_service.go

@@ -882,3 +882,21 @@ func TranslateZu(sc, orgid int64, types string) (s string, err error) {
 	}
 	return dataconfig[0].Name, err
 }
+
+type TempOrder struct {
+	UserOrgId     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	OrderStatus   int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PsnName       string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	MdtrtCertType string `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+}
+
+func (TempOrder) TableName() string {
+	return "his_order"
+}
+
+func GetHisMdtrtCertType(start_time string, end_time string, org_id int64) (os []TempOrder, err error) {
+	err = readDb.Model(&TempOrder{}).Where("user_org_id = ? and setl_time >= ? and setl_time <= ? and order_status = 2 and status = 1", org_id, start_time, end_time).Find(&os).Error
+	return
+}