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

controllers/his_api_controller.go

@@ -1254,8 +1254,24 @@ func (c *HisApiController) GetRegisterInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
 
+	name := c.GetString("name")
+	gender, _ := c.GetInt64("gender")
+	age, _ := c.GetInt64("age")
+	birthday := c.GetString("birthday")
+	phone := c.GetString("phone")
+	medical_care, _ := c.GetInt64("medical_care")
+	id_card := c.GetString("id_card")
+	register_type, _ := c.GetInt64("register_type")
+	registration_fee, _ := c.GetFloat("registration_fee")
+	medical_expenses, _ := c.GetFloat("medical_expenses")
+	certificates, _ := c.GetInt64("certificates")
+	settlementValue, _ := c.GetInt64("settlement_value")
+	social_type, _ := c.GetInt64("social_type")
+	medical_insurance_card := c.GetString("medical_insurance_card")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
+	birthUnix := birthdays.Unix()
 
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 	if err != nil {
@@ -1454,28 +1470,43 @@ func (c *HisApiController) GetRegisterInfo() {
 		}
 
 	} else {
+		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(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+		var hisPatient models.XtHisPatient
 		if err == gorm.ErrRecordNotFound || his.ID == 0 {
-			patient := models.XtHisPatient{
-				Age:         patient.Age,
-				Birthday:    patient.Birthday,
-				AdminUserId: adminInfo.AdminUser.Id,
-				IdCardNo:    patient.IdCardNo,
-				Name:        patient.Name,
-				Gender:      patient.Gender,
-				UserOrgId:   adminInfo.CurrentOrgId,
-				Status:      1,
-				RecordDate:  recordDateTime,
-				IsReturn:    1,
-				PatientId:   patient.ID,
-				Ctime:       time.Now().Unix(),
-				Mtime:       time.Now().Unix(),
+			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,
 			}
-			service.CreateHisPatient(&patient)
+			service.CreateHisPatient(&hisPatient)
+
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"his_info": patient,
+			"his_info": hisPatient,
 		})
 
 	}
@@ -1486,6 +1517,17 @@ func (c *HisApiController) GetRegisterInfo() {
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
+
+	pay_way, _ := c.GetInt64("pay_way")
+	pay_price, _ := c.GetFloat("pay_price")
+	pay_card_no := c.GetString("pay_card_no")
+	discount_price, _ := c.GetFloat("discount_price")
+	preferential_price, _ := c.GetFloat("preferential_price")
+	reality_price, _ := c.GetFloat("reality_price")
+	found_price, _ := c.GetFloat("found_price")
+	medical_insurance_price, _ := c.GetFloat("medical_insurance_price")
+	private_price, _ := c.GetFloat("private_price")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
@@ -1560,21 +1602,30 @@ func (c *HisApiController) GetUploadInfo() {
 
 		if res.Infcode == 0 {
 			order := &models.HisOrder{
-				UserOrgId:          adminUser.CurrentOrgId,
-				HisPatientId:       his.ID,
-				PatientId:          his.PatientId,
-				SettleAccountsDate: recordDateTime,
-				Ctime:              time.Now().Unix(),
-				Mtime:              time.Now().Unix(),
-				Status:             1,
-				Number:             chrg_bchno,
-				Infcode:            res.Infcode,
-				WarnMsg:            res.WarnMsg,
-				Cainfo:             res.Cainfo,
-				ErrMsg:             res.ErrMsg,
-				RespondTime:        res.RefmsgTime,
-				InfRefmsgid:        res.InfRefmsgid,
-				OrderStatus:        1,
+				UserOrgId:             adminUser.CurrentOrgId,
+				HisPatientId:          his.ID,
+				PatientId:             his.PatientId,
+				SettleAccountsDate:    recordDateTime,
+				Ctime:                 time.Now().Unix(),
+				Mtime:                 time.Now().Unix(),
+				Status:                1,
+				Number:                chrg_bchno,
+				Infcode:               res.Infcode,
+				WarnMsg:               res.WarnMsg,
+				Cainfo:                res.Cainfo,
+				ErrMsg:                res.ErrMsg,
+				RespondTime:           res.RefmsgTime,
+				InfRefmsgid:           res.InfRefmsgid,
+				OrderStatus:           1,
+				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,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {
@@ -1788,16 +1839,25 @@ func (c *HisApiController) GetUploadInfo() {
 		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,
-			Number:             chrg_bchno,
-			MedfeeSumamt:       totals,
+			UserOrgId:             adminUser.CurrentOrgId,
+			HisPatientId:          his.ID,
+			PatientId:             id,
+			SettleAccountsDate:    recordDateTime,
+			Ctime:                 time.Now().Unix(),
+			Mtime:                 time.Now().Unix(),
+			Status:                1,
+			OrderStatus:           2,
+			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,
 		}
 		err = service.CreateOrder(order)
 		if err != nil {

models/his_models.go

@@ -619,6 +619,16 @@ type HisOrder struct {
 	ClrType            string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
 	SetlDetail         string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
 
+	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"`
+
 	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"`

service/his_service.go

@@ -458,17 +458,26 @@ func UpDatePrescriptionInfoNumber(user_org_id int64, id int64, number string, re
 }
 
 type HisOrder 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"`
-	MedfeeSumamt       float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	OrderStatus        float64 `gorm:"column:order_status" json:"order_status" form:"order_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"`
+	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"`
+	MedfeeSumamt          float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	OrderStatus           float64 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	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"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`