医保对接

controllers/base_api_controller.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
+
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -67,36 +69,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 3877
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()ba
 
 	}
 
@@ -313,35 +315,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 3877
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/dialysis_api_controller.go

@@ -259,6 +259,16 @@ func (c *DialysisApiController) PostPrescription() {
 	oxygen_uptake, _ := c.GetInt64("oxygen_uptake")
 	oxygen_flow := c.GetString("oxygen_flow")
 	oxygen_time := c.GetString("oxygen_time")
+
+	hemodialysis_pipelines := c.GetString("hemodialysis_pipelines")
+	hemodialysis_pipelines_count, _ := c.GetFloat("hemodialysis_pipelines_count", 0)
+
+	puncture_needle := c.GetString("puncture_needle")
+	puncture_needle_count, _ := c.GetFloat("puncture_needle_count", 0)
+
+	epo := c.GetString("epo")
+	epo_count, _ := c.GetFloat("epo_count", 0)
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -352,6 +362,12 @@ func (c *DialysisApiController) PostPrescription() {
 		OxygenFlow:                 oxygen_flow,
 		OxygenUptake:               oxygen_uptake,
 		OxygenTime:                 oxygen_time,
+		HemodialysisPipelines:      hemodialysis_pipelines,
+		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
+		PunctureNeedle:             puncture_needle,
+		PunctureNeedleCount:        puncture_needle_count,
+		Epo:                        epo,
+		EpoCount:                   epo_count,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -597,6 +613,16 @@ func (c *DialysisApiController) PostSoulution() {
 	oxygen_uptake, _ := c.GetInt64("oxygen_uptake")
 	oxygen_flow := c.GetString("oxygen_flow")
 	oxygen_time := c.GetString("oxygen_time")
+
+	hemodialysis_pipelines := c.GetString("hemodialysis_pipelines")
+	hemodialysis_pipelines_count, _ := c.GetFloat("hemodialysis_pipelines_count", 0)
+
+	puncture_needle := c.GetString("puncture_needle")
+	puncture_needle_count, _ := c.GetFloat("puncture_needle_count", 0)
+
+	epo := c.GetString("epo")
+	epo_count, _ := c.GetFloat("epo_count", 0)
+
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -684,23 +710,29 @@ func (c *DialysisApiController) PostSoulution() {
 		Package:                    safe_package,
 		ALiquid:                    a_liquid,
 
-		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		Blood:                     blood,
-		DialysisIrrigation:        dialysis_irrigation,
-		DialysisDialyszers:        dialysis_dialyszers,
-		AntioxidantCommodityName:  antioxidant_commodity_name,
-		DisplaceSpeed:             displace_speed,
-		Illness:                   illness,
-		Amylaceum:                 amylaceum,
-		SingleTime:                single_time,
-		SingleWater:               single_water,
-		ReplacementFlow:           replacement_flow,
-		PlasmaSeparator:           plasma_separator,
-		BilirubinAdsorptionColumn: bilirubin_adsorption_column,
-		OxygenTime:                oxygen_time,
-		OxygenUptake:              oxygen_uptake,
-		OxygenFlow:                oxygen_flow,
+		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
+		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
+		Blood:                      blood,
+		DialysisIrrigation:         dialysis_irrigation,
+		DialysisDialyszers:         dialysis_dialyszers,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
+		DisplaceSpeed:              displace_speed,
+		Illness:                    illness,
+		Amylaceum:                  amylaceum,
+		SingleTime:                 single_time,
+		SingleWater:                single_water,
+		ReplacementFlow:            replacement_flow,
+		PlasmaSeparator:            plasma_separator,
+		BilirubinAdsorptionColumn:  bilirubin_adsorption_column,
+		OxygenTime:                 oxygen_time,
+		OxygenUptake:               oxygen_uptake,
+		OxygenFlow:                 oxygen_flow,
+		HemodialysisPipelines:      hemodialysis_pipelines,
+		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
+		PunctureNeedle:             puncture_needle,
+		PunctureNeedleCount:        puncture_needle_count,
+		Epo:                        epo,
+		EpoCount:                   epo_count,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -859,6 +891,12 @@ func (c *DialysisApiController) PostSoulution() {
 		TargetKtv:                  target_ktv,
 		DialysisIrrigation:         dialysis_irrigation,
 		DialysisDialyszers:         dialysis_dialyszers,
+		HemodialysisPipelines:      hemodialysis_pipelines,
+		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
+		PunctureNeedle:             puncture_needle,
+		PunctureNeedleCount:        puncture_needle_count,
+		Epo:                        epo,
+		EpoCount:                   epo_count,
 	}
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 	if err == nil {

controllers/his_api_controller.go

@@ -96,6 +96,162 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "post:RefudDetail")
 
+	beego.Router("/api/privateexpensesorder/get", &HisApiController{}, "get:GetPrivateExpensesOrder")
+
+	beego.Router("/api/uncharge/list", &HisApiController{}, "get:GetHisUnChargePatientList")
+
+}
+
+func (c *HisApiController) GetHisUnChargePatientList() {
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	adminInfo := c.GetAdminUserInfo()
+	var tempPatients []*service.NewTempPatients
+	//tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	var patients []*service.NewTempPatients
+	var patients_two []*service.NewTempPatients
+
+	for _, item := range tempPatients {
+		//过滤掉没挂号的和没开处方的
+		if len(item.HisPatient) > 0 || len(item.HisPrescription) > 0 {
+			patients = append(patients, item)
+		}
+
+		//过滤掉没挂号的
+		if len(item.HisPatient) > 0 {
+			patients_two = append(patients_two, item)
+		}
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":     patients,
+		"list_two": patients_two,
+	})
+}
+
+func (c *HisApiController) GetPrivateExpensesOrder() {
+	//id, _ := c.GetInt64("id")
+	//record_time := c.GetString("record_time")
+	order_id, _ := c.GetInt64("order_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
+	//
+	//theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	//if err != nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//recordDateTime := theTime.Unix()
+	adminUser := c.GetAdminUserInfo()
+	order, _ := service.GetHisOrderByID(order_id)
+	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, order.MdtrtId)
+
+	orderInfos, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
+
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+
+	//var config []*models.HisXtDiagnoseConfig
+	var name string
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		if len(name) == 0 {
+			name = diagnosisConfig.ClassName
+
+		} else {
+			name = name + "," + diagnosisConfig.ClassName
+		}
+	}
+
+	decimal.DivisionPrecision = 2
+
+	for _, item := range orderInfos {
+		item.FulamtOwnpayAmt = item.DetItemFeeSumamt
+		if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
+			item.MedChrgitmType = "09"
+
+		}
+		if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
+			if item.HisPrescriptionProject.Type == 2 {
+				switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+
+				case 1:
+					item.MedChrgitmType = "14"
+					break
+				case 2:
+					item.MedChrgitmType = "05"
+
+					break
+				case 3:
+					item.MedChrgitmType = "04"
+
+					break
+				case 4:
+					item.MedChrgitmType = "14"
+
+					break
+				case 5:
+					item.MedChrgitmType = "08"
+
+					break
+				case 6:
+					item.MedChrgitmType = "14"
+
+					break
+				case 7:
+					item.MedChrgitmType = "14"
+
+					break
+				case 8:
+					item.MedChrgitmType = "03"
+					break
+				case 9:
+					item.MedChrgitmType = "14"
+					break
+
+				}
+
+			} else if item.HisPrescriptionProject.Type == 3 {
+				item.MedChrgitmType = "08"
+			}
+		}
+	}
+	order.PsnCashPay = order.MedfeeSumamt
+
+	//var user_name string
+	//role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	//if role.ID == 0 {
+	//	user_name = "管理员"
+	//} else {
+	//	user_name = role.UserName
+	//}
+
+	org, _ := service.GetOrgById(adminUser.CurrentOrgId)
+	printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
+
+	patient, _ := service.GetPatientByID(order.UserOrgId, order.PatientId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"org_name":      org.OrgName,
+		"name":          patient.Name,
+		"order_infos":   orderInfos,
+		"number":        order.MdtrtId,
+		"date":          order.SettleAccountsDate,
+		"charge_admin":  charge_admin,
+		"printor_admin": printor_admin,
+		"info":          order,
+	})
+
 }
 
 func (c *HisApiController) RefudDetail() {
@@ -2696,7 +2852,9 @@ func (c *HisApiController) GetRegisterInfo() {
 			SickType:               sick_type,
 		}
 		service.CreateHisPatient(&hisPatient)
+
 		service.UpdateHisPrescriptionHisID(hisPatient.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"his_info": hisPatient,
 		})
