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

controllers/his_api_controller.go

@@ -1080,8 +1080,8 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 	var operationSelfTotal float64 = 0         //床位部分项目自费
 	var operationInscpTotal float64 = 0        //床位部分项目自费
 
-	var otherCostTotal float64 = 0 //其他费用
-	//var otherCostSelfTotal float64 = 0     //其他费用
+	var otherCostTotal float64 = 0         //其他费用
+	var otherCostSelfTotal float64 = 0     //其他费用
 	var otherCostPartSelfTotal float64 = 0 //其他费用
 	//var otherSelfTotal float64 = 0         //床位部分项目自费
 	//var otherInscpTotal float64 = 0        //床位部分项目自费
@@ -1122,6 +1122,18 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 	var treatSelfTotal float64 = 0         //床位部分项目自费
 	var treatInscpTotal float64 = 0        //床位部分项目自费
 
+	var huliCostTotal float64 = 0         //治疗费用
+	var huliCostSelfTotal float64 = 0     //治疗费用
+	var huliCostPartSelfTotal float64 = 0 //治疗费用
+	var huliSelfTotal float64 = 0         //床位部分项目自费
+	var huliInscpTotal float64 = 0        //床位部分项目自费
+
+	var zcCostTotal float64 = 0         //治疗费用
+	var zcCostSelfTotal float64 = 0     //治疗费用
+	var zcCostPartSelfTotal float64 = 0 //治疗费用
+	var zcSelfTotal float64 = 0         //床位部分项目自费
+	var zcInscpTotal float64 = 0        //床位部分项目自费
+
 	var zhenChaCostTotal float64 = 0 //其他费用
 	//var zhenChaCostPartSelfTotal float64 = 0 //其他费用
 
@@ -1347,8 +1359,26 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 
 		if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
 			otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
