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

controllers/common_api_controller.go

 func (this *CommonApiController) GetFirstQuarter() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	lapseto, _ := this.GetInt64("lapseto")
+	origin, _ := this.GetInt64("origin")
+
 	fmt.Println("转归", lapseto)
 	startime := this.GetString("startime")
 
 	entime := endDate.Unix()
 	fmt.Println("结束日期", entime)
 	//统计数值类型的数据
-	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
+	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto, origin)
 	//统计rang_type== 2
-	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
+	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto, origin)
 
 	//获取收缩压数据
-	systolic, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
+	systolic, systolicTotal, parseDateErr := service.GetSystolicBloodPressureTwo(orgid, statime, entime, lapseto, origin)
 	//统计收缩压合格的数据
 	//systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
 
 	//获取舒张压数据
-	diastolic, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
+	diastolic, diastotal, parseDateErr := service.GetDiastolicBloodPressureTwo(orgid, statime, entime, lapseto, origin)
 	//获取合格舒张压数据
 	//diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
 	normData, _ := service.GetNormData(orgid)
 		"rollout": rollout,
 	})
 }
+
+func (this *CommonApiController) GetCheckExamine() {
+	//check_type, _ := this.GetInt64("check_type")
+	//start_time, _ := this.GetInt64("start_time")
+	//end_time, _ := this.GetInt64("end_time")
+	//total, _ := service.GetAllPatientCount(this.GetAdminUserInfo().CurrentOrgId)
+	//xcg_total := service.GetCheckExaminePercent(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId, 1)    //血常规
+	//xysh_total := service.GetCheckExaminePercent(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId, 2)   //血液生化
+	//ipth_total := service.GetCheckExaminePercent(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId, 3)   //全段甲状旁腺激素
+	//xqtdb_total := service.GetCheckExaminePercent(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId, 4)  //血清铁蛋白和转铁蛋白饱和度
+	//xqqbdb_total := service.GetCheckExaminePercent(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId, 5) //血清前白蛋白
+	//cfydb_total := service.GetCheckExaminePercent(start_time, end_time, this.GetAdminUserInfo().CurrentOrgId, 6)  //c反应蛋白
+	//
+}

controllers/common_api_router.go

 	beego.Router("/com/api/getreatmodelist", &CommonApiController{}, "Get:GetTreatModeList")
 	beego.Router("/com/api/getcountmodeid", &CommonApiController{}, "Get:GetCountModeId")
 	beego.Router("/com/api/getrolloutcount", &CommonApiController{}, "Get:GetRolloutCount")
+
+	beego.Router("/com/api/getrolloutcount", &CommonApiController{}, "Get:GetRolloutCount")
+
+	beego.Router("/com/api/getcheckexamine", &CommonApiController{}, "Get:GetCheckExamine")
+
 }

controllers/his_api_controller.go

 
 	beego.Router("/api/orders", &HisApiController{}, "get:GetAllOrder")
 
+	beego.Router("/api/psn/ncds/delete", &HisApiController{}, "post:DeleteNCDS")
+
+	beego.Router("/api/bailin/export", &PublicApiController{}, "get:GetBaiLinExportData")
 	beego.Router("/api/his/gethistdoctoradviceinfo", &HisApiController{}, "get:GetHisDoctorAdviceInfo")
 
 }
 
