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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 
 #
@@ -53,12 +53,12 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #gdyb_paasid = "sg03_prd"
-gdyb_paasid = "jm_sc_yjyy"
+#gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid = "zh_prd_yjyy"
-#gdyb_paasid = "sz_prd_yjyy"
+gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/sg/his_api_controller.go

@@ -51,16 +51,15 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
 
 	//beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
-
 	beego.Router("/api/presettle/get", &HisApiController{}, "get:GetPreUploadInfo")
 
 	//beego.Router("/api/settle/get", &HisApiController{}, "get:GetSettleInfo")
 
 	beego.Router("/api/310", &HisApiController{}, "get:Check310")
+
 	beego.Router("/api/390", &HisApiController{}, "get:Check390")
 
 	beego.Router("/api/patient/info", &HisApiController{}, "get:GetPatientInfo")
-
 	//备案撤销相关接口
 	beego.Router("/api/checkcode/get", &HisApiController{}, "get:GetCheckCode")
 	beego.Router("/api/uncheckcode/get", &HisApiController{}, "get:UnCheckCode")
@@ -2565,7 +2564,7 @@ func (c *HisApiController) GetUploadInfo() {
 						}
 					}
 
-					allTotal := fmt.Sprintf("%.2f", total)
+					allTotal := fmt.Sprintf("%.4f", total)
 					if res.Infcode == 0 {
 						var rf []*ResultFive
 						json.Unmarshal([]byte(his.Iinfo), &rf)
@@ -2818,7 +2817,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 	} else if tempOrder.ID > 0 {
 		if tempOrder.IsPre == 1 {
-			allTotal := fmt.Sprintf("%.2f", tempOrder.MedfeeSumamt)
+			allTotal := fmt.Sprintf("%.4f", tempOrder.MedfeeSumamt)
 			var rf []*ResultFive
 			json.Unmarshal([]byte(his.Iinfo), &rf)
 			chrg_bchno := tempOrder.Number
@@ -3933,7 +3932,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					}
 				}
 