@@ -2736,16 +2894,14 @@ func (c *HisApiController) GetRegisterInfo() {
 		}
 		service.CreateHisPatient(&hisPatient)
 
+		service.UpdateHisPrescriptionHisID(hisPatient.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"his_info": hisPatient,
 		})
 
 	}
 
-	//timeStr := time.Now().Format("2006-01-02")
-	//timeArr := strings.Split(timeStr, "-")
-	//var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)+ ""
-
 }
 
 //上传明细----结算
@@ -2823,10 +2979,6 @@ func (c *HisApiController) GetUploadInfo() {
 			prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type)
 		}
 
-		fmt.Println("~~~~~~~~~")
-		fmt.Println(his.Number)
-		fmt.Println("~~~~~~~~~")
-
 		timestamp := time.Now().Unix()
 		tempTime := time.Unix(timestamp, 0)
 		timeFormat := tempTime.Format("20060102150405")
@@ -2899,7 +3051,6 @@ func (c *HisApiController) GetUploadInfo() {
 
 		var customs []*Custom
 		for _, item := range prescriptions {
-
 			if item.Type == 1 { //药品
 				for _, subItem := range item.HisDoctorAdviceInfo {
 					cus := &Custom{
@@ -2915,10 +3066,8 @@ func (c *HisApiController) GetUploadInfo() {
 					customs = append(customs, cus)
 				}
 			}
-
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
-
 					cus := &Custom{
 						AdviceId:         0,
 						ProjectId:        subItem.ID,
@@ -2929,11 +3078,9 @@ func (c *HisApiController) GetUploadInfo() {
 						MedListCodg:      subItem.MedListCodg,
 						Type:             2,
 					}
-
 					customs = append(customs, cus)
 				}
 			}
-
 			for _, item := range item.HisAdditionalCharge {
 				cus := &Custom{
 					ItemId:           item.ID,
@@ -2946,12 +3093,9 @@ func (c *HisApiController) GetUploadInfo() {
 					MedListCodg:      item.XtHisAddtionConfig.Code,
 					Type:             3,
 				}
-
 				customs = append(customs, cus)
 			}
-
 		}
-
 		for _, item := range customs {
 			var advice_id int64 = 0
 			var project_id int64 = 0
@@ -2973,11 +3117,9 @@ func (c *HisApiController) GetUploadInfo() {
 				item_id = item.ItemId
 				project_id = 0
 			}
-
 			detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
 			cut, _ := strconv.ParseFloat(item.Cut, 32)
 			pric, _ := strconv.ParseFloat(item.Price, 32)
-
 			info := &models.HisOrderInfo{
 				OrderNumber:      order.Number,
 				UploadDate:       time.Now().Unix(),
@@ -3002,7 +3144,6 @@ func (c *HisApiController) GetUploadInfo() {
 		his.SickType = sick_type
 		his.RegisterType = reg_type
 		his.MedicalTreatmentType = reg_type
-
 		service.UpdataHisPateint(&his)
 		err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
 		err = service.UpDateHisPrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime, his_patient_id)
@@ -3012,13 +3153,10 @@ func (c *HisApiController) GetUploadInfo() {
 				"msg": "结算成功",
 			})
 		}
-
 	} else {
 		if tempOrder.IsPre > 0 {
-
 			allTotal := fmt.Sprintf("%.2f", tempOrder.MedfeeSumamt)
 			totals, _ := strconv.ParseFloat(allTotal, 64)
-
 			tempOrder.OrderStatus = 2
 			tempOrder.PayWay = pay_way
 			tempOrder.PayPrice = pay_price
@@ -3034,7 +3172,6 @@ func (c *HisApiController) GetUploadInfo() {
 			tempOrder.PType = 2
 			tempOrder.MedfeeSumamt = totals
 			tempOrder.Diagnosis = diagnosis_id
-
 			err = service.SaveHisOrder(&tempOrder)
 			err = service.UpdataOrderStatusTwo(tempOrder.Number, adminUser.CurrentOrgId)
 			if err != nil {
@@ -3046,10 +3183,8 @@ func (c *HisApiController) GetUploadInfo() {
 					"msg": "结算成功",
 				})
 			}
-
 		}
 	}
-
 }
 
 //退款
@@ -3448,16 +3583,81 @@ func (c *HisApiController) GetAllOrderDetailCollect() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
 		return
 	}