+func (c *PublicApiController) GetBaiLinExportData() {
+	data := service.GetBaiLinOrderData()
+	fmt.Println(len(data))
+	var new_data []*models.NewCustomHisOrder
+	for _, item := range data {
+		if item.NewCustomHisOrderInfo.NewCustomHisPrescriptionProject.ID != 0 {
+			new_data = append(new_data, item)
+		}
+
+	}
+	fmt.Println(len(new_data))
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": new_data,
+	})
+}
+
 func (c *HisApiController) GetHisUnChargePatientList() {
 	record_date := c.GetString("record_date")
 	timeLayout := "2006-01-02"
 								//查询药品的所有库存
 								list, _ := service.GetDrugWarehouseInfoPrescription(drug_id, adminInfo.CurrentOrgId)
 								var total_count int64
-
 								for _, it := range list {
 									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
 								}
 		redis.Set(keyOne, "", time.Second)
 		keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 		redis.Set(keySeven, "", time.Second)
-		redis.Close()
+		defer redis.Close()
 	} else {
 		hpInfo = models.HisPrescriptionInfo{
 
 		redis.Set(keyOne, "", time.Second)
 		keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 		redis.Set(keySeven, "", time.Second)
-		redis.Close()
+		defer redis.Close()
 	}
 
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 					redis.Set(keyOne, "", time.Second)
 					keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 					redis.Set(keySeven, "", time.Second)
-					redis.Close()
+					defer redis.Close()
 				} else {
 					tempPrescription.ID = id
 					tempPrescription.Type = types
 					redis.Set(keyOne, "", time.Second)
 					keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 					redis.Set(keySeven, "", time.Second)
-					redis.Close()
+					defer redis.Close()
 				}
 				//service.SaveHisPrescription(prescription)
 				//更改患者挂号状态
 						}
 					}
 				}
-				if items["addition"] != nil && reflect.TypeOf(items["addition"]).String() == "[]interface {}" {
-					addition := items["addition"].([]interface{})
-					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
-					ctime := time.Now().Unix()
-					mtime := ctime
-					if len(addition) > 0 {
-						for _, item := range addition {
-							var s models.HisAdditionalCharge
-							s.PrescriptionId = tempPrescription.ID
-							s.Status = 1
-							s.UserOrgId = adminInfo.CurrentOrgId
-							s.RecordDate = recordDateTime
-							s.CreatedTime = ctime
-							s.UpdatedTime = mtime
-							s.PatientId = patient_id
-							s.HisPatientId = his_patient_id
-							errcode := c.setAddtionWithJSON(&s, item.(map[string]interface{}), adminInfo.CurrentOrgId)
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
-							}
-							service.CreateAdditionalCharge(&s)
-							var randNum int
-							randNum = rand.Intn(10000) + 1000
-							timestamp := time.Now().Unix()
-							tempTime := time.Unix(timestamp, 0)
-							timeFormat := tempTime.Format("20060102150405")
-							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "3" + "-" + strconv.FormatInt(s.ID, 10)
-							service.CreateAdditionalCharge(&s)
-
-						}
-					}
-				}
+				//if items["addition"] != nil && reflect.TypeOf(items["addition"]).String() == "[]interface {}" {
+				//	addition := items["addition"].([]interface{})
+				//	//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+				//	ctime := time.Now().Unix()
+				//	mtime := ctime
+				//	if len(addition) > 0 {
+				//		for _, item := range addition {
+				//			var s models.HisAdditionalCharge
+				//			s.PrescriptionId = tempPrescription.ID
+				//			s.Status = 1
+				//			s.UserOrgId = adminInfo.CurrentOrgId
+				//			s.RecordDate = recordDateTime
+				//			s.CreatedTime = ctime
+				//			s.UpdatedTime = mtime
+				//			s.PatientId = patient_id
+				//			s.HisPatientId = his_patient_id
+				//			errcode := c.setAddtionWithJSON(&s, item.(map[string]interface{}), adminInfo.CurrentOrgId)
+				//			if errcode > 0 {
+				//				c.ServeFailJSONWithSGJErrorCode(errcode)
+				//				return
+				//			}
+				//			service.CreateAdditionalCharge(&s)
+				//			var randNum int
+				//			randNum = rand.Intn(10000) + 1000
+				//			timestamp := time.Now().Unix()
+				//			tempTime := time.Unix(timestamp, 0)
+				//			timeFormat := tempTime.Format("20060102150405")
+				//			s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "3" + "-" + strconv.FormatInt(s.ID, 10)
+				//			service.CreateAdditionalCharge(&s)
+				//
+				//		}
+				//	}
+				//}
 
 			}
 		}
 	}
 
 	orderInfos = append(orderInfos, orderInfos_two...)