-			//otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
-			//otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "02" { //其他费
+			zcCostTotal, _ = decimal.NewFromFloat(zcCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			zcCostSelfTotal, _ = decimal.NewFromFloat(zcCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			zcCostPartSelfTotal, _ = decimal.NewFromFloat(zcCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			zcSelfTotal, _ = decimal.NewFromFloat(zcSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			zcInscpTotal, _ = decimal.NewFromFloat(zcInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
+		}
+
+		if item.MedChrgitmType == "07" { //其他费
+			huliCostTotal, _ = decimal.NewFromFloat(huliCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			huliCostSelfTotal, _ = decimal.NewFromFloat(huliCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			huliCostPartSelfTotal, _ = decimal.NewFromFloat(huliCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			huliSelfTotal, _ = decimal.NewFromFloat(huliSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			huliInscpTotal, _ = decimal.NewFromFloat(huliInscpTotal).Add(decimal.NewFromFloat(item.InscpScpAmt)).Float64()
+
 		}
 	}
 
@@ -1391,8 +1421,8 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 		"operationInscpTotal":        operationInscpTotal,
 		"operationSelfTotal":         operationSelfTotal,
 
-		"otherCostTotal": otherCostTotal,
-		//"otherCostSelfTotal":        otherCostSelfTotal,
+		"otherCostTotal":            otherCostTotal,
+		"otherCostSelfTotal":        otherCostSelfTotal,
 		"otherCostPartSelfTotal":    otherCostPartSelfTotal,
 		"materialCostTotal":         materialCostTotal,
 		"materialCostSelfTotal":     materialCostSelfTotal,
@@ -1446,6 +1476,18 @@ func (c *HisApiController) GetPrivateExpensesOrder() {
 		"his":           his,
 		"funds":         rf,
 		"dia_config":    dia_config,
+
+		"huliCostTotal":         huliCostTotal,
+		"huliCostSelfTotal":     huliCostSelfTotal,
+		"huliCostPartSelfTotal": huliCostPartSelfTotal,
+		"huliSelfTotal":         huliSelfTotal,
+		"huliInscpTotal":        huliInscpTotal,
+
+		"zcCostTotal":         zcCostTotal,
+		"zcCostSelfTotal":     zcCostSelfTotal,
+		"zcCostPartSelfTotal": zcCostPartSelfTotal,
+		"zcSelfTotal":         zcSelfTotal,
+		"zcInscpTotal":        zcInscpTotal,
 	})
 
 }
@@ -1657,7 +1699,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 	sch, _ := service.GetPatientSch(patient_id, recordDateTime, admin.CurrentOrgId)
 	if sch.ID > 0 {
 		var week string
-		t := time.Now()
+		t := theTime
 		switch t.Weekday().String() {
 		case "Monday":
 			week = "周一"
@@ -1713,12 +1755,12 @@ func (c *HisApiController) GetHisPatientInfo() {
 					}
 
 					if subItem.FrequencyType == 2 { //按照天数频率
-						p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+						p, _ := time.Parse("2006-01-02", theTime.Format("2006-01-02"))
 						now := p.Unix()
 						dayStr := strconv.FormatInt(subItem.DayCount, 10)
 						dayStr2 := "-" + dayStr
 						count, _ := strconv.ParseInt(dayStr2, 10, 64)
-						oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+						oldTime := theTime.AddDate(0, 0, int(count)).Unix()
 						advices, _ := service.FindAllHisDoctorAdviceByTime(now, oldTime, patient_id, c.GetAdminUserInfo().CurrentOrgId, subItem.DrugId)
 						if len(advices) == 0 {
 							cus.HisPrescriptionAdviceTemplate = append(cus.HisPrescriptionAdviceTemplate, subItem)
@@ -1740,12 +1782,12 @@ func (c *HisApiController) GetHisPatientInfo() {
 						}
 
 						if subItem.FrequencyType == 2 {
-							p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+							p, _ := time.Parse("2006-01-02", theTime.Format("2006-01-02"))
 							now := p.Unix()
 							dayStr := strconv.FormatInt(subItem.DayCount, 10)
 							dayStr2 := "-" + dayStr
 							count, _ := strconv.ParseInt(dayStr2, 10, 64)
-							oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+							oldTime := theTime.AddDate(0, 0, int(count)).Unix()
 							projects, _ := service.FindAllHisProjectByTime(now, oldTime, patient_id, c.GetAdminUserInfo().CurrentOrgId, subItem.ProjectId)
 							if len(projects) == 0 {
 								cus.HisPrescriptionProjectTemplate = append(cus.HisPrescriptionProjectTemplate, subItem)
@@ -1765,12 +1807,12 @@ func (c *HisApiController) GetHisPatientInfo() {
 						}
 
 						if subItem.FrequencyType == 2 {
-							p, _ := time.Parse("2006-01-02", time.Now().Format("2006-01-02"))
+							p, _ := time.Parse("2006-01-02", theTime.Format("2006-01-02"))
 							now := p.Unix()
 							dayStr := strconv.FormatInt(subItem.DayCount, 10)
 							dayStr2 := "-" + dayStr
 							count, _ := strconv.ParseInt(dayStr2, 10, 64)
-							oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+							oldTime := theTime.AddDate(0, 0, int(count)).Unix()
 							projects, _ := service.FindAllHisProjectByTime(now, oldTime, patient_id, c.GetAdminUserInfo().CurrentOrgId, subItem.ProjectId)
 							if len(projects) == 0 {
 								cus.HisPrescriptionProjectTemplate = append(cus.HisPrescriptionProjectTemplate, subItem)
@@ -3572,6 +3614,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					ctime := time.Now().Unix()
 
 					if tempPrescription.ID == 0 {
+
 						prescription := &models.HisPrescription{
 							ID:                 0,
 							PatientId:          patient_id,
@@ -10214,6 +10257,7 @@ func (c *HisApiController) GetHisOrderList() {
 	sch_type, _ := c.GetInt64("sch_type", 0)
 	zone_type, _ := c.GetInt64("zone_type", 0)
 	med_type, _ := c.GetInt64("med_type", 0)
+	fee_type, _ := c.GetInt64("fee_type", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -10240,7 +10284,7 @@ func (c *HisApiController) GetHisOrderList() {
 
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type, med_type)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type, med_type, fee_type)
 
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)

service/his_service.go

@@ -1166,7 +1166,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return err
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64, med_type int64) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64, med_type int64, fee_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -1176,7 +1176,7 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
-		db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id  AND patient.name like ? AND patient.user_org_id = ?", keywords, user_org_id)
+		db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id   AND patient.user_org_id = ?  AND (patient.name like ? or his_order.mdtrt_id like ?)", user_org_id, keywords, keywords)
 
 	}
 	if sch_type > 0 && zone_type > 0 {
@@ -1193,6 +1193,17 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 		db = db.Where("his_order.med_type = ?", med_type)
 	}
 
+	if fee_type > 0 {
+		if fee_type == 2 {
+			db = db.Where("his_order.is_medicine_insurance <> 1")
+
+		}
+		if fee_type == 1 {
+			db = db.Where("his_order.is_medicine_insurance = 1")
+
+		}
+	}
+
 	//if zone_type > 0 {
 	//	db = db.Joins("join xt_schedule sch_two on sch_two.schedule_date = his_order.settle_accounts_date AND sch_two.patient_id = his_order.patient_id AND sch_two.partition_id = ?", zone_type)
 	//}
@@ -1883,6 +1894,7 @@ type VMHisProjectTeam struct {
 	ProjectId         string               `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	VMItemProjectList []*VMItemProjectList `gorm:"-" json:"list" form:"list"`
 	ItemId            string               `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	DrugItemId        string               `gorm:"column:drug_item_id" json:"drug_item_id" form:"drug_item_id"`
 }
 
 func (VMHisProjectTeam) TableName() string {
@@ -3657,3 +3669,25 @@ func GetFaPiaoHisOrderByID(order_id int64) (order models.HisFaPiaoOrder, err err
 	err = readDb.Model(&models.HisFaPiaoOrder{}).Where("order_ids like ? and status = 1", key).First(&order).Error
 	return
 }
+
+func GetDrugInfomationList(orgid int64, keyword string) (drug []*models.BaseDrugLib, err error) {
+	key := "%" + keyword + "%"
+	if len(keyword) == 0 {
+		err = XTReadDB().Where("org_id = ? and status = 1 AND  find_in_set('停用',drug_status) = 0", orgid).Find(&drug).Error
+
+	} else {
+		err = XTReadDB().Where("org_id = ? and status = 1 AND drug_name like ? AND  find_in_set('停用',drug_status) = 0", orgid, key).Find(&drug).Error
+
+	}
+	return drug, err
+}
+
+func CreateDoctorAdviceTeamList(list *models.HisDoctorAdviceTeamInfo) error {
+	err := XTWriteDB().Model(&list).Save(&list).Error
+	return err
+}
+
+func GetDrugHisListByIds(ids []string) (hisProjectList []*models.HisDoctorAdviceTeamInfo, error error) {
+	error = XTReadDB().Model(&hisProjectList).Preload("BaseDrugLib").Where(" status = 1 and id in (?)", ids).Find(&hisProjectList).Error
+	return hisProjectList, error
+}