医保对接

controllers/his_api_controller.go

@@ -5194,6 +5194,10 @@ func (c *HisApiController) GetFaPiaoData() {
 	var treatCostSelfTotal float64 = 0     //治疗费用
 	var treatCostPartSelfTotal float64 = 0 //治疗费用
 
+	var zhenChaCostTotal float64 = 0         //其他费用
+	var zhenChaCostSelfTotal float64 = 0     //其他费用
+	var zhenChaCostPartSelfTotal float64 = 0 //其他费用
+
 	decimal.DivisionPrecision = 2
 	orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
 
@@ -5306,6 +5310,12 @@ func (c *HisApiController) GetFaPiaoData() {
 				bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
+			if item.MedChrgitmType == "02" { //诊察费
+				zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				zhenChaCostSelfTotal, _ = decimal.NewFromFloat(zhenChaCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				zhenChaCostPartSelfTotal, _ = decimal.NewFromFloat(zhenChaCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+			}
+
 			if item.MedChrgitmType == "03" { //检查费
 				checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 				checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
@@ -5348,7 +5358,7 @@ func (c *HisApiController) GetFaPiaoData() {
 				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 			}
 
-			if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+			if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
 				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()
@@ -5402,6 +5412,9 @@ func (c *HisApiController) GetFaPiaoData() {
 		"treatCostTotal":              treatCostTotal,
 		"treatCostSelfTotal":          treatCostSelfTotal,
 		"treatCostPartSelfTotal":      treatCostPartSelfTotal,
+		"zhenChaCostTotal":            zhenChaCostTotal,
+		"zhenChaCostSelfTotal":        zhenChaCostSelfTotal,
+		"zhenChaCostPartSelfTotal":    zhenChaCostPartSelfTotal,
 		"his_hospital_record":         his_hospital_record,
 	})
 

controllers/his_hospital_api_controller.go

@@ -284,9 +284,24 @@ func (c *HisHospitalApiController) GetHisHospitalPatientList() {
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
 	//var patients []*service.HospitalPatient
+	var all_tempPatients []*service.HospitalPatient
 	tempPatients, _ := service.GetHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
 	tempPatients_two, _ := service.GetHisHospitalSchPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
 
+	if types == 0 {
+		all_tempPatients, _ = service.GetAllHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime, sch_type)
+		for _, item := range all_tempPatients {
+			for index, subItem := range tempPatients_two {
+				if item.ID == subItem.ID {
+					tempPatients_two = append(tempPatients_two[:index], tempPatients_two[index+1:]...)
+
+				}
+			}
+		}
+		all_tempPatients = append(all_tempPatients, tempPatients_two...)
+
+	}
+
 	//当天有登记住院的和排班同时存在的话，删除掉排班的记录
 	for _, item := range tempPatients {
 		for index, subItem := range tempPatients_two {
@@ -317,7 +332,7 @@ func (c *HisHospitalApiController) GetHisHospitalPatientList() {
 
 	if types == 0 {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"list":       tempPatients,
+			"list":       all_tempPatients,
 			"total_one":  total_one,
 			"total_two":  total_two,
 			"info":       adminUserInfo,

service/his_hospital_service.go

@@ -71,6 +71,17 @@ func (HisHospitalOrder) TableName() string {
 	return "his_order"
 }
 
+func GetAllHisHospitalPatientList(org_id int64, record_date int64, sch_type int64) (patients []*HospitalPatient, err error) {
+	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ? AND record.in_hospital_status = 1", org_id)
+	//db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.status = 1 AND sch.user_org_id = ? AND sch.schedule_date = ? AND sch.schedule_type = ? ", org_id, record_date, sch_type)
+	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? AND status = 1  AND in_hospital_status = 1 AND out_hospital_status = 0", org_id).Order("id desc")
+	})
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1  AND p_type = 1", org_id, record_date).Group("id").Find(&patients).Error
+	return
+}
+
 func GetHisHospitalPatientList(org_id int64, record_date int64, sch_type int64) (patients []*HospitalPatient, err error) {
 	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Joins("join his_hospital_check_record as record ON record.patient_id = xt_patients.id AND record.status = 1 AND record.user_org_id = ? AND record.in_hospital_status = 1 AND record.record_date = ? ", org_id, record_date)