+	if c.GetAdminUserInfo().CurrentOrgId != 10138 {
+		orderInfos = append(orderInfos, orderInfos_three...)
+
+	}
 
 	patient, _ := service.GetPatientByID(org_id, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{
 	return err
 }
 
+func (this *HisApiController) DeleteNCDS() {
+	id, _ := this.GetInt64("id", 0)
+	if id > 0 {
+		service.DeletePsnNCDSRecordById(id)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRecordFailedException)
+		return
+	}
+
+}
+
 func (c *HisApiController) GetHisDoctorAdviceInfo() {
 
 	id, _ := c.GetInt64("id")

controllers/his_hospital_api_controller.go

 	} else if order_status == 2 {
 		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFour(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
 	}
+
+	settle_prescriptions, _ := service.GetSettleHisHospitalPrescription(admin.CurrentOrgId, patient_id, his_patient_id, his_patient_info.RecordDate)
+
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 	order, _ := service.GetNewHisOrder(admin.CurrentOrgId, his_patient_info.Number, patient_id)
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"his_info":            his_patient_info,
-		"xt_info":             xt_patient_info,
-		"prescription":        prescriptions,
-		"case_history":        case_history,
-		"info":                patientPrescriptionInfo,
-		"month_prescriptions": monthPrescriptions,
-		"order":               order,
-		"doctors":             doctors,
-		"department":          department,
+		"his_info":             his_patient_info,
+		"xt_info":              xt_patient_info,
+		"prescription":         prescriptions,
+		"case_history":         case_history,
+		"info":                 patientPrescriptionInfo,
+		"month_prescriptions":  monthPrescriptions,
+		"order":                order,
+		"doctors":              doctors,
+		"department":           department,
+		"settle_prescriptions": settle_prescriptions,
 	})
 	return
 

controllers/his_project_api_controller.go

 	his, _ := service.GetLastHisPatient(patient_id, adminUserInfo.CurrentOrgId)
 	//prescriptionInfo, _ := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	hisPatient, _ := service.GetHisPatientById(patient_id)
+	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, adminUserInfo.CurrentOrgId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"advicePrint": advicePrint,
-		"projectlist": projectlist,
-		"hisPatient":  hisPatient,
-		"his":         his,
+		"advicePrint":       advicePrint,
+		"projectlist":       projectlist,
+		"hisPatient":        hisPatient,
+		"his":               his,
+		"hisHospitalRecord": hisHospitalRecord,
 	})
 }
 
 	patient_id, _ := this.GetInt64("patient_id")
 
 	hisPatient, err := service.GetHisPatientById(patient_id)
+	//service.GetLastHospitalRecordTwo(patient_id,this.GetAdminUserInfo().CurrentOrgId)
+	hisHospitalRecord, _ := service.GetLastHospitalRecordTwo(patient_id, this.GetAdminUserInfo().CurrentOrgId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"hisPatient": hisPatient,
+		"hisPatient":        hisPatient,
+		"hisHospitalRecord": hisHospitalRecord,
 	})
 }
 

controllers/new_mobile_api_controllers/new_common_api_controller.go

 	adminUser := this.GetMobileAdminUserInfo()
 	orgid := adminUser.Org.Id
 	lapseto, _ := this.GetInt64("lapseto")
+	origin, _ := this.GetInt64("origin")
+
 	fmt.Println("转归", lapseto)
 	startime := this.GetString("startime")
 
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
 	entime := endDate.Unix()
 
-	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
-	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
+	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto, origin)
+	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto, origin)
 	//获取收缩压数据
 	systolic, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
 	//统计收缩压合格的数据
 	//systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
-
 	//获取舒张压数据
 	diastolic, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
 	//获取合格舒张压数据

enums/error_code.go

 	ErrorCodeHospitalNoExistDataException = 30009
 
 	ErrorCodeHospitalExistDataException = 300010