+
 	org_id := c.GetAdminUserInfo().CurrentOrgId
 	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
 	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
 	patient, _ := service.GetPatientByID(org_id, order.PatientId)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"order":      order,
-		"order_info": order_info,
-		"patient":    patient,
-		"admin_info": adminInfo,
-	})
+
+	his, _ := service.GetHisPatientInfoThree(order.UserOrgId, order.MdtrtId)
+
+	if his.BalanceAccountsType != 2 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order":      order,
+			"order_info": order_info,
+			"patient":    patient,
+			"admin_info": adminInfo,
+		})
+	} else {
+
+		for _, item := range order_info {
+			item.FulamtOwnpayAmt = item.DetItemFeeSumamt
+			if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
+				item.MedChrgitmType = "09"
+
+			}
+			if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
+				if item.HisPrescriptionProject.Type == 2 {
+					switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+
+					case 1:
+						item.MedChrgitmType = "14"
+						break
+					case 2:
+						item.MedChrgitmType = "05"
+
+						break
+					case 3:
+						item.MedChrgitmType = "04"
+
+						break
+					case 4:
+						item.MedChrgitmType = "14"
+
+						break
+					case 5:
+						item.MedChrgitmType = "08"
+
+						break
+					case 6:
+						item.MedChrgitmType = "14"
+
+						break
+					case 7:
+						item.MedChrgitmType = "14"
+
+						break
+					case 8:
+						item.MedChrgitmType = "03"
+						break
+					case 9:
+						item.MedChrgitmType = "14"
+						break
+					}
+				} else if item.HisPrescriptionProject.Type == 3 {
+					item.MedChrgitmType = "08"
+				}
+			}
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order":      order,
+			"order_info": order_info,
+			"patient":    patient,
+			"admin_info": adminInfo,
+		})
+
+	}
+
 	return
 }
 
