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

controllers/base_api_controller.go

 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 = 4
-		//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 = 4
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
+		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()
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 4
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/his_api_controller.go

 	beego.Router("/api/hisorder/get", &HisApiController{}, "get:GetHisOrder")
 
 	beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
-
 	beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
+	beego.Router("/api/presettle/get", &HisApiController{}, "get:PreSettle")
 
 	beego.Router("/api/refund/post", &HisApiController{}, "post:Refund")
 
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	reg_type, _ := c.GetInt64("reg_type")
-	diagnose := c.GetString("diagnose")
+	diagnose, _ := c.GetInt64("diagnose")
 	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
 				}
 				order_status := int64(items["order_status"].(float64))
 
+				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+					utils.ErrorLog("med_type")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				med_type := strconv.Itoa(int(items["med_type"].(float64)))
+
+				if med_type == "0" {
+					med_type = "14"
+				}
+
 				if order_status == 0 {
 					order_status = 1
 				}
 						PrescriptionNumber: hpInfo.PrescriptionNumber,
 						PreTime:            pTime,
 						PType:              p_type,
+						MedType:            med_type,
 					}
 					tempPrescription = prescription
 					service.SaveHisPrescription(tempPrescription)
 					tempPrescription.Doctor = role.UserName
 					tempPrescription.OrderStatus = order_status
 					tempPrescription.PreTime = pTime
+					tempPrescription.MedType = med_type
 					service.SaveHisPrescription(tempPrescription)
 				}
 				//service.SaveHisPrescription(prescription)
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
 	reg_type, _ := c.GetInt64("reg_type")
-	diagnose := c.GetString("diagnose")
+	diagnose, _ := c.GetInt64("diagnose", 0)
 	sick_type, _ := c.GetInt64("sick_type")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
 				}
 				types := int64(items["type"].(float64))
 
+				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+					utils.ErrorLog("med_type")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				med_type := strconv.Itoa(int(items["med_type"].(float64)))
+
 				historyPrescription, _ := service.GetHisPrescriptionByID(adminInfo.CurrentOrgId, id)
 
 				ctime := time.Now().Unix()
 					BatchNumber:        "",
 					PrescriptionNumber: hpInfo.PrescriptionNumber,
 					PType:              hpInfo.PType,
+					MedType:            med_type,
 				}
 
 				if historyPrescription.ID > 0 {
 	fapiao_code := c.GetString("fapiao_code")
 	fapiao_number := c.GetString("fapiao_number")
 
+	diagnosis_id, _ := c.GetInt64("diagnosis")
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type, _ := c.GetInt64("p_type")
+	order_id, _ := c.GetInt64("order_id")
+
+	his, _ := service.GetHisPatientByIdThree(his_patient_id)
+
+	tempOrder, _ := service.GetHisOrderByID(order_id)
+
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 	var start_time int64
 	var end_time int64
 
-	if settle_accounts_type == 1 { //日结
+	if tempOrder.ID == 0 {
 
-		prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime)
+		if settle_accounts_type == 1 { //日结
 
-	} else { //月结
-		start_time_str := c.GetString("start_time")
-		end_time_str := c.GetString("end_time")
-		timeLayout := "2006-01-02"
-		loc, _ := time.LoadLocation("Local")
-		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-		recordStartTime := theStartTime.Unix()
-		start_time = recordStartTime
-		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			return
-		}
-		recordEndTime := theEndTime.Unix()
-		end_time = recordEndTime
-		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
-	}
+			prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
 
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+		} else { //月结
+			start_time_str := c.GetString("start_time")
+			end_time_str := c.GetString("end_time")
+			timeLayout := "2006-01-02"
+			loc, _ := time.LoadLocation("Local")
+			theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			recordStartTime := theStartTime.Unix()
+			start_time = recordStartTime
+			theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			recordEndTime := theEndTime.Unix()
+			end_time = recordEndTime
+			prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type)
+		}
 
-	fmt.Println("~~~~~~~~~")
-	fmt.Println(his.Number)
-	fmt.Println("~~~~~~~~~")
+		fmt.Println("~~~~~~~~~")
+		fmt.Println(his.Number)
+		fmt.Println("~~~~~~~~~")
 
