Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -71,8 +71,114 @@ func HisManagerApiRegistRouters() {
 
 	//beego.Router("/api/reversal/one", &HisApiController{}, "get:ReversalOtherOneData")
 
+	//beego.Router("/api/settlelist/get", &HisApiController{}, "get:GetSettleList")
+
+}
+
+type CustomFundPay struct {
+	FundPayType string  `json:"fund_pay_type"`
+	FundPayamt  float64 `json:"fund_payamt"`
 }
 
+//func (c *HisApiController) GetSettleList() {
+//	order_id, _ := c.GetInt64("order_id")
+//	order, _ := service.GetHisOrderByIDTwo(order_id)
+//
+//	roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
+//
+//	admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+//
+//	depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
+//
+//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+//
+//	if order.ID == 0 {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
+//		return
+//	}
+//	struct4101 := &service.Struct4101{
+//		PsnNo:          order.PsnNo,
+//		MdtrtId:        order.MdtrtId,
+//		SetlId:         order.SetlId,
+//		PsnName:        order.PsnName,
+//		Gend:           order.Gend,
+//		Brdy:           order.HisPatient.Brdy,
+//		Naty:           order.Naty,
+//		PatnCertType:   order.MdtrtCertType,
+//		Certno:         order.Certno,
+//		Prfs:           "90",
+//		ConerName:      roles[0].UserName,
+//		PatnRlts:       "99",
+//		ConerAddr:      miConfig.OrgName,
+//		ConerTel:       admin.Mobile,
+//		HiType:         order.Insutype,
+//		Insuplc:        miConfig.InsuplcAdmdvs,
+//		MaindiagFlag:   "1",
+//		BillCode:       "",
+//		BizSn:          "",
+//		BillNo:         "",
+//		PsnSelfPay:     order.PsnPartAmt,
+//		PsnOwnPay:      order.PsnPartAmt,
+//		AcctPay:        order.AcctPay,
+//		PsnCashpay:     order.PsnCashPay,
+//		HiPaymtd:       "1",
+//		Hsorg:          "医保中心",
+//		HsorgOpter:     "医保中心",
+//		MedinsFillPsn:  curRoles.UserName,
+//		MedinsFillDept: depart.Name,
+//	}
+//	if order.SettleType == 1 {
+//		t := time.Unix(int64(order.SettleAccountsDate), 0)
+//		dateStr := t.Format("2006-01-02")
+//		struct4101.SetlBegnDate = dateStr
+//		struct4101.SetlEndDate = dateStr
+//	} else {
+//		t := time.Unix(int64(order.SettleStartTime), 0)
+//		t2 := time.Unix(int64(order.SettleEndTime), 0)
+//		dateStartStr := t.Format("2006-01-02")
+//		dateEndStr := t2.Format("2006-01-02")
+//		struct4101.SetlBegnDate = dateStartStr
+//		struct4101.SetlEndDate = dateEndStr
+//	}
+//
+//	var rf []*CustomFundPay
+//	json.Unmarshal([]byte(order.SetlDetail), &rf)
+//
+//	for _, item := range rf {
+//		var  tempFunPay service.CustomStruct
+//		tempFunPay.FundPayamt = item.FundPayamt
+//		tempFunPay.FundPayType = item.FundPayType
+//		struct4101.CustomStruct = append(struct4101.CustomStruct,tempFunPay)
+//	}
+//
+//	var  tempOpspdiseinfo service.OpspdiseinfoStruct
+//
+//	tempOpspdiseinfo.DiagCode = "M07801"
+//	tempOpspdiseinfo.DiagName = ""
+//	tempOpspdiseinfo.MaindiagFlag = "1"
+//	tempOpspdiseinfo.OprnOprtCode = ""
+//	tempOpspdiseinfo.OprnOprtName = ""
+//	struct4101.OpspdiseinfoStruct = append(struct4101.OpspdiseinfoStruct,tempOpspdiseinfo)
+//
+//	var  iteminfo service.IteminfoStruct
+//
+//
+//	for _, item := range order.HisOrderInfo{
+//
+//		iteminfo.MedChrgitm = item.MedChrgitmType
+//		iteminfo.Amt = item.DetItemFeeSumamt
+//		iteminfo.ClaaSumfee = item.
+//
+//	}
+//
+//
+//
+//	service.Gdyb4101()
+//
+//}
+
 func (c *HisApiController) TestGetBasBaseInfo() {
 	DllDef := syscall.MustLoadDLL("SSCard.dll")
 	Iinit := DllDef.MustFindProc("Init")
@@ -1191,7 +1297,6 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Ctime = time.Now().Unix()
 			his.Mtime = time.Now().Unix()
 			his.Status = 1
-			err := service.CreateHisPatientTwo(&his)
 
 			lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
 			if len(lists) == 1 {
@@ -1249,7 +1354,7 @@ func (c *HisApiController) GetRegisterInfo() {
 					return
 
 				} else {
-
+					err := service.CreateHisPatientTwo(&his)
 					c.ServeSuccessJSON(map[string]interface{}{
 						"his_info": his,
 					})
@@ -2689,9 +2794,7 @@ func (c *HisApiController) Refund() {
 			return
 		}
 		if res.Infcode == 0 {
-
 			result := service.Gdyb2205(order.PsnNo, order.MdtrtId, order.Number, miConfig.OrgName, roles.UserName, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code)
-
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)

models/his_models.go

@@ -678,9 +678,9 @@ type HisOrder struct {
 	RequestLog       string `gorm:"column:request_log" json:"request_log" form:"request_log"`
 	RefundRequestLog string `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
 
-	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	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;AssociationForeignKey:Number" json:"his_patient"`
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
 }
 

service/gdyb_service.go

@@ -2094,7 +2094,7 @@ func Gdyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 
 type CustomStruct struct {
 	FundPayType string
-	FundPayamt  string
+	FundPayamt  float64
 }
 
 type OpspdiseinfoStruct struct {
@@ -2141,10 +2141,10 @@ type Struct4101 struct {
 	BizSn              string
 	SetlBegnDate       string
 	SetlEndDate        string
-	PsnSelfPay         string
-	PsnOwnPay          string
-	AcctPay            string
-	PsnCashpay         string
+	PsnSelfPay         float64
+	PsnOwnPay          float64
+	AcctPay            float64
+	PsnCashpay         float64
 	HiPaymtd           string
 	Hsorg              string
 	HsorgOpter         string

service/his_service.go

@@ -885,6 +885,11 @@ func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
 	return
 }
 
+func GetHisOrderByIDTwo(order_id int64) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Preload("HisOrderInfo", "status = 1").Preload("HisPatient", "status = 1").Where("id = ? AND status = 1", order_id).First(&order).Error
+	return
+}
+
 func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo, err error) {
 	err = readDb.Model(&models.HisOrderInfo{}).Where("order_number = ? AND status = 1", order_number).Find(&order).Error
 	return
@@ -1034,6 +1039,15 @@ func GetDoctorList(orgid int64) (role []*models.SgjUserAdminRole, err error) {
 	return role, err
 }
 
+func GetDoctorListTwo(orgid int64) (role []*models.SgjUserAdminRole, err error) {
+
+	db := UserReadDB().Table("sgj_user_admin_role as x").Where("x.status =1 AND x.user_type = 2")
+	table := UserReadDB().Table("sgj_user_admin as a")
+	fmt.Println(table)
+	err = db.Select("x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,x.user_title,x.intro,x.user_title_name,x.role_ids,x.message,x.sex,x.birthday,x.sort,x.is_sort,x.department,x.department_id,x.age,x.nation,x.card_type,x.id_card,x.education,x.study_major_name,x.work_major_name,x.role_type,x.medical_code,x.doctor_code,x.licensing,x.job_number,x.prescription_qualification_identification,x.identification_outpatients,x.start_time,x.medical_range_code,x.medical_level,x.medical_type_job,x.pharmacist_registration_number,x.doctor_range_code,x.doctor_level,x.doctor_type_job,x.doctor_number,x.outpatient_illness_category,x.is_active,x.active_status,a.mobile").Joins("left join sgj_user_admin as a on a.id = x.admin_user_id").Scan(&role).Error
+	return role, err
+}
+
 func GetRoleList(orgid int64) (role []*models.SgjUserRole, err error) {
 
 	err = UserReadDB().Model(&role).Where("org_id = ? and status =1", orgid).Find(&role).Error