医保对接

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,33 +69,33 @@ 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 = 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()
@@ -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 = 10106
-		//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)
-		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/doctors_api_controller.go

@@ -103,7 +103,7 @@ func (c *DoctorsApiController) GetAllDoctorAndNurse() {
 func (c *DoctorsApiController) GetAllAdminUsers() {
 
 	adminUserInfo := c.GetAdminUserInfo()
-	users, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+	users, _ := service.GetAllAdminUsersTwo(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"users": users,
 	})

controllers/his_api_controller.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
+	"github.com/shopspring/decimal"
 	"math/rand"
 	"reflect"
 	"strconv"
@@ -25,6 +26,8 @@ type HisApiController struct {
 func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/hispatient/list", &HisApiController{}, "get:GetHisPatientList")
+	//beego.Router("/api/hispatient/list", &HisApiController{}, "get:GetHisPatientList")
+
 	beego.Router("/api/hispatient/get", &HisApiController{}, "get:GetHisPatientInfo")
 	beego.Router("/api/hisprescription/config", &HisApiController{}, "get:GetHisPrescriptionConfig")
 
@@ -42,13 +45,17 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
 	beego.Router("/api/doctorworkstation/casehistory/get", &HisApiController{}, "get:GetHisPatientCaseHistory")
 	beego.Router("/api/doctorworkstation/casehistory/create", &HisApiController{}, "get:CreateHisPatientCaseHistory")
+
 	beego.Router("/api/doctorworkstation/casehistorytemplate/create", &HisApiController{}, "get:CreateCaseHistoryTemplate")
+
 	beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
 
 	beego.Router("/api/hisorder/list", &HisApiController{}, "get:GetHisOrderList")
+
 	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/refund/post", &HisApiController{}, "post:Refund")
@@ -58,31 +65,24 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
 
 	//beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
-
 	//新增附加费用
 	//beego.Router("/api/his/additionalcharge", &HisApiController{}, "Post:AdditionalCharge")
-
 	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
-
 	beego.Router("/api/hisprescription/get", &HisApiController{}, "Get:GetLastOrNextHisPrescription")
-
 	beego.Router("/api/callhisprescription/get", &HisApiController{}, "Get:GetCallHisPrescription")
-
 	beego.Router("/api/dayprescription/get", &HisApiController{}, "get:GetHisDayPrescription")
-
 	beego.Router("/api/charge/list", &HisApiController{}, "get:GetHisChargePatientList")
 	beego.Router("/api/charge/info", &HisApiController{}, "get:GetHisChargePatientInfo")
-
 	beego.Router("/api/unregister/list", &HisApiController{}, "get:GetHisUnRegisterPatientList")
-
 	beego.Router("/api/orderdetail/get", &HisApiController{}, "get:GetAllOrderDetail")
 	beego.Router("/api/orderdetaicollect/get", &HisApiController{}, "get:GetAllOrderDetailCollect")
-
 	beego.Router("/api/cost/compare", &HisApiController{}, "get:GetMedicalInsuranceCostCompareList")
-
 	beego.Router("/api/record/list", &HisApiController{}, "get:GetPutOnRecordList")
 
-	//beego.Router("/api/export/template", &HisApiController{}, "get:ExportOrderTemplate")
+	beego.Router("/api/comparedata/get", &HisApiController{}, "get:GetCompareData")
+	beego.Router("/api/fapiao/get", &HisApiController{}, "get:GetFaPiaoData")
+
+	beego.Router("/api/incomestatistics/get", &HisApiController{}, "get:GetIncomeStatisticsData")
 
 }
 
@@ -135,11 +135,9 @@ func StrPtr(s string) uintptr {
 }
 
 func (c *HisApiController) GetHisPatientList() {
-	types, _ := c.GetInt64("type", 0)
 	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)
@@ -147,83 +145,29 @@ func (c *HisApiController) GetHisPatientList() {
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients, _ := service.GetNewHisPatientList(adminInfo.CurrentOrgId, recordDateTime)
 	patients_two, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime, 0)
-	patients = append(patients, patients_two...)
-	patients = RemoveRepeatedPatient(patients)
-
-	var total_one int64
-	var total_two int64
-
 	//获取当前用户的信息
 	adminUserInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, adminInfo.AdminUser.Id)
 	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(adminInfo.CurrentOrgId)