+
+	ErrorCodeRecordFailedException = 300011
 )
 
 var ErrCodeMsgs = map[int]string{
 	ErrorCodeHospitalNoExistDataException: "请先办理出院才能进行结算",
 
 	ErrorCodeHospitalExistDataException: "该患者已经入院，请选办理出院结算后再进行办理入院操作",
+
+	ErrorCodeRecordFailedException: "记录不存在",
 }
 
 type SGJError struct {

models/his_charge_models.go

 func (HisFapiaoRecord) TableName() string {
 	return "his_fapiao_record"
 }
+
+type GdybPsnNcdsRecord 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"`
+	PsnNo         string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	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"`
+	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SickType      int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
+}
+
+func (GdybPsnNcdsRecord) TableName() string {
+	return "gdyb_psn_ncds_record"
+}

models/his_models.go

 	return "his_stock_price_config"
 }
 
+
 type SgjAdmin struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`
 	Account      string `gorm:"column:account" json:"account" form:"account"`
 	Email       string `gorm:"column:email" json:"email" form:"email"`
 	WechatLink  string `gorm:"column:wechat_link" json:"wechat_link" form:"wechat_link"`
 }
+
+type NewCustomHisOrder 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"`
+	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"`
+	PsnCertType           string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	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"`
+	IsMedicineInsurance   int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	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"`
+	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+
+	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"`
+
+	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"`
+	NewCustomHisOrderInfo NewCustomHisOrderInfo `gorm:"ForeignKey:Number;AssociationForeignKey:OrderNumber" json:"order_info"`
+	Patients              Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+}
+
+func (NewCustomHisOrder) TableName() string {
+	return "his_order"
+}
+
+type NewCustomHisOrderInfo 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"`
+	NewCustomHisPrescriptionProject NewCustomHisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	//HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+}
+
+func (NewCustomHisOrderInfo) TableName() string {
+	return "his_order_info"
+}
+
+type NewCustomHisPrescriptionProject struct {
+	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64    `gorm:"column:price" json:"price" form:"price"`
+	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"`
+	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string     `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string     `gorm:"column:day" json:"day" form:"day"`
+	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+
+	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit   string `gorm:"column:unit" json:"unit" form:"unit"`
+	Type   int64  `gorm:"column:type" json:"type" form:"type"`
+
+	Doctor         int64 `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime  int64 `gborm:"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"`
+	CheckTime      int64 `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState     int64 `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker        int64 `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime      int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId         int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
+
+	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
+
+	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"`
+	IsCheckTeam   int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo  HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+}
+
+func (NewCustomHisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}

service/common_service.go

 
 	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status = 1")
 
-	d := XTReadDB().Table("xt_patients as p")
-	fmt.Println(d)
 	if orgid > 0 {
 		db = db.Where("o.user_org_id = ?", orgid)
 	}
 		db = db.Where("o.dialysis_date<=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_dialysis_prescription as s on s.patient_id = o.patient_id AND s.record_date = o.dialysis_date AND s.mode_id > 0").Joins("left join  xt_patients as p on p.id = o.patient_id").Where("s.status = 1").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
+	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id AND s.record_date = o.dialysis_date AND s.mode_id > 0").Joins("join  xt_patients as p on p.id = o.patient_id").Where("s.status = 1").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
 	return order, total, err
 
 }
 	if endtime > 0 {
 		db = db.Where("o.dialysis_date<=?", endtime)
 	}