-				allTotal := fmt.Sprintf("%.2f", total)
+				allTotal := fmt.Sprintf("%.4f", total)
 				if res.Infcode == 0 {
 					var rf []*ResultFive
 					json.Unmarshal([]byte(his.Iinfo), &rf)
@@ -4798,9 +4797,9 @@ func (c *HisApiController) GetCheckAccount() {
 			"&setl_optins=" + "定点医保中心" +
 			"&stmt_begndate=" + start_time +
 			"&stm_enddate=" + end_time +
-			"&medfee_sumamt=" + fmt.Sprintf("%.2f", medfee_sumamt) +
-			"&fund_pay_sumamt=" + fmt.Sprintf("%.2f", fund_pay_sumamt) +
-			"&acct_pay=" + fmt.Sprintf("%.2f", acct_pay) +
+			"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
+			"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
+			"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
 			"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
 			"&fixmedins_code=" + miConfig.Code +
 			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
@@ -5038,9 +5037,9 @@ func (c *HisApiController) GetCheckDetailAccount() {
 				str = item.SetlId + "	" +
 					item.MdtrtId + "	" +
 					item.PsnNo + "	" +
-					fmt.Sprintf("%.2f", item.MedfeeSumamt) + "	" +
-					fmt.Sprintf("%.2f", item.FundPaySumamt) + "	" +
-					fmt.Sprintf("%.2f", item.AcctPay) + "	" + refd_setl_flag + "\r\n"
+					fmt.Sprintf("%.4f", item.MedfeeSumamt) + "	" +
+					fmt.Sprintf("%.4f", item.FundPaySumamt) + "	" +
+					fmt.Sprintf("%.4f", item.AcctPay) + "	" + refd_setl_flag + "\r\n"
 				_, err = f.Write([]byte(str))
 			}
 			if item.OrderStatus == 3 {
@@ -5049,18 +5048,18 @@ func (c *HisApiController) GetCheckDetailAccount() {
 				str = item.SetlId + "	" +
 					item.MdtrtId + "	" +
 					item.PsnNo + "	" +
-					fmt.Sprintf("%.2f", item.MedfeeSumamt) + "	" +
-					fmt.Sprintf("%.2f", item.FundPaySumamt) + "	" +
-					fmt.Sprintf("%.2f", item.AcctPay) + "	" + "1" + "\r\n"
+					fmt.Sprintf("%.4f", item.MedfeeSumamt) + "	" +
+					fmt.Sprintf("%.4f", item.FundPaySumamt) + "	" +
+					fmt.Sprintf("%.4f", item.AcctPay) + "	" + "1" + "\r\n"
 				_, err = f.Write([]byte(str))
 
 				var str2 string
 				str2 = item.SetlId + "	" +
 					item.MdtrtId + "	" +
 					item.PsnNo + "	" +
-					fmt.Sprintf("%.2f", 0-item.MedfeeSumamt) + "	" +
-					fmt.Sprintf("%.2f", 0-item.FundPaySumamt) + "	" +
-					fmt.Sprintf("%.2f", 0-item.AcctPay) + "	" + "1" + "\r\n"
+					fmt.Sprintf("%.4f", 0-item.MedfeeSumamt) + "	" +
+					fmt.Sprintf("%.4f", 0-item.FundPaySumamt) + "	" +
+					fmt.Sprintf("%.4f", 0-item.AcctPay) + "	" + "1" + "\r\n"
 				_, err = f.Write([]byte(str2))
 			}
 
@@ -5115,9 +5114,9 @@ func (c *HisApiController) GetCheckDetailAccount() {
 				"&setl_optins=" + "定点医保中心" +
 				"&stmt_begndate=" + start_time +
 				"&stm_enddate=" + end_time +
-				"&medfee_sumamt=" + fmt.Sprintf("%.2f", medfee_sumamt) +
-				"&fund_pay_sumamt=" + fmt.Sprintf("%.2f", fund_pay_sumamt) +
-				"&cash_payamt=" + fmt.Sprintf("%.2f", psn_cash_pay) +
+				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
+				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
+				"&cash_payamt=" + fmt.Sprintf("%.4f", psn_cash_pay) +
 				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
 				"&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
@@ -5184,6 +5183,15 @@ func (c *HisApiController) GetCheckDetailAccount() {
 	}
 }
 
+type CustomOrderInfo struct {
+	Name  string
+	Spec  string
+	Unit  string
+	Count float64
+	Price float64
+	Total float64
+}
+
 func (c *HisApiController) GetSettleAccounts() {
 	//id, _ := c.GetInt64("id")
 	//record_time := c.GetString("record_time")
@@ -5204,6 +5212,38 @@ func (c *HisApiController) GetSettleAccounts() {
 	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
 	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
+	orderInfos_three, _ := service.GetHisOrderInfoByNumberThree(order.Number)
+
+	var orderInfos_four []*models.HisOrderInfo
+	for _, item := range orderInfos_three {
+		if item.HisPrescriptionProject.HisProject.CostClassify == 3 {
+			item.HisPrescriptionProject.IsCheckTeam = 1
+			orderInfos_four = append(orderInfos_four, item)
+
+		}
+		if item.HisPrescriptionProject.HisProject.CostClassify != 3 {
+			item.HisPrescriptionProject.IsCheckTeam = 2
+			orderInfos_two = append(orderInfos_two, item)
+		}
+	}
+
+	new_order_info := RemoveRepeatedTeam(orderInfos_four)
+	var cus_slice []CustomOrderInfo
+	for _, item := range new_order_info {
+		var cus CustomOrderInfo
+		cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
+		cus.Unit = ""
+		cus.Spec = ""
+		for _, subItem := range orderInfos_four {
+			if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
+				cus.Count = cus.Count + subItem.Cnt
+				cus.Price = cus.Price + subItem.Pric
+				cus.Total = cus.Total + (cus.Price * cus.Count)
+			}
+		}
+		cus_slice = append(cus_slice, cus)
+	}
+
 	orderInfos = append(orderInfos, orderInfos_two...)
 	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 
@@ -5482,6 +5522,7 @@ func (c *HisApiController) GetSettleAccounts() {
 				"org_name":                                    miConfig.OrgName,
 				"org_code":                                    miConfig.Code,
 				"order_number":                                order.Number,
+				"check_order_info":                            cus_slice,
 			})
 		}
 	}
@@ -6683,12 +6724,12 @@ func ReadFile(filePath string) []byte {
 	return fd
 }
 
-func RemoveRepeatedCode(arr []string) (newArr []string) {
-	newArr = make([]string, 0)
+func RemoveRepeatedTeam(arr []*models.HisOrderInfo) (newArr []*models.HisOrderInfo) {
+	newArr = make([]*models.HisOrderInfo, 0)
 	for i := 0; i < len(arr); i++ {
 		repeat := false
 		for j := i + 1; j < len(arr); j++ {
-			if arr[i] == arr[j] {
+			if arr[i].HisPrescriptionProject.TeamId == arr[j].HisPrescriptionProject.TeamId {
 				repeat = true
 				break
 			}

models/his_models.go

@@ -483,29 +483,32 @@ func (HisDoctorAdviceTemplate) TableName() string {
 }
 
 type HisPrescriptionProject struct {
-	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
-	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price              float64    `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
-	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"`
-	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count              int64      `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	Day                string     `gorm:"column:day" json:"day" form:"day"`
-	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
-	Type               int64      `gorm:"column:type" json:"type" form:"type"`
-	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
+	ID                 int64            `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64            `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64          `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	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"`
+	RecordDate         int64            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64            `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              int64            `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string           `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string           `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string           `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string           `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string           `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string           `gorm:"column:day" json:"day" form:"day"`
+	HisProject         HisProject       `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Type               int64            `gorm:"column:type" json:"type" form:"type"`
+	Remark             string           `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string           `gorm:"column:unit" json:"unit" form:"unit"`
+	TeamId             int64            `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	XtHisProjectTeam   XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
+	IsCheckTeam        int64            `gorm:"-" json:"is_check_team" form:"is_check_team"`
 }
 
 func (HisPrescriptionProject) TableName() string {

service/his_service.go

@@ -953,8 +953,20 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 
 func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfo, err error) {
 	db := readDb.Model(&models.HisOrderInfo{})
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id = 0")
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
+	})
+	err = db.Where("order_number = ? AND status = 1 AND project_id > 0", order_number).Find(&order).Error
+	return
+}
+
+func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrderInfo, err error) {
+	db := readDb.Model(&models.HisOrderInfo{})
+	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id > 0")
+
+	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
 	})
 	err = db.Where("order_number = ? AND status = 1 AND project_id > 0", order_number).Find(&order).Error
 	return