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

controllers/his_api_controller.go

@@ -797,6 +797,8 @@ func (c *PublicApiController) GetBaiLinExportData() {
 
 func (c *HisApiController) GetHisUnChargePatientList() {
 	record_date := c.GetString("record_date")
+	sch_type, _ := c.GetInt64("sch_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
@@ -808,7 +810,7 @@ func (c *HisApiController) GetHisUnChargePatientList() {
 	adminInfo := c.GetAdminUserInfo()
 	var tempPatients []*service.NewTempPatients
 	//tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
 	var patients []*service.NewTempPatients
 	var patients_two []*service.NewTempPatients
 
@@ -6201,6 +6203,7 @@ func (c *HisApiController) GetHisOrderList() {
 	charge_type, _ := c.GetInt64("charge_type", 0)
 	sch_type, _ := c.GetInt64("sch_type", 0)
 	zone_type, _ := c.GetInt64("zone_type", 0)
+	med_type, _ := c.GetInt64("med_type", 0)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -6227,7 +6230,7 @@ func (c *HisApiController) GetHisOrderList() {
 
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type)
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type, sch_type, zone_type, med_type)
 
 	for _, item := range order {
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
@@ -6797,6 +6800,26 @@ func (c *HisApiController) GetUploadInfo() {
 
 	dec_way := c.GetString("dec_way") //是否使用押金支付bool类型
 	tmp_decimal := c.GetString("tmp_decimal")
+
+	//last_order, _ := service.GetLastHisOrderThree(c.GetAdminUserInfo().CurrentOrgId)
+	max_order, _ := service.GetLastHisOrderTwo(c.GetAdminUserInfo().CurrentOrgId)
+	count, _ := strconv.ParseInt(max_order.FaPiaoNumber, 10, 64)
+	fmt.Println(count)
+	var zero string
+	number := count + 1
+	if number >= 1000 {
+		zero = "0000" + strconv.FormatInt(number, 10)
+	} else if number >= 10000 {
+		zero = "000" + strconv.FormatInt(number, 10)
+	} else if number >= 100000 {
+		zero = "00" + strconv.FormatInt(number, 10)
+	} else if number >= 1000000 {
+		zero = "0" + strconv.FormatInt(number, 10)
+	} else {
+		zero = strconv.FormatInt(number, 10)
+	}
+	fapiao_number = zero
+
 	var decimal float64 //本次使用的押金
 	var errmsg error
 	tx := service.XTWriteDB().Begin() //开了事务
@@ -7690,6 +7713,7 @@ func (this *HisApiController) GetHisDayPrescription() {
 func (c *HisApiController) GetHisChargePatientList() {
 	record_date := c.GetString("record_date")
 	order_status, _ := c.GetInt64("type")
+	sch_type, _ := c.GetInt64("sch_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -7703,9 +7727,9 @@ func (c *HisApiController) GetHisChargePatientList() {
 	var tempPatients []*service.NewTempPatients
 	//tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
 	if order_status != 2 {
-		tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+		tempPatients, _ = service.GetNewAllUnChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
 	} else {
-		tempPatients, _ = service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+		tempPatients, _ = service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, sch_type)
 	}
 
 	var patients []*service.NewTempPatients
@@ -8867,8 +8891,9 @@ func (c *HisApiController) GetFaPiaoData() {
 	admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order_number":                        order.Number,             //业务流水号
-		"id_card_no":                          his.IdCardNo,             //社会保障号
+		"order_number":                        order.Number, //业务流水号
+		"id_card_no":                          his.IdCardNo, //社会保障号
+		"patient":                             patient,
 		"department_name":                     department.Name,          //科室
 		"number":                              his.Number,               //门诊号
 		"date":                                order.SettleAccountsDate, //结算日期

service/his_service.go

@@ -975,7 +975,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return
 }
 
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64) (order []*models.HisOrder, err error, total int64) {
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64, sch_type int64, zone_type int64, med_type int64) (order []*models.HisOrder, err error, total int64) {
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisOrder{})
 
@@ -998,6 +998,10 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id  AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.partition_id = ? AND sch.status = 1", start_time_timestamp, end_time_timestamp, zone_type)
 	}
 
+	if med_type > 0 {
+		db = db.Where("his_order.med_type = ?", med_type)
+	}
+
 	//if zone_type > 0 {
 	//	db = db.Joins("join xt_schedule sch_two on sch_two.schedule_date = his_order.settle_accounts_date AND sch_two.patient_id = his_order.patient_id AND sch_two.partition_id = ?", zone_type)
 	//}
@@ -2116,8 +2120,13 @@ func (NewTempPatients) TableName() string {
 
 //"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)
+func GetNewAllUnChargeHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*NewTempPatients, err error) {
+	db := readDb.Model(&NewTempPatients{})
+	//if sch_type > 0 {
+	//	db = db.Joins("join xt_schedule as sch on sch.patient_id = xt_patients.id and sch.schedule_date = ? and sch.schedule_type = ?", record_date, sch_type)
+	//}
+	db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Preload("Schedule", "status = 1")
 	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)
 	})
@@ -2136,13 +2145,19 @@ func GetNewAllUnChargeHisPatientList(org_id int64, keywords string, record_date
 	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)
+func GetNewAllChargeHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*NewTempPatients, err error) {
+	db := readDb.Model(&NewTempPatients{})
+
+	//if sch_type > 0 {
+	//	db = db.Joins("join xt_schedule as sch on sch.patient_id = xt_patients.id and sch.schedule_date = ? and sch.schedule_type = ?", record_date, sch_type)
+	//}
+	db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db = db.Preload("Schedule", "status = 1")
 	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", org_id, record_date).Find(&patients).Error
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Find(&patients).Group("xt_patients.id").Error
 
 	for _, item := range patients {
 		for _, sumItem := range item.HisPatient {
@@ -2840,3 +2855,13 @@ func GetHisPrescriptionByBatchNumber(org_id int64, number string) (prescription
 		Find(&prescription).Error
 	return
 }
+
+func GetLastHisOrderThree(org_id int64) (err error, o models.HisOrder) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? and status = 1 and order_status = 2", org_id).First(&o).Error
+	return
+}
+
+func GetLastHisOrderTwo(org_id int64) (his models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Select("max(convert(fa_piao_number,signed)) as fa_piao_number").Where("user_org_id = ? AND status = 1 AND order_status = 2 ", org_id).Find(&his).Error
+	return
+}