-	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,s.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_dialysis_prescription as s on s.patient_id = o.patient_id AND s.record_date = o.dialysis_date AND s.mode_id > 0").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.status = 1 ").Scan(&order).Error
+	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,s.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id AND s.record_date = o.dialysis_date AND s.mode_id > 0").Joins("join xt_patients as p on p.id = o.patient_id").Where("s.status = 1 ").Scan(&order).Error
 	return order, err
 }
 
 func GetDialysisPatientList(startime int64, endtime int64, page int64, limit int64, orgid int64) (order []*models.BloodDialysisOrder, total int64, err error) {
 
 	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status = 1")
-	if orgid > 0 {
-		db = db.Where("o.user_org_id = ?", orgid)
-	}
+	db = db.Where("o.user_org_id = ?", orgid)
 	if startime > 0 {
 		db = db.Where("o.dialysis_date>=?", startime)
 	}
 		db = db.Where("o.dialysis_date<=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("s.patient_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_dialysis_prescription as s on s.patient_id = o.patient_id AND s.record_date = o.dialysis_date AND s.mode_id > 0").Joins("left join  xt_patients as p on p.id = o.patient_id").Where("s.status =1 ").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
+	err = db.Group("s.patient_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id AND s.record_date = o.dialysis_date AND s.mode_id > 0 AND s.status =1").Joins("join  xt_patients as p on p.id = o.patient_id").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
 	return order, total, err
 }
 
 	if endtime > 0 {
 		db = db.Where("o.dialysis_date<=?", endtime)
 	}
-	if lapseto == 0 {
-		db = db.Where("p.lapseto = 1 or p.lapseto = 2")
-	}
+	//if lapseto == 0 {
+	//	db = db.Where("p.lapseto = 1 or p.lapseto = 2")
+	//}
 	if lapseto > 0 {
 		db = db.Where("p.lapseto = ?", lapseto)
 	}
 	sql := "s.mode_id,from_unixtime(o.dialysis_date, '%Y%m%d') as date, count(o.dialysis_date) as number"
 	datesql := " o.dialysis_date as date"
 	group := "from_unixtime(o.dialysis_date, '%Y%m%d')"
-	db = db.Table(" xt_dialysis_order AS o").Joins("join xt_dialysis_prescription as s on o.patient_id = s.patient_id AND s.mode_id > 0").Where("s.record_date = o.dialysis_date and s.status =1")
+	db = db.Table(" xt_dialysis_order AS o").Joins("join xt_dialysis_prescription as s on o.patient_id = s.patient_id AND o.dialysis_date = s.record_date AND s.mode_id > 0")
 	if orgID > 0 {
 		db = db.Where("o.user_org_id = ?", orgID)
 	}
 	}
 	db = db.Where("o.status=1")
 
-	err = db.Select("s.mode_id, count(s.mode_id) as number").Group("s.mode_id").Order("s.mode_id asc").Find(&ttd).Error
+	err = db.Select("s.mode_id, count(s.mode_id) as number").Order("s.mode_id asc").Find(&ttd).Error
 	if err != nil {
 		return
 	}
 func GetPatientDetailCheck(id int64, orgid int64, startime int64, endtime int64) (projectCounts []*models.PatientInspectionProjectCount, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_inspection_reference as r")
-	fmt.Println(table)
-	d := XTReadDB().Table("xt_check_configuration as t").Where("t.status = 1")
-	pa := XTReadDB().Table("xt_patients as s")
-	fmt.Println(pa)
-	fmt.Println(d)
 	if id > 0 {
 		db = db.Where("s.id  = ?", id)
 	}
 	return inspection, err
 }
 