-	timestamp := time.Now().Unix()
-	tempTime := time.Unix(timestamp, 0)
-	timeFormat := tempTime.Format("20060102150405")
-	chrgBchno := rand.Intn(100000) + 10000
-	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
-	strconv.FormatInt(his.PatientId, 10)
+		timestamp := time.Now().Unix()
+		tempTime := time.Unix(timestamp, 0)
+		timeFormat := tempTime.Format("20060102150405")
+		chrgBchno := rand.Intn(100000) + 10000
+		chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
+		strconv.FormatInt(his.PatientId, 10)
 
-	var ids []int64
+		var ids []int64
 
-	for _, item := range prescriptions {
-		ids = append(ids, item.ID)
-	}
+		for _, item := range prescriptions {
+			ids = append(ids, item.ID)
+		}
 
-	var total float64
-	for _, item := range prescriptions {
-		if item.Type == 1 { //药品
-			for _, subItem := range item.HisDoctorAdviceInfo {
-				total = total + (subItem.Price * subItem.PrescribingNumber)
+		var total float64
+		for _, item := range prescriptions {
+			if item.Type == 1 { //药品
+				for _, subItem := range item.HisDoctorAdviceInfo {
+					total = total + (subItem.Price * subItem.PrescribingNumber)
+				}
 			}
-		}
-		if item.Type == 2 { //项目
-			for _, subItem := range item.HisPrescriptionProject {
+			if item.Type == 2 { //项目
+				for _, subItem := range item.HisPrescriptionProject {
+					total = total + (subItem.Price * float64(subItem.Count))
+				}
+			}
+
+			for _, subItem := range item.HisAdditionalCharge {
 				total = total + (subItem.Price * float64(subItem.Count))
 			}
 		}
 
-		for _, subItem := range item.HisAdditionalCharge {
-			total = total + (subItem.Price * float64(subItem.Count))
+		allTotal := fmt.Sprintf("%.2f", total)
+		totals, _ := strconv.ParseFloat(allTotal, 64)
+		order := &models.HisOrder{
+			UserOrgId:             adminUser.CurrentOrgId,
+			HisPatientId:          his.ID,
+			PatientId:             id,
+			SettleAccountsDate:    recordDateTime,
+			Ctime:                 time.Now().Unix(),
+			Mtime:                 time.Now().Unix(),
+			Status:                1,
+			OrderStatus:           2,
+			MdtrtId:               his.Number,
+			Number:                chrg_bchno,
+			MedfeeSumamt:          totals,
+			PayWay:                pay_way,
+			PayPrice:              pay_price,
+			MedType:               strconv.Itoa(int(reg_type)),
+			PayCardNo:             pay_card_no,
+			DiscountPrice:         discount_price,
+			PreferentialPrice:     preferential_price,
+			RealityPrice:          reality_price,
+			FoundPrice:            found_price,
+			MedicalInsurancePrice: medical_insurance_price,
+			PrivatePrice:          private_price,
+			SettleEndTime:         end_time,
+			SettleStartTime:       start_time,
+			SettleType:            settle_accounts_type,
+			FaPiaoCode:            fapiao_code,
+			FaPiaoNumber:          fapiao_number,
+			PType:                 2,
+		}
+		err = service.CreateOrder(order)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+			return
 		}
-	}
 
-	allTotal := fmt.Sprintf("%.2f", total)
-	totals, _ := strconv.ParseFloat(allTotal, 64)
-	order := &models.HisOrder{
-		UserOrgId:             adminUser.CurrentOrgId,
-		HisPatientId:          his.ID,
-		PatientId:             id,
-		SettleAccountsDate:    recordDateTime,
-		Ctime:                 time.Now().Unix(),
-		Mtime:                 time.Now().Unix(),
-		Status:                1,
-		OrderStatus:           2,
-		MdtrtId:               his.Number,
-		Number:                chrg_bchno,
-		MedfeeSumamt:          totals,
-		PayWay:                pay_way,
-		PayPrice:              pay_price,
-		PayCardNo:             pay_card_no,
-		DiscountPrice:         discount_price,
-		PreferentialPrice:     preferential_price,
-		RealityPrice:          reality_price,
-		FoundPrice:            found_price,
-		MedicalInsurancePrice: medical_insurance_price,
-		PrivatePrice:          private_price,
-		SettleEndTime:         end_time,
-		SettleStartTime:       start_time,
-		SettleType:            settle_accounts_type,
-		FaPiaoCode:            fapiao_code,
-		FaPiaoNumber:          fapiao_number,
-		PType:                 2,
-	}
-	err = service.CreateOrder(order)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
-		return
-	}
+		var customs []*Custom
+		for _, item := range prescriptions {
+
+			if item.Type == 1 { //药品
+				for _, subItem := range item.HisDoctorAdviceInfo {
+					cus := &Custom{
+						AdviceId:         subItem.ID,
+						ProjectId:        0,
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.2f", subItem.Price),
+						MedListCodg:      subItem.MedListCodg,
+						Type:             1,
+					}
+					customs = append(customs, cus)
+				}
+			}
 
-	var customs []*Custom
-	for _, item := range prescriptions {
+			if item.Type == 2 { //项目
+				for _, subItem := range item.HisPrescriptionProject {
+
+					cus := &Custom{
+						AdviceId:         0,
+						ProjectId:        subItem.ID,
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+						MedListCodg:      subItem.MedListCodg,
+						Type:             2,
+					}
 
-		if item.Type == 1 { //药品
-			for _, subItem := range item.HisDoctorAdviceInfo {
-				cus := &Custom{
-					AdviceId:         subItem.ID,
-					ProjectId:        0,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-					Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
-					FeedetlSn:        subItem.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", subItem.Price),
-					MedListCodg:      subItem.MedListCodg,
-					Type:             1,
+					customs = append(customs, cus)
 				}
-				customs = append(customs, cus)
 			}
-		}
-
-		if item.Type == 2 { //项目
-			for _, subItem := range item.HisPrescriptionProject {
 
+			for _, item := range item.HisAdditionalCharge {
 				cus := &Custom{
+					ItemId:           item.ID,
 					AdviceId:         0,
-					ProjectId:        subItem.ID,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-					FeedetlSn:        subItem.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-					MedListCodg:      subItem.MedListCodg,
-					Type:             2,
+					ProjectId:        0,
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
+					Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
+					FeedetlSn:        item.FeedetlSn,
+					Price:            fmt.Sprintf("%.2f", float64(item.Price)),
+					MedListCodg:      item.XtHisAddtionConfig.Code,
+					Type:             3,
 				}
 
 				customs = append(customs, cus)
 			}
+
 		}
 
-		for _, item := range item.HisAdditionalCharge {
-			cus := &Custom{
-				ItemId:           item.ID,
-				AdviceId:         0,
-				ProjectId:        0,
-				DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
-				Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
-				FeedetlSn:        item.FeedetlSn,
-				Price:            fmt.Sprintf("%.2f", float64(item.Price)),
-				MedListCodg:      item.XtHisAddtionConfig.Code,
-				Type:             3,
+		for _, item := range customs {
+			var advice_id int64 = 0
+			var project_id int64 = 0
+			var item_id int64 = 0
+
+			var types int64 = 0
+
+			if item.Type == 1 {
+				advice_id = item.AdviceId
+				project_id = 0
+				item_id = 0
+			} else if item.Type == 2 {
+				advice_id = 0
+				item_id = 0
+
+				project_id = item.ProjectId
+			} else if item.Type == 3 {
+				advice_id = 0
+				item_id = item.ItemId
+				project_id = 0
 			}
 
-			customs = append(customs, cus)
+			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(),
+				AdviceId:         advice_id,
+				DetItemFeeSumamt: detItemFeeSumamt,
+				Cnt:              cut,
+				Pric:             pric,
+				PatientId:        id,
+				Status:           1,
+				Mtime:            time.Now().Unix(),
+				Ctime:            time.Now().Unix(),
+				UserOrgId:        adminUser.CurrentOrgId,
+				HisPatientId:     his.ID,
+				OrderId:          order.ID,
+				ProjectId:        project_id,
+				Type:             types,
+				ItemId:           item_id,
+			}
+			service.CreateOrderInfo(info)
 		}
-
-	}
-
-	for _, item := range customs {
-		var advice_id int64 = 0
-		var project_id int64 = 0
-		var item_id int64 = 0
-
-		var types int64 = 0
-
-		if item.Type == 1 {
-			advice_id = item.AdviceId
-			project_id = 0
-			item_id = 0
-		} else if item.Type == 2 {
-			advice_id = 0
-			item_id = 0
-
-			project_id = item.ProjectId
-		} else if item.Type == 3 {
-			advice_id = 0
-			item_id = item.ItemId
-			project_id = 0
+		his.Diagnosis = diagnosis_id
+		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)
+		err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "结算成功",
+			})
 		}
 
-		detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
-		cut, _ := strconv.ParseFloat(item.Cut, 32)
-		pric, _ := strconv.ParseFloat(item.Price, 32)
+	} 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
+			tempOrder.PayCardNo = pay_card_no
+			tempOrder.DiscountPrice = discount_price
+			tempOrder.PreferentialPrice = preferential_price
+			tempOrder.RealityPrice = reality_price
+			tempOrder.FoundPrice = found_price
+			tempOrder.MedicalInsurancePrice = medical_insurance_price
+			tempOrder.PrivatePrice = private_price
+			tempOrder.FaPiaoCode = fapiao_code
+			tempOrder.FaPiaoNumber = fapiao_number
+			tempOrder.PType = 2
+			tempOrder.MedfeeSumamt = totals
+
+			err = service.SaveHisOrder(&tempOrder)
+			err = service.UpdataOrderStatusTwo(tempOrder.Number, adminUser.CurrentOrgId)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+				return
+			}
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "结算成功",
+				})
+			}
 