-
-	for _, item := range patients {
-
-		if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
-			total_one = total_one + 1
-		}
-		if item.HisPrescription != nil && len(item.HisPrescription) > 0 {
-			total_two = total_two + 1
-		}
-	}
-
-	if types == 0 {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"list":       patients,
-			"total_one":  total_one,
-			"total_two":  total_two,
-			"info":       adminUserInfo,
-			"doctors":    doctors,
-			"department": department,
-		})
-
-	} else if types == 1 { //未就诊
-		var patientsOne []*service.Patients
-		for _, item := range patients {
-			if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
-				patientsOne = append(patientsOne, item)
-			}
-		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"list":       patientsOne,
-			"total_one":  total_one,
-			"total_two":  total_two,
-			"info":       adminUserInfo,
-			"doctors":    doctors,
-			"department": department,
-		})
-
-	} else if types == 2 { //已就诊
-		var patientsTwo []*service.Patients
-		for _, item := range patients {
-
-			if item.HisPrescription != nil && len(item.HisPrescription) > 0 {
-				patientsTwo = append(patientsTwo, item)
-			}
-		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"list":       patientsTwo,
-			"total_one":  total_one,
-			"total_two":  total_two,
-			"info":       adminUserInfo,
-			"doctors":    doctors,
-			"department": department,
-		})
-	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":       patients,
+		"list_two":   patients_two,
+		"info":       adminUserInfo,
+		"doctors":    doctors,
+		"department": department,
+	})
 
 }
 func (c *HisApiController) GetHisPatientInfo() {
 	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
 	record_date := c.GetString("record_date")
 	number := c.GetString("number")
-
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
@@ -232,32 +176,27 @@ func (c *HisApiController) GetHisPatientInfo() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-
 	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	if err != nil {
 
 	}
 	startRecordDateTime := startTime.Unix()
-
 	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	if err != nil {
 
 	}
 	endRecordDateTime := endTime.Unix()
-
 	admin := c.GetAdminUserInfo()
-	his_patient_info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	his_patient_info, _ := service.GetNewHisPatientInfoTwo(admin.CurrentOrgId, his_patient_id, recordDateTime)
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
-	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
+	prescriptions, _ := service.GetNewHisPrescription(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
 	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
-
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":            his_patient_info,
 		"xt_info":             xt_patient_info,
@@ -392,6 +331,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
+		var tempPrescription *models.HisPrescription
 		if len(prescriptions) > 0 {
 			for _, item := range prescriptions {
 				items := item.(map[string]interface{})
@@ -402,6 +342,8 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 				id := int64(items["id"].(float64))
 
+				new_prescription, _ := service.GetPrescriptionById(id, adminInfo.CurrentOrgId)
+				tempPrescription = &new_prescription
 				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
 					utils.ErrorLog("type")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -409,6 +351,15 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 				types := int64(items["type"].(float64))
 
+				if items["order_status"] == nil || reflect.TypeOf(items["order_status"]).String() != "float64" {
+					utils.ErrorLog("order_status")
+				}
+				order_status := int64(items["order_status"].(float64))
+
+				if order_status == 0 {
+					order_status = 1
+				}
+
 				if items["pre_time"] == nil || reflect.TypeOf(items["pre_time"]).String() != "string" {
 					utils.ErrorLog("pre_time")
 				}
@@ -423,25 +374,39 @@ func (c *HisApiController) CreateHisPrescription() {
 				pTime := theTime2.Unix()
 
 				ctime := time.Now().Unix()
-				prescription := &models.HisPrescription{
-					ID:                 id,
-					PatientId:          patient_id,
-					UserOrgId:          adminInfo.CurrentOrgId,
-					RecordDate:         recordDateTime,
-					Ctime:              ctime,
-					Mtime:              ctime,
-					Type:               types,
-					Modifier:           adminInfo.AdminUser.Id,
-					Creator:            adminInfo.AdminUser.Id,
-					Status:             1,
-					Doctor:             role.UserName,
-					HisPatientId:       his_patient_id,
-					OrderStatus:        1,
-					BatchNumber:        "",
-					PrescriptionNumber: hpInfo.PrescriptionNumber,
-					PreTime:            pTime,
+
+				if tempPrescription.ID == 0 {
+					prescription := &models.HisPrescription{
+						ID:                 id,
+						PatientId:          patient_id,
+						UserOrgId:          adminInfo.CurrentOrgId,
+						RecordDate:         recordDateTime,
+						Ctime:              ctime,
+						Mtime:              ctime,
+						Type:               types,
+						Modifier:           adminInfo.AdminUser.Id,
+						Creator:            adminInfo.AdminUser.Id,
+						Status:             1,
+						Doctor:             role.UserName,
+						HisPatientId:       his_patient_id,
+						OrderStatus:        order_status,
+						BatchNumber:        "",
+						PrescriptionNumber: hpInfo.PrescriptionNumber,
+						PreTime:            pTime,
+					}
+					tempPrescription = prescription
+					service.SaveHisPrescription(tempPrescription)
+
+				} else {
+					tempPrescription.Type = types
+					tempPrescription.Modifier = adminInfo.AdminUser.Id
+					tempPrescription.Mtime = time.Now().Unix()
+					tempPrescription.Doctor = role.UserName
+					tempPrescription.OrderStatus = order_status
+					tempPrescription.PreTime = pTime
+					service.SaveHisPrescription(tempPrescription)
+
 				}
-				service.SaveHisPrescription(prescription)
 
 				//更改患者挂号状态
 				_, err2 := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.CurrentOrgId)
@@ -455,7 +420,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					if len(advices) > 0 {
 						for _, advice := range advices {
 							var s models.HisDoctorAdviceInfo
-							s.PrescriptionId = prescription.ID
+							s.PrescriptionId = tempPrescription.ID
 							s.AdviceType = 2
 							s.AdviceDoctor = doctor_id
 							s.StopState = 2
@@ -464,7 +429,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.Status = 1
 							s.UserOrgId = adminInfo.CurrentOrgId
 							s.RecordDate = recordDateTime
-							s.StartTime = prescription.PreTime
+							s.StartTime = tempPrescription.PreTime
 							s.Groupno = groupNo
 							s.CreatedTime = ctime
 							s.UpdatedTime = mtime
@@ -492,7 +457,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					if len(projects) > 0 {
 						for _, project := range projects {
 							var p models.HisPrescriptionProject
-							p.PrescriptionId = prescription.ID
+							p.PrescriptionId = tempPrescription.ID
 							p.Ctime = time.Now().Unix()
 							p.Mtime = time.Now().Unix()
 							p.PatientId = patient_id
@@ -525,7 +490,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					if len(addition) > 0 {
 						for _, item := range addition {
 							var s models.HisAdditionalCharge
-							s.PrescriptionId = prescription.ID
+							s.PrescriptionId = tempPrescription.ID
 							s.Status = 1
 							s.UserOrgId = adminInfo.CurrentOrgId
 							s.RecordDate = recordDateTime
@@ -2104,14 +2069,28 @@ func (c *HisApiController) GetRegisterInfo() {
 		return
 	}
 
-	timeStr := time.Now().Format("2006-01-02")
-	timeArr := strings.Split(timeStr, "-")
-	var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)
+	his, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+	if len(his) >= 1 {
+		order, _ := service.GetNewHisOrderTwo(adminInfo.CurrentOrgId, his[len(his)-1].Number, his[len(his)-1].PatientId, recordDateTime)
+		if len(his) >= 1 && order.ID == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisPatientParamWrong)
+			return
+		}
+	}
+
+	timeStr := time.Now().Format("2006-01-02 15:04:05")
+	fmt.Println(timeStr)
+	timeArr := strings.Split(timeStr, " ")
+	fmt.Println(timeArr)
 
-	his, err := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+	timeArrTwo := strings.Split(timeArr[0], "-")
+	timeArrThree := strings.Split(timeArr[1], ":")
+	var str = timeArrTwo[0] + timeArrTwo[1] + timeArrTwo[2] + timeArrThree[0] + timeArrThree[1] + timeArrThree[2] + strconv.FormatInt(patient.ID, 10)
 
-	var hisPatient models.XtHisPatient
-	if err == gorm.ErrRecordNotFound || his.ID == 0 {
+	lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+
+	if len(lists) == 0 {
+		var hisPatient models.XtHisPatient
 		hisPatient = models.XtHisPatient{
 			Name:                   name,
 			Age:                    age,
@@ -2144,19 +2123,68 @@ 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,
 		})
+
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisRegisterException)
-		return
+
+		//chrgBchno := rand.Intn(1000000) + 10000
+		var hisPatient models.XtHisPatient
+		hisPatient = models.XtHisPatient{
+			Name:                   name,
+			Age:                    age,
+			Gender:                 gender,
+			Birthday:               birthUnix,
+			Phone:                  phone,
+			MedicalTreatmentType:   medical_care,
+			IdType:                 certificates,
+			IdCardNo:               id_card,
+			BalanceAccountsType:    settlementValue,
+			SocialType:             social_type,
+			MedicalInsuranceNumber: medical_insurance_card,
+			RegisterType:           register_type,
+			RegisterCost:           registration_fee,
+			TreatmentCost:          medical_expenses,
+			AdminUserId:            adminInfo.AdminUser.Id,
+			UserOrgId:              adminInfo.CurrentOrgId,
+			Status:                 1,
+			RecordDate:             recordDateTime,
+			IsReturn:               1,
+			PatientId:              patient.ID,
+			Ctime:                  time.Now().Unix(),
+			Mtime:                  time.Now().Unix(),
+			Number:                 str,
+			IdCardType:             id_card_type,
+			Departments:            department,
+			Doctor:                 doctor,
+			PType:                  reg_type,
+			Diagnosis:              diagnosis_id,
+			SickType:               sick_type,
+		}
+		service.CreateHisPatient(&hisPatient)
+
+		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)+ ""
+
 }
 
 //上传明细----结算
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
@@ -2183,7 +2211,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 	if settle_accounts_type == 1 { //日结
 
-		prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
+		prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime)
 
 	} else { //月结
 		start_time_str := c.GetString("start_time")
@@ -2207,7 +2235,12 @@ func (c *HisApiController) GetUploadInfo() {
 		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
 	}
 
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+
+	fmt.Println("~~~~~~~~~")
+	fmt.Println(his.Number)
+	fmt.Println("~~~~~~~~~")
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -2250,6 +2283,7 @@ func (c *HisApiController) GetUploadInfo() {
 		Mtime:                 time.Now().Unix(),
 		Status:                1,
 		OrderStatus:           2,
+		MdtrtId:               his.Number,
 		Number:                chrg_bchno,
 		MedfeeSumamt:          totals,
 		PayWay:                pay_way,
@@ -2573,17 +2607,20 @@ func (c *HisApiController) GetHisChargePatientList() {
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	var patients []*service.Patients
-	var patients_two []*service.Patients
+	//tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	tempPatients, _ := service.GetNewAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+
+	var patients []*service.NewTempPatients
+	var patients_two []*service.NewTempPatients
 
 	for _, item := range tempPatients {
 		//过滤掉没挂号的和没开处方的
-		if item.HisPatient.ID > 0 || len(item.HisPrescription) > 0 {
+		if len(item.HisPatient) > 0 || len(item.HisPrescription) > 0 {
 			patients = append(patients, item)
 		}
+
 		//过滤掉没挂号的
-		if item.HisPatient.ID > 0 {
+		if len(item.HisPatient) > 0 {
 			patients_two = append(patients_two, item)
 		}
 	}
@@ -2613,7 +2650,6 @@ func (c *HisApiController) GetHisUnRegisterPatientList() {
 			patients = append(patients, item)
 		}
 	}
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": patients,
 		//"list_two":	patients_two,
@@ -2640,12 +2676,10 @@ func RemoveRepeatedPatient(patient []*service.Patients) (newArr []*service.Patie
 
 func (c *HisApiController) GetHisChargePatientInfo() {
 	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
 	record_date := c.GetString("record_date")
-	number := c.GetString("number")
-
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
-
 	order_status, _ := c.GetInt64("type", 0)
 
 	timeLayout := "2006-01-02"
@@ -2670,30 +2704,26 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 	endRecordDateTime := endTime.Unix()
 
 	admin := c.GetAdminUserInfo()
-	his_patient_info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	his_patient_info, _ := service.GetNewHisPatientInfo(his_patient_id)
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
 
 	var prescriptions []*models.HisPrescription
 
 	if order_status == 1 || order_status == 0 {
-		prescriptions, _ = service.GetUnChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, recordDateTime)
+		prescriptions, _ = service.GetUnChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
 	} else if order_status == 2 {
-		prescriptions, _ = service.GetChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, recordDateTime)
+		prescriptions, _ = service.GetChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
 	}
 
 	var monthPrescriptions []*models.HisPrescription
-
 	if order_status == 1 || order_status == 0 {
 		monthPrescriptions, _ = service.GetUnChargeMonthHisPrescriptionThree(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 	} else if order_status == 2 {
 		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFour(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
-
 	}
-
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
-
+	order, _ := service.GetNewHisOrder(admin.CurrentOrgId, his_patient_info.Number, patient_id)
 	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
@@ -2758,6 +2788,24 @@ func (c *HisApiController) GetMedicalInsuranceCostCompareList() {
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
 	keywords := c.GetString("keywords")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	//clr_type := c.GetString("clr_type")
+	insutype := c.GetString("insutype")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		theEndtTIme = theTime.Unix()
+	}
 
 	if page <= 0 {
 		page = 1
@@ -2765,7 +2813,7 @@ func (c *HisApiController) GetMedicalInsuranceCostCompareList() {
 	if limit <= 0 {
 		limit = 10
 	}
-	list, total, _ := service.GetMedicalInsuranceCostCompareList(c.GetAdminUserInfo().CurrentOrgId, page, limit, keywords)
+	list, total, _ := service.GetMedicalInsuranceCostCompareList(c.GetAdminUserInfo().CurrentOrgId, page, limit, keywords, insutype, theStartTIme, theEndtTIme)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"total": total,
 		"list":  list,
@@ -2795,11 +2843,242 @@ func (c *HisApiController) GetPutOnRecordList() {
 
 }
 
-//func (c *HisApiController)ExportOrderTemplate(){
-//	start_time := c.GetString("start_time")
-//	end_time := c.GetString("end_time")
-//
-//
-//
-//
-//}
+func (c *HisApiController) GetCompareData() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	insutype := c.GetString("insutype")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			theStartTIme = 0
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			theEndtTIme = 0
+		}
+		theEndtTIme = theTime.Unix()
+	}
+	formData, err := service.GetCheckAccountFormData(theStartTIme, theEndtTIme, c.GetAdminUserInfo().CurrentOrgId, insutype)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": formData,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+
+	}
+}
+
+func (c *HisApiController) GetFaPiaoData() {
+	order_id, _ := c.GetInt64("order_id")
+	patient_id, _ := c.GetInt64("patient_id")
+
+	adminUser := c.GetAdminUserInfo()
+	order, _ := service.GetHisOrderByID(order_id)
+	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
+
+	patientPrescription, _ := service.FindLastPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, order.SettleAccountsDate)
+
+	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+
+	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, order.SettleAccountsDate)
+
+	var bedCostTotal float64 = 0         //床位总费
+	var bedCostSelfTotal float64 = 0     //床位自费
+	var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+
+	var operationCostTotal float64 = 0         //手术费
+	var operationCostSelfTotal float64 = 0     //手术费
+	var operationCostPartSelfTotal float64 = 0 //手术费
+
+	var otherCostTotal float64 = 0         //其他费用
+	var otherCostSelfTotal float64 = 0     //其他费用
+	var otherCostPartSelfTotal float64 = 0 //其他费用
+
+	var materialCostTotal float64 = 0         //材料费
+	var materialCostSelfTotal float64 = 0     //材料费
+	var materialCostPartSelfTotal float64 = 0 //材料费
+
+	var westernMedicineCostTotal float64 = 0         //西药费
+	var westernMedicineCostSelfTotal float64 = 0     //西药费
+	var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+
+	var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+	var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+	var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+
+	var checkCostTotal float64 = 0         //检查费
+	var checkCostSelfTotal float64 = 0     //检查费
+	var checkCostPartSelfTotal float64 = 0 //检查费
+
+	var laboratoryCostTotal float64 = 0         //化验费
+	var laboratoryCostSelfTotal float64 = 0     //化验费
+	var laboratoryCostPartSelfTotal float64 = 0 //化验费
+
+	var treatCostTotal float64 = 0         //治疗费用
+	var treatCostSelfTotal float64 = 0     //治疗费用
+	var treatCostPartSelfTotal float64 = 0 //治疗费用
+
+	decimal.DivisionPrecision = 2
+
+	for _, item := range orderInfos {
+		if item.MedChrgitmType == "01" { //床位费
+			bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "03" { //检查费
+			checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "04" { //化验费
+			laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "05" { //治疗费
+			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "06" { //手术费
+			operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "08" { //材料费
+			materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "09" { //西药费
+			westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "11" { //中成费
+			chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+		if item.MedChrgitmType == "14" { //其他费
+			otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+		}
+
+	}
+
+	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,           //收款员
+
+		"bedCostTotal":                                bedCostTotal,
+		"bedCostSelfTotal":                            bedCostSelfTotal,
+		"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
+		"operationCostTotal":                          operationCostTotal,
+		"operationCostSelfTotal":                      operationCostSelfTotal,
+		"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
+		"otherCostTotal":                              otherCostTotal,
+		"otherCostSelfTotal":                          otherCostSelfTotal,
+		"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
+		"materialCostTotal":                           materialCostTotal,
+		"materialCostSelfTotal":                       materialCostSelfTotal,
+		"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
+		"westernMedicineCostTotal":                    westernMedicineCostTotal,
+		"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
+		"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
+		"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
+		"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
+		"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
+		"checkCostTotal":                              checkCostTotal,
+		"checkCostSelfTotal":                          checkCostSelfTotal,
+		"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
+		"laboratoryCostTotal":                         laboratoryCostTotal,
+		"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
+		"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
+		"treatCostTotal":                              treatCostTotal,
+		"treatCostSelfTotal":                          treatCostSelfTotal,
+		"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
+	})
+
+}
+
+func (this *HisApiController) GetIncomeStatisticsData() {
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	key_words := this.GetString("key_words")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+	statistics_type, _ := this.GetInt64("statistics_type")
+	admin := this.GetAdminUserInfo()
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			theStartTIme = 0
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			theEndtTIme = 0
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	if statistics_type == 1 {
+		list, total, _ := service.GetDayIncomeStatisticsData(admin.CurrentOrgId, key_words, theStartTIme, theEndtTIme, page, limit)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+	} else {
+		list, total, _ := service.GetDayIncomeDetailStatisticsData(admin.CurrentOrgId, key_words, theStartTIme, theEndtTIme, page, limit)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+
+	}
+
+}

controllers/his_project_api_controller.go

@@ -805,55 +805,65 @@ func (this *HisProjectApiController) SaveHisPatient() {
 		return
 	}
 
-	timeStr := time.Now().Format("2006-01-02")
-	timeArr := strings.Split(timeStr, "-")
-	var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)
-
-	his, err := service.GetHisPatientInfo(adminUserInfo.CurrentOrgId, patient.ID, recordDate.Unix())
-
-	var hisPatient models.XtHisPatient
-	if err == gorm.ErrRecordNotFound || his.ID == 0 {
-		hisPatient = models.XtHisPatient{
-			PatientId:              patient_id,
-			Birthday:               birthUnix,
-			IdType:                 certificates,
-			CostOfProduction:       cost_float,
-			Departments:            department,
-			Doctor:                 doctor,
-			AdminUserId:            adminUserInfo.AdminUser.Id,
-			MedicalTreatmentType:   medicalcare,
-			IdCardNo:               idcard,
-			IsNeedCostOfProduction: cost_checked,
-			TreatmentCost:          medicalExpense_float,
-			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                name,
-			Age:                 age,
-			Number:              str,
-			RegisterType:        register,
-			RegisterCost:        registrationfees_float,
-			BalanceAccountsType: settlementValue,
-			Gender:              sex,
-			Total:               totals_float,
-			UserOrgId:           orgId,
-			Status:              1,
-			RecordDate:          nowtime,
-			IsReturn:            1,
-			Ctime:               time.Now().Unix(),
-			Phone:               phone,
-			SocialType:          social_type,
-			IdCardType:          id_card_type,
-			Diagnosis:           diagnosis_id,
-			PType:               reg_type,
-			SickType:            sick_type,
+	timeStr := time.Now().Format("2006-01-02 15:04:05")
+	fmt.Println(timeStr)
+	timeArr := strings.Split(timeStr, " ")
+	timeArrTwo := strings.Split(timeArr[0], "-")
+	timeArrThree := strings.Split(timeArr[1], ":")
+	var str = timeArrTwo[0] + timeArrTwo[1] + timeArrTwo[2] + timeArrThree[0] + timeArrThree[1] + timeArrThree[2] + strconv.FormatInt(patient.ID, 10)
+
+	his, _ := service.GetHisPatientInfoTwo(adminUserInfo.CurrentOrgId, patient.ID, recordDate.Unix())
+	if len(his) >= 1 {
+		order, _ := service.GetNewHisOrderTwo(adminUserInfo.CurrentOrgId, his[len(his)-1].Number, his[len(his)-1].PatientId, recordDate.Unix())
+		if len(his) >= 1 && order.ID == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisPatientParamWrong)
+			return
 		}
-		service.CreateHisPatient(&hisPatient)
-		this.ServeSuccessJSON(map[string]interface{}{
-			"his_info": hisPatient,
-		})
-	} else {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisRegisterException)
-		return
 	}
+	var hisPatient models.XtHisPatient
+	//if err == gorm.ErrRecordNotFound || his.ID == 0 {
+	hisPatient = models.XtHisPatient{
+		PatientId:              patient_id,
+		Birthday:               birthUnix,
+		IdType:                 certificates,
+		CostOfProduction:       cost_float,
+		Departments:            department,
+		Doctor:                 doctor,
+		AdminUserId:            adminUserInfo.AdminUser.Id,
+		MedicalTreatmentType:   medicalcare,
+		IdCardNo:               idcard,
+		IsNeedCostOfProduction: cost_checked,
+		TreatmentCost:          medicalExpense_float,
+		MedicalInsuranceNumber: medicalinsurancecard,
+		Name:                name,
+		Age:                 age,
+		Number:              str,
+		RegisterType:        register,
+		RegisterCost:        registrationfees_float,
+		BalanceAccountsType: settlementValue,
+		Gender:              sex,
+		Total:               totals_float,
+		UserOrgId:           orgId,
+		Status:              1,
+		RecordDate:          nowtime,
+		IsReturn:            1,
+		Ctime:               time.Now().Unix(),
+		Phone:               phone,
+		SocialType:          social_type,
+		IdCardType:          id_card_type,
+		Diagnosis:           diagnosis_id,
+		PType:               reg_type,
+		SickType:            sick_type,
+	}
+	service.CreateHisPatient(&hisPatient)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"his_info": hisPatient,
+	})
+	//}
+	//else {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisRegisterException)
+	//	return
+	//}
 
 }
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -248,6 +248,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+		var tempPrescription *models.HisPrescription
 
 		if len(prescriptions) > 0 {
 			for _, item := range prescriptions {
@@ -259,6 +260,9 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 				}
 				id := int64(items["id"].(float64))
 
+				new_prescription, _ := service.GetPrescriptionById(id, adminInfo.Org.Id)
+				tempPrescription = &new_prescription
+
 				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
 					utils.ErrorLog("type")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -266,6 +270,15 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 				}
 				types := int64(items["type"].(float64))
 
+				if items["order_status"] == nil || reflect.TypeOf(items["order_status"]).String() != "float64" {
+					utils.ErrorLog("order_status")
+				}
+				order_status := int64(items["order_status"].(float64))
+
+				if order_status == 0 {
+					order_status = 1
+				}
+
 				if items["pre_time"] == nil || reflect.TypeOf(items["pre_time"]).String() != "string" {
 					utils.ErrorLog("pre_time")
 				}
@@ -283,25 +296,35 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 				fmt.Println(pTime)
 
 				ctime := time.Now().Unix()
-				prescription := &models.HisPrescription{
-					ID:                 id,
-					PatientId:          patient_id,
-					UserOrgId:          adminInfo.Org.Id,
-					RecordDate:         recordDateTime,
-					Ctime:              ctime,
-					Mtime:              ctime,
-					Type:               types,
-					Modifier:           adminInfo.AdminUser.Id,
-					Creator:            adminInfo.AdminUser.Id,
-					Status:             1,
-					Doctor:             role.UserName,
-					HisPatientId:       his_patient_id,
-					OrderStatus:        1,
-					BatchNumber:        "",
-					PrescriptionNumber: hpInfo.PrescriptionNumber,
-					PreTime:            pTime,
+				if tempPrescription.ID == 0 {
+					prescription := &models.HisPrescription{
+						ID:                 id,
+						PatientId:          patient_id,
+						UserOrgId:          adminInfo.Org.Id,
+						RecordDate:         recordDateTime,
+						Ctime:              ctime,
+						Mtime:              ctime,
+						Type:               types,
+						Modifier:           adminInfo.AdminUser.Id,
+						Creator:            adminInfo.AdminUser.Id,
+						Status:             1,
+						Doctor:             role.UserName,
+						HisPatientId:       his_patient_id,
+						OrderStatus:        order_status,
+						BatchNumber:        "",
+						PrescriptionNumber: hpInfo.PrescriptionNumber,
+						PreTime:            pTime,
+					}
+					tempPrescription = prescription
+				} else {
+					tempPrescription.Type = types
+					tempPrescription.Modifier = adminInfo.AdminUser.Id
+					tempPrescription.Mtime = time.Now().Unix()
+					tempPrescription.Doctor = role.UserName
+					tempPrescription.OrderStatus = order_status
+					tempPrescription.PreTime = pTime
 				}
-				service.SaveHisPrescription(prescription)
+				service.SaveHisPrescription(tempPrescription)
 
 				//更改患者挂号状态
 				_, err2 := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.Org.Id)
@@ -315,7 +338,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 					if len(advices) > 0 {
 						for _, advice := range advices {
 							var s models.HisDoctorAdviceInfo
-							s.PrescriptionId = prescription.ID
+							s.PrescriptionId = tempPrescription.ID
 							s.AdviceType = 2
 							s.AdviceDoctor = doctor_id
 							s.StopState = 2
@@ -352,7 +375,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 					if len(projects) > 0 {
 						for _, project := range projects {
 							var p models.HisPrescriptionProject
-							p.PrescriptionId = prescription.ID
+							p.PrescriptionId = tempPrescription.ID
 							p.Ctime = time.Now().Unix()
 							p.Mtime = time.Now().Unix()
 							p.PatientId = patient_id

enums/error_code.go

@@ -228,6 +228,8 @@ const ( // ErrorCode
 	ErrorCodeNoBloodPatientException = 300002
 
 	ErrorCodeOrderParamWrong = 300003
+
+	ErrorCodeHisPatientParamWrong = 300004
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -446,6 +448,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeNoBloodPatientException: "找不到该患者,请先在系统录入患者信息或检查患者身份证信息",
 
 	ErrorCodeOrderParamWrong: "结算记录不存在",
+
+	ErrorCodeHisPatientParamWrong: "订单正在结算、请先结算完成",
 }
 
 type SGJError struct {

models/his_models.go

@@ -703,13 +703,15 @@ type HisOrder struct {
 	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
 
+	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"`
 
 	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	HisPatient          HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
+	HisPatient          HisPatient          `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"his_patient"`
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
 }
 

service/gobal_config_service.go

@@ -203,7 +203,7 @@ func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64)
 		db = db.Where("his_order.settle_accounts_date<=?", end_time)
 	}
 
-	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ?", user_org_id)
+	db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status > 1 ", user_org_id)
 
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).

service/his_project_service.go

@@ -262,6 +262,11 @@ func CreateHisPatient(patient *models.XtHisPatient) error {
 	return err
 }
 
+func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_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
@@ -290,8 +295,7 @@ func GetProjectListById(orgid int64, ids []string) (project []*models.XtHisProje
 func GetHisPatientHistory(keyword string, startime int64, endtime int64, registtype int64, limit int64, page int64, orgid int64) (hisPatient []*models.XtHisPatient, total int64, err error) {
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
-	db := XTReadDB().Table("his_patient as x").Where("x.status = 1")
-
+	db := XTReadDB().Table("his_patient as x")
 	if len(keyword) > 0 {
 		db = db.Where("x.name like ?", likeKey)
 	}
@@ -307,7 +311,6 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	db = db.Preload("HisOrder", "status = 1 AND user_org_id = ?", orgid)
 	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.is_return,x.doctor,x.ctime,x.social_type,x.phone,x.status").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Find(&hisPatient).Error
 	return hisPatient, total, err
 }

service/his_service.go

@@ -35,6 +35,7 @@ type HisPatient struct {
 	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"prescription"`
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	Number          string             `gorm:"column:number" json:"number" form:"number"`
+	VMHisOrder      VMHisOrder         `gorm:"ForeignKey:MdtrtId,PatientId;AssociationForeignKey:Number,PatientId" json:"order"`
 }
 
 func (HisPatient) TableName() string {
@@ -103,6 +104,8 @@ type VMHisOrder struct {
 	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"`
 	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	MdtrtId               string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	MzNumber              string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 }
 
 func (VMHisOrder) TableName() string {
@@ -191,6 +194,88 @@ func GetHisPatientList(org_id int64, keywords string, record_date int64) (patien
 	return
 }
 
+type PatientTwo 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"`
+	Name                  string                `gorm:"column:name" json:"name" form:"name"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo              string                `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType          int64                 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
+	HisPatient            []*HisPatientTwo      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
+	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+}
+
+func (PatientTwo) TableName() string {
+	return "xt_patients"
+}
+
+type HisPatientTwo struct {
+	ID                 int64                 `gorm:"column:id" json:"id" form:"id"`
+	Name               string                `gorm:"column:name" json:"name" form:"name"`
+	Gender             int64                 `gorm:"column:gender" json:"gender" form:"gender"`
+	Total              float64               `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId          int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64                 `gorm:"column:status" json:"status" form:"status"`
+	RecordDate         int64                 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	HisPrescriptionTwo []*HisPrescriptionTwo `gorm:"ForeignKey:PatientId,HisPatientId;AssociationForeignKey:PatientId,ID" json:"prescription"`
+	PatientId          int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number             string                `gorm:"column:number" json:"number" form:"number"`
+}
+
+func (HisPatientTwo) TableName() string {
+	return "his_patient"
+}
+
+type HisPrescriptionTwo 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"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	Type               int64  `gorm:"column:type" json:"type" form:"type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	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"`
+}
+
+func (HisPrescriptionTwo) TableName() string {
+	return "his_prescription"
+}
+
+func GetNewHisPatientList(org_id int64, record_date int64) (patients []*PatientTwo, err error) {
+	db := readDb.Model(&PatientTwo{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id).
+		Joins("join his_patient as hp ON hp.patient_id = xt_patients.id AND hp.record_date = ? AND hp.status = 1 AND hp.user_org_id = ?", record_date, org_id)
+	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("HisPrescriptionTwo", "status = 1 AND user_org_id = ?  AND record_date = ?", org_id, record_date).Where("user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
+	})
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("id").Find(&patients).Error
+	return
+}
+
+func GetNewScheduleHisPatientList(org_id int64, keywords string, record_date int64, sch_type int64) (patients []*Patients, err error) {
+	db := readDb.Model(&Patients{}).Select("xt_patients.id,xt_patients.user_org_id,xt_patients.name,xt_patients.status,xt_patients.id_card_no,sch.schedule_type as sch_type").Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+
+	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.status = 1 AND sch.user_org_id = ? AND sch.schedule_type = ?", record_date, org_id, sch_type)
+	} else {
+		db = db.Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ? ", record_date, org_id)
+	}
+
+	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("xt_patients.id").Order("sch_type").Find(&patients).Error
+	return
+}
+
 func GetAllBaseDrugStockList(org_id int64) (drugs []*models.BaseDrugLib, err error) {
 	err = readDb.Model(&models.BaseDrugLib{}).Where("user_org_id = ? AND status = 1", org_id).Find(&drugs).Error
 	return
@@ -201,6 +286,21 @@ func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info
 	return
 }
 
+func GetHisPatientInfoTwo(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
+	return
+}
+
+func GetHisPatientInfoList(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).Find(&info).Error
+	return
+}
+
+func GetNewHisPatientInfoTwo(org_id int64, id int64, record_date int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, id).First(&info).Error
+	return
+}
+
 func GetXTPatientInfo(org_id int64, patient_id int64) (info models.Patients, err error) {
 	err = readDb.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1  AND id = ?", org_id, patient_id).First(&info).Error
 	return
@@ -308,7 +408,7 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 	return
 }
 
-func GetChargeHisPrescriptionFive(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetNewHisPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date 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")
@@ -319,12 +419,12 @@ func GetChargeHisPrescriptionFive(org_id int64, patient_id int64, record_date in
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND his_patient_id = ? ", org_id, record_date, patient_id, his_patient_id).
 		Find(&prescription).Error
 	return
 }
 
-func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date 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")
@@ -335,12 +435,12 @@ func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, record_date
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2 AND his_patient_id = ?", org_id, record_date, patient_id, his_patient_id).
 		Find(&prescription).Error
 	return
 }
 
-func GetSettleHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, his_patient_id int64, record_date 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")
@@ -351,7 +451,23 @@ func GetSettleHisPrescription(org_id int64, patient_id int64, record_date int64)
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2", org_id, record_date, patient_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", org_id, record_date, patient_id, his_patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetSettleHisPrescription(org_id int64, patient_id int64, his_patient_id int64, record_date 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", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND his_patient_id = ?", org_id, record_date, patient_id, his_patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -609,8 +725,8 @@ func CreateHisPatientTwo(patient *models.VMHisPatient) error {
 	return err
 }
 
-func GetVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info models.VMHisPatient, err error) {
-	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
+func GetVMHisPatientInfo(org_id int64, id int64, record_date int64) (info models.VMHisPatient, err error) {
+	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, id).First(&info).Error
 	return
 }
 
@@ -669,7 +785,7 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int6
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id)
 
 	db = db.Count(&total)
-	err = db.Limit(limit).Offset(offset).Order("ctime desc").Find(&order).Error
+	err = db.Limit(limit).Offset(offset).Order("setl_time desc,ctime").Find(&order).Error
 	return
 }
 
@@ -1290,15 +1406,25 @@ func (MedicalInsuranceCostCompare) TableName() string {
 	return "medical_insurance_cost_compare"
 }
 
-func GetMedicalInsuranceCostCompareList(orgID, page, limit int64, keywords string) (list []*MedicalInsuranceCostCompare, total int, err error) {
+func GetMedicalInsuranceCostCompareList(orgID, page, limit int64, keywords string, insutype string, start_time int64, end_time int64) (list []*MedicalInsuranceCostCompare, total int, err error) {
 	offset := (page - 1) * limit
-	db := readDb.Model(&MedicalInsuranceCostCompare{}).Where("user_org_id = ?", orgID)
-
+	db := readDb.Model(&MedicalInsuranceCostCompare{}).Where("medical_insurance_cost_compare.user_org_id = ?", orgID)
 	if len(keywords) == 0 {
 		db = db.Where("status=1")
+		if len(insutype) != 0 {
+			db = db.Where("insutype = ?", insutype)
+		}
+		if start_time != 0 {
+			db = db.Where("ctime  >= ? ", start_time)
+		}
+		if end_time != 0 {
+			db = db.Where("ctime  <= ? ", end_time)
+		}
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 	} else {
-		db = db.Where("status=1")
+		keywords = "%" + keywords + "%"
+		db = db.Joins("join sgj_users.sgj_user_admin_role role  on role.admin_user_id = medical_insurance_cost_compare.creator and role.user_name Like ?", keywords)
+		db = db.Where("medical_insurance_cost_compare.status=1 ")
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 	}
 	return
@@ -1372,3 +1498,172 @@ func GetGdybPsnNcdsRecordList(orgID, page, limit int64, keywords string, is_canc
 
 	return
 }
+
+type CustomAccountFormData struct {
+	MedfeeSumamt       float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	PsnName            string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	IdCardNo           string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	PsnNo              string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	MdtrtiId           string  `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SettleAccountsDate int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	ActPayDedc         float64 `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	FundPaySumamt      float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnCashPay         float64 `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	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"`
+}
+
+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
+	return
+}
+
+func GetNewHisPatientInfo(his_patient_id int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("id = ? AND status = 1 ", his_patient_id).First(&info).Error
+	return
+}
+
+func GetNewHisOrder(user_org_id int64, mdtrt_id string, patient_id int64) (order HisOrder, err error) {
+	err = readDb.Model(&HisOrder{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND mdtrt_id=? ", user_org_id, patient_id, mdtrt_id).
+		Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPrescriptionInfo", "status = 1 AND user_org_id = ?", user_org_id).
+		Order("ctime desc").
+		Find(&order).Error
+	return
+}
+
+func GetNewHisOrderTwo(user_org_id int64, mdtrt_id string, patient_id int64, record_time int64) (order HisOrder, err error) {
+	err = readDb.Model(&HisOrder{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND mdtrt_id=? AND settle_accounts_date = ? ", user_org_id, patient_id, mdtrt_id, record_time).
+		Order("ctime desc").
+		Find(&order).Error
+	return
+}
+
+type NewCustomPatients 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"`
+	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"`
+	RecordDate int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	VMHisOrder VMHisOrder `gorm:"ForeignKey:PatientId,MdtrtId;AssociationForeignKey:PatientId,Number" json:"order"`
+}
+
+func (NewCustomPatients) TableName() string {
+	return "his_patients"
+}
+
+type NewSZCustomPatients 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"`
+	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"`
+	RecordDate int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	VMHisOrder VMHisOrder `gorm:"ForeignKey:PatientId,MdtrtId;AssociationForeignKey:PatientId,MzNumber" json:"order"`
+}
+
+func (NewSZCustomPatients) TableName() string {
+	return "his_patients"
+}
+
+//
+//func GetNewAllChargeHisPatientList(org_id int64, record_date int64) (patients []*NewSZCustomPatients, err error) {
+//	var tempPatients []*NewSZCustomPatients
+//	db := readDb.Model(&NewSZCustomPatients{}).Where("his_patients.user_org_id = ? AND his_patients.status = 1", org_id)
+//	db = db.Preload("VMHisOrder", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date)
+//	return tempPatients, err
+//}
+
+type NewTempPatients 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"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+
+	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
+	HisPatient            []*HisPatient         `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
+	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescription"`
+	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+}
+
+func (NewTempPatients) TableName() string {
+	return "xt_patients"
+}
+
+//"VMHisOrder", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date
+
+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 {
+		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrder", "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 = ?", org_id, record_date)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Find(&patients).Error
+	return
+}
+
+func GetPrescriptionById(id int64, org_id int64) (prescription models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).Where("id = ? AND user_org_id = ? AND status = 1", id, org_id).First(&prescription).Error
+	return
+}
+
+type CustomInComeStatistics struct {
+	PsnName            string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	SetlTime           string  `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	SettleAccountsDate string  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	MedfeeSumamt       float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FundPaySumamt      float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	HifobPay           float64 `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	HifmiPay           float64 `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifesPay           float64 `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	MafPay             float64 `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	CvlservPay         float64 `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PsnCashPay         float64 `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	DiscountPrice      float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice  float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	AcctPay            float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+}
+
+func (CustomInComeStatistics) TableName() string {
+	return "his_order"
+}
+
+func GetDayIncomeStatisticsData(org_id int64, keywords string, start_time int64, end_time int64, page int64, limit int64) (order []*CustomInComeStatistics, total int64, err error) {
+	offset := (page - 1) * limit
+	if len(keywords) != 0 {
+
+		err = readDb.Model(&CustomInComeStatistics{}).Select("sum(medfee_sumamt) as medfee_sumamt,sum(`fund_pay_sumamt`) as fund_pay_sumamt, sum(`hifob_pay`) as hifob_pay, sum(`hifmi_pay`) as hifmi_pay , sum(`hifes_pay`) as hifes_pay, sum(`maf_pay`) as maf_pay,sum(`cvlserv_pay`) as cvlserv_pay, sum(`discount_price`) as discount_price, sum(`preferential_price`) as preferential_price,sum(`acct_pay`)  as acct_pay,FROM_UNIXTIME(settle_accounts_date,'%Y-%m-%d') as settle_accounts_date").Where("user_org_id = ? AND status = 1 AND order_status = 2  ", org_id).Group("settle_accounts_date").Count(&total).Offset(offset).Limit(limit).Order("settle_accounts_date").Find(&order).Error
+
+	} else {
+
+		if start_time != 0 && end_time != 0 {
+			err = readDb.Model(&CustomInComeStatistics{}).Select("sum(medfee_sumamt) as medfee_sumamt,sum(`fund_pay_sumamt`) as fund_pay_sumamt, sum(`hifob_pay`) as hifob_pay, sum(`hifmi_pay`) as hifmi_pay , sum(`hifes_pay`) as hifes_pay, sum(`maf_pay`) as maf_pay,sum(`cvlserv_pay`) as cvlserv_pay, sum(`discount_price`) as discount_price, sum(`preferential_price`) as preferential_price,sum(`acct_pay`)  as acct_pay,FROM_UNIXTIME(settle_accounts_date,'%Y-%m-%d') as settle_accounts_date").Where("user_org_id = ? AND status = 1 AND order_status = 2  AND settle_accounts_date >= ? AND settle_accounts_date <= ?", org_id, start_time, end_time).Group("settle_accounts_date").Count(&total).Offset(offset).Limit(limit).Order("settle_accounts_date").Find(&order).Error
+		} else {
+			err = readDb.Model(&CustomInComeStatistics{}).Select("sum(medfee_sumamt) as medfee_sumamt,sum(`fund_pay_sumamt`) as fund_pay_sumamt, sum(`hifob_pay`) as hifob_pay, sum(`hifmi_pay`) as hifmi_pay , sum(`hifes_pay`) as hifes_pay, sum(`maf_pay`) as maf_pay,sum(`cvlserv_pay`) as cvlserv_pay, sum(`discount_price`) as discount_price, sum(`preferential_price`) as preferential_price,sum(`acct_pay`)  as acct_pay,FROM_UNIXTIME(settle_accounts_date,'%Y-%m-%d') as settle_accounts_date").Where("user_org_id = ? AND status = 1 AND order_status = 2  ", org_id).Group("settle_accounts_date").Count(&total).Offset(offset).Limit(limit).Order("settle_accounts_date").Find(&order).Error
+
+		}
+
+	}
+
+	return
+}
+
+func GetDayIncomeDetailStatisticsData(org_id int64, keywords string, start_time int64, end_time int64, page int64, limit int64) (cis []*CustomInComeStatistics, total int64, err error) {
+	offset := (page - 1) * limit
+	if len(keywords) != 0 {
+		err = readDb.Model(&CustomInComeStatistics{}).Select("psn_name,setl_time,medfee_sumamt,fund_pay_sumamt, hifob_pay,  hifmi_pay ,  hifes_pay,  maf_pay, cvlserv_pay, discount_price,preferential_price,acct_pay,FROM_UNIXTIME(settle_accounts_date,'%Y-%m-%d') as settle_accounts_date").Where("user_org_id = ? AND status = 1 AND order_status = 2  ", org_id).Count(&total).Offset(offset).Limit(limit).Order("settle_accounts_date").Find(&cis).Error
+	} else {
+		if start_time != 0 && end_time != 0 {
+			err = readDb.Model(&CustomInComeStatistics{}).Select("psn_name,setl_time,medfee_sumamt,fund_pay_sumamt, hifob_pay,  hifmi_pay ,  hifes_pay,  maf_pay, cvlserv_pay, discount_price,preferential_price,acct_pay,FROM_UNIXTIME(settle_accounts_date,'%Y-%m-%d') as settle_accounts_date").Where("user_org_id = ? AND status = 1 AND order_status = 2 AND  settle_accounts_date >= ? AND settle_accounts_date <= ?  ", org_id, start_time, end_time).Count(&total).Offset(offset).Limit(limit).Order("settle_accounts_date").Find(&cis).Error
+		} else {
+			err = readDb.Model(&CustomInComeStatistics{}).Select("psn_name,setl_time,medfee_sumamt,fund_pay_sumamt, hifob_pay,  hifmi_pay ,  hifes_pay,  maf_pay, cvlserv_pay, discount_price,preferential_price,acct_pay,FROM_UNIXTIME(settle_accounts_date,'%Y-%m-%d') as settle_accounts_date").Where("user_org_id = ? AND status = 1 AND order_status = 2", org_id).Count(&total).Offset(offset).Limit(limit).Order("settle_accounts_date").Find(&cis).Error
+		}
+	}
+	return
+}

service/user_service.go

@@ -55,6 +55,14 @@ func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 	return
 }
 
+func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
+	//fmt.Println("orgid", orgId)
+	//fmt.Println("appid", appid)
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	return
+}
+
 func GetAdminUser(orgId, appid, id int64) (*AdminUserList, error) {
 	var err error
 	var user AdminUserList