-func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto int64) (inspection []*models.VmPatientInspectionTwo, err error) {
+func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (inspection []*models.VmPatientInspectionTwo, err error) {
 	fmt.Println(lapseto)
+	fmt.Println(origin)
 	db := XTReadDB().Table("xt_inspection as x ").Where("x.status = 1")
-	table := XTReadDB().Table("xt_inspection_reference as r")
-	fmt.Println(table)
-	//d := XTReadDB().Table("xt_patients as s")
-	//fmt.Println(d)
-	q := XTReadDB().Table("x.xt_quality_control_standard as q")
-	fmt.Println(q)
 	if orgid > 0 {
 		db = db.Where("x.org_id = ? and x.inspect_value+0 <> 0 and r.range_type = 1 and q.user_org_id = ? and q.is_status = 1", orgid, orgid)
 	}
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	//if lapseto == 0 {
-	//	db = db.Where("s.lapseto = 1 or s.lapseto = 2")
-	//}
-	//if lapseto > 0 {
-	//	db = db.Where("s.lapseto = ?", lapseto)
-	//}
+	if lapseto > 0 {
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
+	}
+	if origin > 0 {
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
+	}
 	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=q.min_range+0 and x.inspect_value +0 <= q.large_range+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
 
-func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto int64) (inspection []*models.VmPatientInspectionTwo, err error) {
-	fmt.Println(lapseto)
+func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (inspection []*models.VmPatientInspectionTwo, err error) {
 	db := XTReadDB().Table("xt_inspection as x ").Where("x.status = 1")
-	table := XTReadDB().Table("xt_inspection_reference as r")
-	fmt.Println(table)
-	//d := XTReadDB().Table("xt_patients as s")
-	//fmt.Println(d)
 	q := XTReadDB().Table("x.xt_quality_control_standard as q")
 	fmt.Println(q)
 	if orgid > 0 {
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	//if lapseto == 0 {
-	//	db = db.Where("s.lapseto = 1 or s.lapseto = 2")
-	//}
-	//if lapseto > 0 {
-	//	db = db.Where("s.lapseto = ?", lapseto)
-	//}
+
+	if lapseto > 0 {
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.lapseto = ?", lapseto)
+	}
+	if origin > 0 {
+		db = db.Joins("inner join xt_patients as p On p.id = x.patient_id AND p.source = ?", origin)
+	}
 	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when q.range_value = x.inspect_value and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
 	return record, total, err
 }
 
-func GetStandSystolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
+func GetSystolicBloodPressureTwo(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (record []*models.VmMonitoringRecord, total int64, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x")
+	if lapseto > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
+	}
+	if origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
+	}
+	err = db.Select("x.id,x.systolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	return record, total, err
+}
+
+func GetStandSystolicBloodPressure(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (record []*models.XTMonitoringRecord, total int64, err error) {
 
 	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
 	err = db.Select("x.id,s.sort").Joins("left join xt_quality_control_standard as s on s.user_org_id = x.user_org_id").Where("s.status = 1 and s.is_status = 0 and s.user_org_id = ? and x.user_org_id =? and x.monitoring_date>=? and x.monitoring_date <=? and s.inspection_minor = -1 and s.inspection_major = 0 and x.systolic_blood_pressure <> 0 and x.systolic_blood_pressure +0 >= s.min_range +0 and x.systolic_blood_pressure +0 <= s.large_range +0", orgid, orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	return record, total, err
 }
 
+func GetDiastolicBloodPressureTwo(orgid int64, startime int64, endtime int64, lapseto int64, origin int64) (record []*models.VmMonitoringRecord, total int64, err error) {
+	db := XTReadDB().Table("xt_monitoring_record as x")
+	if lapseto > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.lapseto = ?", lapseto)
+	}
+	if origin > 0 {
+		db = db.Joins("inner join xt_patients as p on p.id = x.patient_id AND p.source = ?", origin)
+	}
+	err = db.Select("x.id,x.diastolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.diastolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	return record, total, err
+}
+
 func GetDiastolicStandPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
 	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
 	err = db.Select("x.id,s.sort").Joins("left join xt_quality_control_standard as s on s.user_org_id = x.user_org_id").Where("s.status = 1 and s.is_status = 0 and s.user_org_id = ? and x.user_org_id =? and x.monitoring_date>=? and x.monitoring_date <=? and s.inspection_minor = -2 and s.inspection_major = 0 and x.diastolic_blood_pressure <> 0 and x.diastolic_blood_pressure +0 >= s.min_range +0 and x.diastolic_blood_pressure +0 <= s.large_range +0", orgid, orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	}
 	return lapseto, err
 }
+
+func GetCheckExaminePercent(start_time int64, end_time int64, org_id int64, name_type int64) (total int64) {
+
+	switch name_type {
+	case 1:
+		key := "%" + "血常规" + "%"
+		readDb.Model(&models.Inspection{}).Where("inspect_date >= ? AND inspect_date <= ? AND user_org_id = ? AND status = 1 AND (item_name Like ? Or project_name Like ?)", start_time, end_time, org_id, key).Group("patient_id").Count(&total)
+
+		break
+	case 2:
+		//key := "%" + "肝功能" + "%"
+		//key1 := "%" + "肾功能" + "%"
+		//key2 := "%" + "电解质" + "%"
+		//key3 := "%" + "血脂" + "%"
+		//readDb.Model(&models.Inspection{}).Where("inspect_date >= ? AND inspect_date <= ? AND user_org_id = ? AND status = 1 AND ((item_name Like ? Or project_name Like ?) Or (item_name Like ? Or project_name Like ?) Or (item_name Like ? Or project_name Like ?) Or (item_name Like ? Or project_name Like ?))", start_time, end_time, org_id, key, key, key1, key1, key2, key2, key3, key3).Group("patient_id").Count(&total)
+
+		break
+	case 3:
+		//key := "%" + "肝功能" + "%"
+		//readDb.Model(&models.Inspection{}).Where("inspect_date >= ? AND inspect_date <= ? AND user_org_id = ? AND status = 1 AND ((item_name Like ? Or project_name Like ?) Or (item_name Like ? Or project_name Like ?) Or (item_name Like ? Or project_name Like ?) Or (item_name Like ? Or project_name Like ?))", start_time, end_time, org_id, key, key, key1, key1, key2, key2, key3, key3).Group("patient_id").Count(&total)
+
+		break
+	case 4:
+		break
+	case 5:
+		break
+	case 6:
+		break
+
+	}
+
+	return
+}
+
+func GetAllPatientCount(orgid int64) (total int64, err error) {
+	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Count(&total).Error
+	return
+}

service/his_hospital_service.go

 	return
 }
 
+func GetLastHospitalRecordTwo(patient_id int64, user_org_id int64) (record models.HisHospitalCheckRecord, err error) {
+	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("patient_id = ? AND status = 1 AND user_org_id = ? AND in_hospital_status = 1 AND out_hospital_status = 0", patient_id, user_org_id).Last(&record).Error
+	return
+}
+
 func FindDiagnoseByIds(ids []string) ([]*models.HisXtDiagnoseConfig, error) {
 	dealer := []*models.HisXtDiagnoseConfig{}
 	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id IN (?) AND status = 1", ids).Find(&dealer).Error
 		Find(&prescription).Error
 	return
 }
+
+func GetSettleHisHospitalPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND patient_id = ? AND order_status = 4 ", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}

service/his_service.go

 		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", org_id)
 	}).
-		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND  order_status <> 2 AND order_status <> 3  AND p_type = ?", org_id, start_date, end_date, patient_id, p_type).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND  order_status <> 2 AND order_status <> 3 AND order_status <> 4 AND p_type = ?", org_id, start_date, end_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 }
 
 func FindPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date int64, p_type int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ?  ", org_id, record_date, patient_id).First(&info).Error
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).First(&info).Error
 	return
 
 }
 }
 
 func GetHisPrescriptionTeamProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id > 0", user_org_id, patient_id, record_time).Find(&projects).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1 AND user_org_id = ?", user_org_id).Preload("HisProject", "status = 1 AND user_org_id = ?", user_org_id).Preload("GoodInfo", "status = 1 AND org_id = ?", user_org_id).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id > 0", user_org_id, patient_id, record_time).Find(&projects).Error
 	return
 }
 
 	return err
 }
 
+func DeletePsnNCDSRecordById(id int64) (err error) {
+	err = writeDb.Model(&models.GdybPsnNcdsRecord{}).Where("id = ?", id).Updates(map[string]interface{}{"user_org_id": 1110000}).Error
+	return
+}
+
+func GetBaiLinOrderData() (order []*models.NewCustomHisOrder) {
+	readDb.Model(&models.NewCustomHisOrder{}).Preload("Patients", "status = 1").Preload("NewCustomHisOrderInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND project_id > 0").Preload("NewCustomHisPrescriptionProject", "(status = 1 and project_id = 1027 AND type = 2) OR (status = 1 AND project_id = 2036 AND type = 3)")
+	}).Where("user_org_id = 10138 AND settle_accounts_date >= 1638288000 AND settle_accounts_date <= 1640880000 AND order_status = 2 AND status = 1 AND (medfee_sumamt = 50 OR medfee_sumamt = 40)").Find(&order)
+	return
+}
+
+
 func GetHisDoctorAdviceInfo(id int64) (models.HisDoctorAdviceInfo, error) {
 
 	info := models.HisDoctorAdviceInfo{}