-		info := &models.HisOrderInfo{
-			OrderNumber:      order.Number,
-			UploadDate:       time.Now().Unix(),
-			AdviceId:         advice_id,
-			DetItemFeeSumamt: detItemFeeSumamt,
-			Cnt:              cut,
-			Pric:             pric,
-			PatientId:        id,
-			Status:           1,
-			Mtime:            time.Now().Unix(),
-			Ctime:            time.Now().Unix(),
-			UserOrgId:        adminUser.CurrentOrgId,
-			HisPatientId:     his.ID,
-			OrderId:          order.ID,
-			ProjectId:        project_id,
-			Type:             types,
-			ItemId:           item_id,
 		}
-		service.CreateOrderInfo(info)
-	}
-	err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-	err = service.UpDateHisPrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime, his_patient_id)
-	err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "结算成功",
-		})
 	}
+
 }
 
 //退款
 
 func (c *HisApiController) GetHisChargePatientList() {
 	record_date := c.GetString("record_date")
+	order_status, _ := c.GetInt64("type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
+	var tempPatients []*service.NewTempPatients
 	//tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	tempPatients, _ := service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	if order_status != 2 {
+		tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	} else {
+		tempPatients, _ = service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	}
 
 	var patients []*service.NewTempPatients
 	var patients_two []*service.NewTempPatients
 	end_time := c.GetString("end_time")
 	order_status, _ := c.GetInt64("type", 0)
 	p_type, _ := c.GetInt64("p_type", 0)
+	order_id, _ := c.GetInt64("order_id", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
 	var prescriptions []*models.HisPrescription
 
+	order, _ := service.GetHisOrderByID(order_id)
+
 	if order_status == 1 || order_status == 0 {
 		prescriptions, _ = service.GetUnChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime, p_type)
 	} else if order_status == 2 {
-		prescriptions, _ = service.GetChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime, p_type)
+		prescriptions, _ = service.GetChargeHisPrescriptionSeven(admin.CurrentOrgId, patient_id, order.Number, p_type)
 	}
 
 	var monthPrescriptions []*models.HisPrescription
 	if order_status == 1 || order_status == 0 {
 		monthPrescriptions, _ = service.GetUnChargeMonthHisPrescriptionThree(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
 	} else if order_status == 2 {
-		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFour(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFive(admin.CurrentOrgId, patient_id, order.Number, p_type)
 	}
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
-	order, _ := service.GetNewHisOrder(admin.CurrentOrgId, his_patient_info.Number, patient_id)
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 	admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order_number":    order.Number,             //业务流水号
-		"id_card_no":      his.IdCardNo,             //社会保障号
-		"department_name": department.Name,          //科室
-		"number":          his.Number,               //门诊号
-		"date":            order.SettleAccountsDate, //结算日期
-		"name":            order.PsnName,            //姓名
-		"gender":          order.Gend,               //性别
-		"psn_cash_money":  order.PsnCashPay,         //个人支付
-		"pay_way":         "门诊",                     //结算方式
-		"medfee_sumamt":   order.MedfeeSumamt,       //总费用
-		"admin_user_name": admin.UserName,           //收款员
+		"order_number":    order.Number,        //业务流水号
+		"id_card_no":      his.IdCardNo,        //社会保障号
+		"department_name": department.Name,     //科室
+		"number":          his.Number,          //门诊号
+		"date":            order.SettleEndTime, //结算日期
+		"name":            order.PsnName,       //姓名
+		"gender":          order.Gend,          //性别
+		"psn_cash_money":  order.PsnCashPay,    //个人支付
+		"pay_way":         "门诊",                //结算方式
+		"medfee_sumamt":   order.MedfeeSumamt,  //总费用
+		"admin_user_name": admin.UserName,      //收款员
 
 		"bedCostTotal":                                bedCostTotal,
 		"bedCostSelfTotal":                            bedCostSelfTotal,
 	}
 
 }