@@ -3569,7 +3769,7 @@ func (c *HisApiController) GetFaPiaoData() {
 
 	his, _ := service.GetHisPatientInfoThree(adminUser.CurrentOrgId, number)
 
-	prescriptions, _ := service.GetHisPrescriptionThree(adminUser.CurrentOrgId, patient_id, order.Number)
+	//prescriptions, _ := service.GetHisPrescriptionThree(adminUser.CurrentOrgId, patient_id, order.Number)
 
 	var bedCostTotal float64 = 0         //床位总费
 	var bedCostSelfTotal float64 = 0     //床位自费
@@ -3610,22 +3810,109 @@ func (c *HisApiController) GetFaPiaoData() {
 	decimal.DivisionPrecision = 2
 
 	if his.BalanceAccountsType == 2 {
-		for _, item := range prescriptions {
-			if item.Type == 1 {
-				for _, subItem := range item.HisDoctorAdviceInfo {
-					westernMedicineCostTotal = westernMedicineCostTotal + (subItem.PrescribingNumber * subItem.Price)
-				}
 
-			} else {
-				for _, subItem := range item.HisPrescriptionProject {
-					if subItem.Type == 2 {
-						treatCostTotal = treatCostTotal + (float64(subItem.Count) * subItem.Price)
-					} else {
-						materialCostTotal = materialCostTotal + (float64(subItem.Count) * subItem.Price)
+		orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
+
+		for _, item := range orderInfos_two {
+			item.FulamtOwnpayAmt = item.DetItemFeeSumamt
+			if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
+				item.MedChrgitmType = "09"
+
+			}
+			if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
+				if item.HisPrescriptionProject.Type == 2 {
+					switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+
+					case 1:
+						item.MedChrgitmType = "14"
+						break
+					case 2:
+						item.MedChrgitmType = "05"
+
+						break
+					case 3:
+						item.MedChrgitmType = "04"
+
+						break
+					case 4:
+						item.MedChrgitmType = "14"
+
+						break
+					case 5:
+						item.MedChrgitmType = "08"
+
+						break
+					case 6:
+						item.MedChrgitmType = "14"
+
+						break
+					case 7:
+						item.MedChrgitmType = "14"
+
+						break
+					case 8:
+						item.MedChrgitmType = "03"
+						break
+					case 9:
+						item.MedChrgitmType = "14"
+						break
+
 					}
+
+				} else if item.HisPrescriptionProject.Type == 3 {
+					item.MedChrgitmType = "08"
 				}
 			}
 		}
+
+		for _, item := range orderInfos_two {
+			if item.MedChrgitmType == "01" { //床位费
+				bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				bedCostSelfTotal = bedCostTotal
+			}
+
+			if item.MedChrgitmType == "03" { //检查费
+				checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				checkCostSelfTotal = checkCostTotal
+			}
+
+			if item.MedChrgitmType == "04" { //化验费
+				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratoryCostSelfTotal = laboratoryCostTotal
+			}
+
+			if item.MedChrgitmType == "05" { //治疗费
+				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				treatCostSelfTotal = treatCostTotal
+			}
+
+			if item.MedChrgitmType == "06" { //手术费
+				treatCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				operationCostSelfTotal = treatCostTotal
+			}
+
+			if item.MedChrgitmType == "08" { //材料费
+				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				materialCostSelfTotal = materialCostTotal
+			}
+
+			if item.MedChrgitmType == "09" { //西药费
+				westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				westernMedicineCostSelfTotal = westernMedicineCostTotal
+			}
+
+			if item.MedChrgitmType == "11" { //中成费
+				chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				chineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostTotal
+			}
+
+			if item.MedChrgitmType == "14" { //其他费
+				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				otherCostSelfTotal = otherCostTotal
+			}
+
+		}
+
 	} else {
 		for _, item := range orderInfos {
 			if item.MedChrgitmType == "01" { //床位费
@@ -4516,6 +4803,10 @@ func (c *HisApiController) PreSettle() {
 		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type)
 	}
 
+	if reg_type == 1111 || reg_type == 1112 {
+		reg_type = 11
+	}
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1111,6 +1111,16 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	oxygen_uptake, _ := c.GetInt64("oxygen_uptake")
 	oxygen_flow := c.GetString("oxygen_flow")
 	oxygen_time := c.GetString("oxygen_time")
+
+	hemodialysis_pipelines := c.GetString("hemodialysis_pipelines")
+	hemodialysis_pipelines_count, _ := c.GetFloat("hemodialysis_pipelines_count", 0)
+
+	puncture_needle := c.GetString("puncture_needle")
+	puncture_needle_count, _ := c.GetFloat("puncture_needle_count", 0)
+
+	epo := c.GetString("epo")
+	epo_count, _ := c.GetFloat("epo_count", 0)
+
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
@@ -1208,6 +1218,12 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		OxygenUptake:               oxygen_uptake,
 		OxygenFlow:                 oxygen_flow,
 		OxygenTime:                 oxygen_time,
+		HemodialysisPipelines:      hemodialysis_pipelines,
+		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
+		PunctureNeedle:             puncture_needle,
+		PunctureNeedleCount:        puncture_needle_count,
+		Epo:                        epo,
+		EpoCount:                   epo_count,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2020,6 +2036,16 @@ func (c *DialysisAPIController) PostSolution() {
 	oxygen_uptake, _ := c.GetInt64("oxygen_uptake")
 	oxygen_flow := c.GetString("oxygen_flow")
 	oxygen_time := c.GetString("oxygen_time")
+
+	hemodialysis_pipelines := c.GetString("hemodialysis_pipelines")
+	hemodialysis_pipelines_count, _ := c.GetFloat("hemodialysis_pipelines_count", 0)
+
+	puncture_needle := c.GetString("puncture_needle")
+	puncture_needle_count, _ := c.GetFloat("puncture_needle_count", 0)
+
+	epo := c.GetString("epo")
+	epo_count, _ := c.GetFloat("epo_count", 0)
+
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2079,45 +2105,51 @@ func (c *DialysisAPIController) PostSolution() {
 		DialyzerPerfusionApparatus: dialyzerPerfusionApparatus,
 		BodyFluid:                  body_fluid,
 
-		SpecialMedicine:           special_medicine,
-		SpecialMedicineOther:      special_medicine_other,
-		DisplaceLiquiPart:         displace_liqui_part,
-		DisplaceLiquiValue:        displace_liqui_value,
-		BloodAccess:               blood_access,
-		Ultrafiltration:           ultrafiltration,
-		BodyFluidOther:            body_fluid_other,
-		ReplacementTotal:          replacement_total,
-		Niprocart:                 niprocart,
-		Jms:                       jms,
-		FistulaNeedleSet:          fistula_needle_set,
-		FistulaNeedleSet16:        fistula_needle_set_16,
-		Hemoperfusion:             hemoperfusion,
-		DialyserSterilised:        dialyser_sterilised,
-		Filtryzer:                 filtryzer,
-		TargetKtv:                 target_ktv,
-		Dialyzers:                 dialyzers,
-		Injector:                  injector,
-		Bloodlines:                bloodlines,
-		TubingHemodialysis:        tubing_hemodialysis,
-		Package:                   safe_package,
-		ALiquid:                   a_liquid,
-		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
-		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood:                     blood,
-		DialysisDialyszers:        dialysis_dialyszers,
-		DialysisIrrigation:        dialysis_irrigation,
-		AntioxidantCommodityName:  antioxidant_commodity_name,
-		DisplaceSpeed:             displace_speed,
-		Illness:                   illness,
-		Amylaceum:                 amylaceum,
-		SingleWater:               single_water,
-		SingleTime:                single_time,
-		ReplacementFlow:           replacement_flow,
-		PlasmaSeparator:           plasma_separator,
-		BilirubinAdsorptionColumn: bilirubin_adsorption_column,
-		OxygenUptake:              oxygen_uptake,
-		OxygenTime:                oxygen_time,
-		OxygenFlow:                oxygen_flow,
+		SpecialMedicine:            special_medicine,
+		SpecialMedicineOther:       special_medicine_other,
+		DisplaceLiquiPart:          displace_liqui_part,
+		DisplaceLiquiValue:         displace_liqui_value,
+		BloodAccess:                blood_access,
+		Ultrafiltration:            ultrafiltration,
+		BodyFluidOther:             body_fluid_other,
+		ReplacementTotal:           replacement_total,
+		Niprocart:                  niprocart,
+		Jms:                        jms,
+		FistulaNeedleSet:           fistula_needle_set,
+		FistulaNeedleSet16:         fistula_needle_set_16,
+		Hemoperfusion:              hemoperfusion,
+		DialyserSterilised:         dialyser_sterilised,
+		Filtryzer:                  filtryzer,
+		TargetKtv:                  target_ktv,
+		Dialyzers:                  dialyzers,
+		Injector:                   injector,
+		Bloodlines:                 bloodlines,
+		TubingHemodialysis:         tubing_hemodialysis,
+		Package:                    safe_package,
+		ALiquid:                    a_liquid,
+		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
+		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
+		Blood:                      blood,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
+		DisplaceSpeed:              displace_speed,
+		Illness:                    illness,
+		Amylaceum:                  amylaceum,
+		SingleWater:                single_water,
+		SingleTime:                 single_time,
+		ReplacementFlow:            replacement_flow,
+		PlasmaSeparator:            plasma_separator,
+		BilirubinAdsorptionColumn:  bilirubin_adsorption_column,
+		OxygenUptake:               oxygen_uptake,
+		OxygenTime:                 oxygen_time,
+		OxygenFlow:                 oxygen_flow,
+		HemodialysisPipelines:      hemodialysis_pipelines,
+		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
+		PunctureNeedle:             puncture_needle,
+		PunctureNeedleCount:        puncture_needle_count,
+		Epo:                        epo,
+		EpoCount:                   epo_count,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -2207,6 +2239,12 @@ func (c *DialysisAPIController) PostSolution() {
 		TargetKtv:                  target_ktv,
 		DialysisDialyszers:         dialysis_dialyszers,
 		DialysisIrrigation:         dialysis_irrigation,
+		HemodialysisPipelines:      hemodialysis_pipelines,
+		HemodialysisPipelinesCount: hemodialysis_pipelines_count,
+		PunctureNeedle:             puncture_needle,
+		PunctureNeedleCount:        puncture_needle_count,
+		Epo:                        epo,
+		EpoCount:                   epo_count,
 	}
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 

controllers/patient_api_controller.go

@@ -3175,6 +3175,36 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		solution.Remark = remark
 	}
 
+	if dataBody["hemodialysis_pipelines"] != nil && reflect.TypeOf(dataBody["hemodialysis_pipelines"]).String() == "string" {
+		hemodialysis_pipelines := dataBody["hemodialysis_pipelines"].(string)
+		solution.HemodialysisPipelines = hemodialysis_pipelines
+	}
+
+	if dataBody["hemodialysis_pipelines_count"] != nil && reflect.TypeOf(dataBody["hemodialysis_pipelines_count"]).String() == "string" {
+		hemodialysis_pipelines_count, _ := strconv.ParseFloat(dataBody["hemodialysis_pipelines_count"].(string), 64)
+		solution.HemodialysisPipelinesCount = hemodialysis_pipelines_count
+	}
+
+	if dataBody["puncture_needle"] != nil && reflect.TypeOf(dataBody["puncture_needle"]).String() == "string" {
+		puncture_needle := dataBody["puncture_needle"].(string)
+		solution.PunctureNeedle = puncture_needle
+	}
+
+	if dataBody["puncture_needle_count"] != nil && reflect.TypeOf(dataBody["puncture_needle_count"]).String() == "string" {
+		puncture_needle_count, _ := strconv.ParseFloat(dataBody["puncture_needle_count"].(string), 64)
+		solution.PunctureNeedleCount = puncture_needle_count
+	}
+
+	if dataBody["epo"] != nil && reflect.TypeOf(dataBody["epo"]).String() == "string" {
+		epo := dataBody["epo"].(string)
+		solution.Epo = epo
+	}
+
+	if dataBody["epo_count"] != nil && reflect.TypeOf(dataBody["epo_count"]).String() == "string" {
+		epo_count, _ := strconv.ParseFloat(dataBody["epo_count"].(string), 64)
+		solution.EpoCount = epo_count
+	}
+
 	if dataBody["created_time"] != nil && reflect.TypeOf(dataBody["created_time"]).String() == "float64" {
 		created_time := int64(dataBody["created_time"].(float64))
 

models/common_models.go

@@ -287,6 +287,13 @@ type BloodDialysisPrescription struct {
 	UserSysBeforeCount         int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (BloodDialysisPrescription) TableName() string {

models/dialysis_parameter_models.go

@@ -125,6 +125,13 @@ type DialysisPrescriptionParameter struct {
 	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
 	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (DialysisPrescriptionParameter) TableName() string {

models/new_monitor.go

@@ -61,6 +61,13 @@ type VMDialysisPrescription struct {
 	Status                int64   `gorm:"column:status" json:"status"`
 	RecordDate            int64   `gorm:"column:record_date" json:"record_date"`
 	TargetUltrafiltration float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (VMDialysisPrescription) TableName() string {

models/patient_models.go

@@ -240,6 +240,13 @@ type DialysisPrescription struct {
 	OxygenUptake               int64         `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
 	OxygenFlow                 string        `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
 	OxygenTime                 string        `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -258,6 +265,13 @@ type DialysisPrescriptionList struct {
 	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -348,6 +362,12 @@ type DialysisSolution struct {
 	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
 	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
 	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (DialysisSolution) TableName() string {

models/service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -192,6 +192,13 @@ type PrescriptionVM struct {
 	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid"`
 	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (PrescriptionVM) TableName() string {

models/service/statistics_service/index_models.go

@@ -18,6 +18,13 @@ type VMDialysisPrescription struct {
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
 	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (VMDialysisPrescription) TableName() string {

models/user_models.go

@@ -191,6 +191,13 @@ type XtDialysisPrescription struct {
 	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid" form:"a_liquid"`
 	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (XtDialysisPrescription) TableName() string {
@@ -337,6 +344,12 @@ type XtDialysisSolution struct {
 	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
 	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (XtDialysisSolution) TableName() string {

service/his_project_service.go

@@ -269,6 +269,12 @@ func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_t
 	return
 }
 
+func UpdateHisPrescriptionHisIDTwo(his_patient_id int64, patient_id int64, record_time int64, org_id int64, start_time int64) {
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date <= ? AND record_date >= ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0 AND order_status <> 2", record_time, start_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0 AND order_status <> 2", record_time, start_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	return
+}
+
 func GetBloodPatientByIdCard(idcard string, orgid int64) (*models.XtPatients, error) {
 	var patients models.XtPatients
 	var err error

service/his_service.go

@@ -475,7 +475,7 @@ func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ?", org_id)
+		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
 	}).
 		Where("(user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 AND p_type = ?) AND  (his_patient_id = ? OR his_patient_id = 0)", org_id, record_date, patient_id, p_type, his_patient_id).
 		Find(&prescription).Error
@@ -718,7 +718,7 @@ func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
 		Preload("VMDrugSalesReturnInfo", "status = 1 AND org_id = ?", org_id).
 		Preload("VMDrugWarehouseOutInfo", "status = 1 AND org_id = ?", org_id).
 		Preload("VMDrugCancelStockInfo", "status = 1 AND org_id = ?", org_id).
-		Where("org_id = ?  AND status = 1", org_id).Find(&list).Error
+		Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
 	return
 }
 
@@ -1024,12 +1024,10 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 }
 
 func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "status": 0}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
-
 	return
-
 }
 
 func UpdataOrderInfoStatus(id int64, number string, user_org_id int64) {
@@ -1163,13 +1161,13 @@ func DelelteAddition(id int64, user_org_id int64) (err error) {
 
 func GetNewHisPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*VMHisHospitalPrescriptionInfo, err error, total int64) {
 	offset := (page - 1) * limit
-	db := readDb.Model(&VMHisHospitalPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 ", org_id, record_date)
+	db := readDb.Model(&VMHisHospitalPrescriptionInfo{}).Where("his_prescription_info.user_org_id = ? AND his_prescription_info.status = 1 AND his_prescription_info.record_date = ? AND his_prescription_info.p_type <> 1 ", org_id, record_date)
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
-		db = db.Joins("JOIN xt_patients as p On his_prescription_info.patient_id = p.id AND p.user_org_id = ? AND p.name like ?", org_id, keywords)
+		db = db.Joins("JOIN xt_patients  On his_prescription_info.patient_id = xt_patients.id  AND xt_patients.name like ?", keywords)
 	}
-	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND p_type <> 1", org_id)
+	db = db.Preload("Patients", "xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Preload("HisPrescription", "his_prescription.user_org_id = ? AND his_prescription.status = 1 AND his_prescription.p_type <> 1", org_id)
 	db = db.Count(&total)
 	err = db.Limit(limit).Offset(offset).Find(&patients).Error
 	return
@@ -1527,22 +1525,24 @@ func (HisPrescriptionProject) TableName() string {
 }
 
 type HisOrderInfo 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"`
-	MedChrgitmType         string                 `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
-	Status                 int64                  `gorm:"column:status" json:"status" form:"status"`
-	FeedetlSn              string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	ChldMedcFlag           string                 `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_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"`
-	ProjectId              int64                  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	ItemId                 int64                  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	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"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_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"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId           int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+
 	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
 }
@@ -2077,3 +2077,23 @@ func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.Hi
 
 	return
 }
+
+func GetNewAllUnChargeHisPatientListTwo(org_id int64, keywords string, record_date int64) (patients []*NewTempPatients, err error) {
+	db := readDb.Model(&NewTempPatients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ? AND order_status <> 2", org_id, record_date)
+	})
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status <> 2 AND order_status <> 3", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND prescription_status <> 3", org_id, record_date).Find(&patients).Error
+
+	for _, item := range patients {
+		for _, sumItem := range item.HisPatient {
+			if len(sumItem.VMHisOrders) > 0 {
+				sumItem.VMHisOrder.OrderStatus = sumItem.VMHisOrders[len(sumItem.VMHisOrders)-1].OrderStatus
+			}
+		}
+
+	}
+
+	return
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -203,6 +203,13 @@ type PrescriptionVM struct {
 	ReplacementFlow            string  `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
 	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
 	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (PrescriptionVM) TableName() string {

service/statistics_service/index_models.go

@@ -18,6 +18,13 @@ type VMDialysisPrescription struct {
 	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus"`
 	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
 	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 }
 
 func (VMDialysisPrescription) TableName() string {