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

controllers/sg/his_api_controller.go

@@ -3196,73 +3196,57 @@ func (c *HisApiController) GetSettleAccounts() {
 
 	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.FulamtOwnpayAmt)).Float64()
-			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).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.FulamtOwnpayAmt)).Float64()
-			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+			otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
 
 	}

models/drug.go

@@ -57,6 +57,8 @@ type BaseDrugLib struct {
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/his_models.go

@@ -435,6 +435,8 @@ type VMDrug struct {
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (VMDrug) TableName() string {

models/self_drug_models.go

@@ -64,6 +64,8 @@ type XtBaseDrug struct {
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	IsMark                 int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 }
 
 func (XtBaseDrug) TableName() string {

service/gdyb_service.go

@@ -541,6 +541,8 @@ type Custom struct {
 	FeedetlSn        string
 	Price            string
 	MedListCodg      string
+	LmtUsedFlag      int64
+	HospApprFlag     int64
 }
 
 type RequestResult struct {
@@ -614,6 +616,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
+						HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
 					}
 
 					customs = append(customs, cus)
@@ -633,6 +636,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 						MedListCodg:      subItem.HisProject.MedicalCode,
+						HospApprFlag:     -1,
 					}
 					customs = append(customs, cus)
 				}
@@ -647,6 +651,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 					MedListCodg:      subItem.XtHisAddtionConfig.Code,
+					HospApprFlag:     -1,
 				}
 				customs = append(customs, cus)
 			}
@@ -687,12 +692,18 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
 		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
 		feedetailInfo["orders_dr_name"] = ""                         // 受单医生姓名
-		feedetailInfo["hosp_appr_flag"] = "1"                        // 医院审批标志
-		feedetailInfo["tcmdrug_used_way"] = ""                       // 中药使用方式
-		feedetailInfo["etip_flag"] = ""                              // 外检标志
-		feedetailInfo["etip_hosp_code"] = ""                         // 外检医院编码
-		feedetailInfo["dscg_tkdrug_flag"] = ""                       // 出院带药标志
-		feedetailInfo["matn_fee_flag"] = ""                          // 生育费用标志
+
+		if item.HospApprFlag != -1 {
+			feedetailInfo["hosp_appr_flag"] = item.HospApprFlag // 医院审批标志
+		} else {
+			feedetailInfo["hosp_appr_flag"] = "" // 医院审批标志
+		}
+
+		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		feedetailInfo["etip_flag"] = ""        // 外检标志
+		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
+		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
+		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
 		feedetail = append(feedetail, feedetailInfo)
 	}
 	input["feedetail"] = feedetail
@@ -1791,6 +1802,10 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 
 	timeFormatTwo := tempTime.Format("2006-01-02")
 
+	t := time.Now()
+	last := time.Date(t.Year(), time.December, 31, 0, 0, 0, 0, time.UTC)
+	tm := time.Unix(last.Unix(), 0)
+
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
@@ -1809,7 +1824,7 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	inputData["begndate"] = timeFormatTwo          // 医师编码
 	inputData["tel"] = ""                          // 医师编码
 	inputData["addr"] = ""                         // 医师编码
-	inputData["enddate"] = "2099-12-31"            // 医师编码
+	inputData["enddate"] = tm.Format("2006-01-02") // 医师编码
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

service/his_service.go

@@ -390,6 +390,8 @@ type BaseDrugLib struct {
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`