+
+func (c *HisApiController) PreSettle() {
+	id, _ := c.GetInt64("id")
+	record_time := c.GetString("record_time")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
+	diagnosis_id, _ := c.GetInt64("diagnosis")
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type, _ := c.GetInt64("p_type")
+
+	his, _ := service.GetHisPatientByIdThree(his_patient_id)
+
+	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()
+	var prescriptions []*models.HisPrescription
+	var start_time int64
+	var end_time int64
+
+	if settle_accounts_type == 1 { //日结
+
+		prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
+
+	} else { //月结
+		start_time_str := c.GetString("start_time")
+		end_time_str := c.GetString("end_time")
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordStartTime := theStartTime.Unix()
+		start_time = recordStartTime
+		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordEndTime := theEndTime.Unix()
+		end_time = recordEndTime
+		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type)
+	}
+
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormat := tempTime.Format("20060102150405")
+	chrgBchno := rand.Intn(100000) + 10000
+	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
+	strconv.FormatInt(his.PatientId, 10)
+
+	var ids []int64
+
+	for _, item := range prescriptions {
+		ids = append(ids, item.ID)
+	}
+
+	var total float64
+	for _, item := range prescriptions {
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				total = total + (subItem.Price * subItem.PrescribingNumber)
+			}
+		}
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				total = total + (subItem.Price * float64(subItem.Count))
+			}
+		}
+
+		for _, subItem := range item.HisAdditionalCharge {
+			total = total + (subItem.Price * float64(subItem.Count))
+		}
+	}
+
+	allTotal := fmt.Sprintf("%.2f", total)
+	totals, _ := strconv.ParseFloat(allTotal, 64)
+	order := &models.HisOrder{
+		UserOrgId:          adminUser.CurrentOrgId,
+		HisPatientId:       his.ID,
+		PatientId:          id,
+		SettleAccountsDate: recordDateTime,
+		Ctime:              time.Now().Unix(),
+		Mtime:              time.Now().Unix(),
+		Status:             1,
+		OrderStatus:        1,
+		MdtrtId:            his.Number,
+		Number:             chrg_bchno,
+		MedfeeSumamt:       totals,
+		SettleEndTime:      end_time,
+		SettleStartTime:    start_time,
+		SettleType:         settle_accounts_type,
+		PType:              2,
+		IsPre:              1,
+		MedType:            strconv.Itoa(int(reg_type)),
+	}
+	err = service.CreateOrder(order)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+		return
+	}
+
+	var customs []*Custom
+	for _, item := range prescriptions {
+
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				cus := &Custom{
+					AdviceId:         subItem.ID,
+					ProjectId:        0,
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
+					Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+					FeedetlSn:        subItem.FeedetlSn,
+					Price:            fmt.Sprintf("%.2f", subItem.Price),
+					MedListCodg:      subItem.MedListCodg,
+					Type:             1,
+				}
+				customs = append(customs, cus)
+			}
+		}
+
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+
+				cus := &Custom{
+					AdviceId:         0,
+					ProjectId:        subItem.ID,
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+					FeedetlSn:        subItem.FeedetlSn,
+					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+					MedListCodg:      subItem.MedListCodg,
+					Type:             2,
+				}
+
+				customs = append(customs, cus)
+			}
+		}
+
+		for _, item := range item.HisAdditionalCharge {
+			cus := &Custom{
+				ItemId:           item.ID,
+				AdviceId:         0,
+				ProjectId:        0,
+				DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
+				Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
+				FeedetlSn:        item.FeedetlSn,
+				Price:            fmt.Sprintf("%.2f", float64(item.Price)),
+				MedListCodg:      item.XtHisAddtionConfig.Code,
+				Type:             3,
+			}
+
+			customs = append(customs, cus)
+		}
+
+	}
+
+	for _, item := range customs {
+		var advice_id int64 = 0
+		var project_id int64 = 0
+		var item_id int64 = 0
+
+		var types int64 = 0
+
+		if item.Type == 1 {
+			advice_id = item.AdviceId
+			project_id = 0
+			item_id = 0
+		} else if item.Type == 2 {
+			advice_id = 0
+			item_id = 0
+
+			project_id = item.ProjectId
+		} else if item.Type == 3 {
+			advice_id = 0
+			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(),
+			AdviceId:         advice_id,
+			DetItemFeeSumamt: detItemFeeSumamt,
+			Cnt:              cut,
+			Pric:             pric,
+			PatientId:        id,
+			Status:           1,
+			Mtime:            time.Now().Unix(),
+			Ctime:            time.Now().Unix(),
+			UserOrgId:        adminUser.CurrentOrgId,
+			HisPatientId:     his.ID,
+			OrderId:          order.ID,
+			ProjectId:        project_id,
+			Type:             types,
+			ItemId:           item_id,
+		}
+		service.CreateOrderInfo(info)
+	}
+	his.Diagnosis = diagnosis_id
+	his.SickType = sick_type
+	service.UpdataHisPateint(&his)
+	err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
+	err = service.UpDateHisPrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime, his_patient_id)
+	//err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "结算成功",
+		})
+	}
+}

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

 				}
 				types := int64(items["type"].(float64))
 
+				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+					utils.ErrorLog("med_type")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				//med_type := int64(items["med_type"].(float64))
+				//med_type := strconv.Itoa(int(items["med_type"].(float64)))
+				//med_type := strconv.Itoa(int(items["med_type"].(float64)))
+
+				//if med_type == "0" {
+				//}
+				var med_type string
+				if adminInfo.Org.Id == 9504 || adminInfo.Org.Id == 10138 {
+					med_type = "13"
+
+				} else {
+					med_type = "14"
+				}
+
 				if items["order_status"] == nil || reflect.TypeOf(items["order_status"]).String() != "float64" {
 					utils.ErrorLog("order_status")
 				}
 						PrescriptionNumber: hpInfo.PrescriptionNumber,
 						PreTime:            pTime,
 						PType:              2,
+						MedType:            med_type,
 					}
 					tempPrescription = prescription
 				} else {
 					tempPrescription.OrderStatus = order_status
 					tempPrescription.PreTime = pTime
 					tempPrescription.PType = 2
+					tempPrescription.MedType = med_type
 
 				}
 				service.SaveHisPrescription(tempPrescription)

models/his_hospital_models.go

 
 	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"`
+
+	IsPre int64 `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (HisHospitalOrder) TableName() string {

models/his_models.go

 package models
 
 import (
-	//"gdyb/models"
 	"time"
 )
 
 	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis          int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
 	return "his_prescription_info"
 }
 
+type TempHisOrder 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"`
+	AccountPrice          float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
+
+	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"`
+
+	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+
+	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"`
+	IsPre           int64 `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+}
+
+func (TempHisOrder) TableName() string {
+	return "his_order"
+}
+
 type HisPrescription 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"`
 	VMHisPrescriptionInfo HisPrescriptionInfo    `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
 	Total                 string                 `gorm:"-" json:"total" form:"total"`
 	PType                 int64                  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	MedType               string                 `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	TempHisOrder          TempHisOrder           `gorm:"ForeignKey:Number,MedType;AssociationForeignKey:BatchNumber,MedType" json:"order"`
 }
 
 func (HisPrescription) TableName() string {
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
 
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
+	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (HisOrder) TableName() string {

service/app_version.go

 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 4 AND status = 1 AND order_status = 2").Last(&his).Error
 	return
 }
-
-func SaveOrder(his *models.HisOrder) {
-	writeDb.Save(&his)
-
-}

service/his_hospital_service.go

 	Mtime              int64              `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64              `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64              `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string             `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis          int64              `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       int64              `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string             `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        string             `gorm:"column:departments" json:"departments" form:"departments"`

service/his_project_service.go

 	error = XTReadDB().Model(&hisProjectList).Preload("XtHisProject").Preload("GoodInfo", "status = 1").Where(" status = 1 and id in (?)", ids).Find(&hisProjectList).Error
 	return hisProjectList, error
 }
+
+func GetHisPatientByIdThree(id int64) (models.HisPatient, error) {
+	patient := models.HisPatient{}
+	err := XTReadDB().Model(&patient).Where("id = ? and status = 1", id).First(&patient).Error
+	return patient, err
+}

service/his_service.go

 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis          int64  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
 
 	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"`
+	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (VMHisOrder) TableName() string {
 }
 
 type HisPrescription 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"`
-	RecordDate   int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	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"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	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"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	MedType      string `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	OrderStatus  int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
 }
 
 func (HisPrescription) TableName() string {
 	PreTime            int64  `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
 	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	MedType            string `gorm:"column:med_type" json:"med_type" form:"med_type"`
 }
 
 func (HisPrescriptionTwo) TableName() string {
 }
 
 func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
-	err = writeDb.Save(&prescription).Error
+	tx := writeDb.Begin()
+
+	if err = tx.Model(&models.HisPrescription{}).Save(prescription).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
 	return
 }
 
 		}).
 		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)
+	}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND his_patient_id = ? AND order_status <> 2 AND order_status <> 3 AND p_type = ?", org_id, record_date, patient_id, his_patient_id, p_type).
 		Find(&prescription).Error
 	return
 }
 
-func GetSettleHisPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetSettleHisPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date int64, med_type 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("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND his_patient_id = ? AND p_type <> 1", org_id, record_date, patient_id, his_patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND his_patient_id = ? AND p_type <> 1 AND med_type = ?", org_id, record_date, patient_id, his_patient_id, med_type).
 		Find(&prescription).Error
 	return
 }
 
-func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_date int64, med_type 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("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1", org_id, start_date, end_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 AND med_type = ?", org_id, start_date, end_date, patient_id, med_type).
 		Find(&prescription).Error
 	return
 }
 		}).
 		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)
+	}).
 		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).
 		Find(&prescription).Error
 	return
 }
 
 func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
-	err = writeDb.Save(s).Error
+
+	tx := writeDb.Begin()
+	if err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+
 	return
 }
 
 func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
-	err = writeDb.Save(project).Error
+	tx := writeDb.Begin()
+	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+
 	return
 }
 
 }
 
 func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
-	err = writeDb.Save(&info).Error
-	return
+	tx := writeDb.Begin()
 
+	if err = tx.Model(&models.HisPrescription{}).Save(&info).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+	return
 }
 
 func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string, p_type int64) (order []*models.HisOrder, err error, total int64) {
 
 	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"`
+	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (HisOrder) TableName() string {
 
 	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"`
+	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (XtHisOrder) TableName() string {
 	Type                   int64                            `gorm:"column:type" json:"type" form:"type"`
 	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"doctor_advice"`
 	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	MedType                string                           `gorm:"column:med_type" json:"med_type" form:"med_type"`
 }
 
 func (VMHisPrescription) TableName() string {
 }
 
 type VMHisPrescriptionTwo 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"`
-	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"`
-	Type      int64 `gorm:"column:type" json:"type" form:"type"`
+	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"`
+	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"`
+	Type      int64  `gorm:"column:type" json:"type" form:"type"`
+	MedType   string `gorm:"column:med_type" json:"med_type" form:"med_type"`
 }
 
 func (VMHisPrescriptionTwo) TableName() string {
 	AcctPay            float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
 	CashPay            float64 `gorm:"column:cash_pay" json:"cash_pay" form:"cash_pay"`
 	Sumamt             float64 `gorm:"column:sumamt" json:"sumamt" form:"sumamt"`
+	Iinfo              string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	DiagnosisId        int64   `gorm:"column:diagnosis_id" json:"diagnosis_id" form:"diagnosis_id"`
+	DialysisCount      int64   `gorm:"-"`
+	PatientId          int64   `gorm:"column:patient_id" json:"dialysis_count" form:"dialysis_count"`
 }
 
 func GetCheckAccountFormData(start_time int64, end_time int64, org_id int64, insutype string) (cus []*CustomAccountFormData, err error) {
-	err = readDb.Raw("select o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt  from his_order o Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND insutype = ? Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
+	err = readDb.Raw("select o.patient_id as patient_id, p.diagnosis as diagnosis_id, p.iinfo as iinfo, o.medfee_sumamt as medfee_sumamt ,o.psn_name as psn_name ,p.id_card_no as id_card_no ,o.psn_no as psn_no, o.mdtrt_id as mdtrt_id, o.settle_accounts_date as settle_accounts_date,o.act_pay_dedc as act_pay_dedc,O.fund_pay_sumamt as fund_pay_sumamt,o.psn_cash_pay as psn_cash_pay ,o.acct_pay as acct_pay,o.psn_cash_pay as cash_pay,o.medfee_sumamt as sumamt  from his_order o  Join his_patient p On o.patient_id = p.patient_id AND o.settle_accounts_date = p.record_date where o.user_org_id = ? AND o.status = 1 AND o.order_status = 2  AND o.settle_accounts_date >= ? AND o.settle_accounts_date <= ? AND insutype = ? Group by o.id", org_id, start_time, end_time, insutype).Scan(&cus).Error
+
+	for _, item := range cus {
+		var total int64
+		readDb.Model(&models.DialysisOrder{}).Where("patient_id = ? AND status = 1 AND stage = 2 AND dialysis_date <= ? AND  dialysis_date >= ?", item.PatientId, end_time, start_time).Count(&total)
+		fmt.Println(total)
+		item.DialysisCount = total
+		fmt.Println(item.DialysisCount)
+	}
 	return
 }
 
 
 //"VMHisOrder", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date
 
+func GetNewAllUnChargeHisPatientList(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 = ?", 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", 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
+}
+
 func GetNewAllChargeHisPatientList(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 {
 
 	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"`
+	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (CustomInComeStatistics) TableName() string {
 		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")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND p_type = ? AND order_status == 2 ", 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 p_type = ? AND order_status = 2 ", org_id, start_date, end_date, patient_id, p_type).
+		Find(&prescription).Error
+	return
+}
+
+func GetChargeHisPrescriptionSeven(org_id int64, patient_id int64, order_number string, p_type 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("Drug", "status=1")
+		}).
+		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)
+	}).
+		Where("user_org_id = ? AND status = 1  AND patient_id = ? AND order_status = 2 AND batch_number = ? AND p_type = ?", org_id, patient_id, order_number, p_type).
 		Find(&prescription).Error
 	return
 }
+
+//已收费
+func GetChargeMonthHisPrescriptionFive(org_id int64, patient_id int64, order_number string, p_type 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("Drug", "status=1")
+		}).
+		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)
+	}).
+		Where("user_org_id = ? AND status = 1 AND batch_number = ? AND patient_id = ? AND order_status = 2 AND p_type = ?", org_id, order_number, patient_id, p_type).
+		Find(&prescription).Error
+	return
+}
+
+func UpdataHisPateint(his *models.HisPatient) {
+	writeDb.Save(&his)
+
+}
+
+func SaveHisOrder(his *models.HisOrder) (err error) {
+	err = writeDb.Save(&his).Error
+	return
+}