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

controllers/zh/zh_his_api_controller.go

@@ -464,6 +464,7 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/zh/api/inhopitalcheck/get", &ZHHisApiController{}, "get:GetZHInHospitalCheck")
 	beego.Router("/zh/api/outhopitalcheck/get", &ZHHisApiController{}, "get:GetZHOutHospitalCheck")
 	beego.Router("/zh/api/uploadinfo/get", &ZHHisApiController{}, "get:GetUploadInfo")
+	beego.Router("/zh/api/presettle/get", &ZHHisApiController{}, "get:GetPreSettleInfo")
 	beego.Router("/zh/api/settle/get", &ZHHisApiController{}, "get:GetSettleInfo")
 	beego.Router("/zh/api/inthopitaluncheck/get", &ZHHisApiController{}, "get:GetZHInHospitalUnCheck")
 	beego.Router("/zh/api/outhopitaluncheck/get", &ZHHisApiController{}, "get:GetZHOutHospitalUnCheck")
@@ -952,6 +953,7 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	patient_id, _ := this.GetInt64("patient_id")
 	admin_user_id, _ := this.GetInt64("admin_user_id")
 	record_time := this.GetString("record_time")
+	out_time := this.GetString("out_time")
 
 	adminInfo := this.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
@@ -996,7 +998,7 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 	struct2402.PsnNo = record.PsnNo
 	struct2402.Insutype = record.InsutypeType
 	struct2402.DscgWay = "1"
-	struct2402.Endtime = timeFormatOne
+	struct2402.Endtime = out_time
 	struct2402.DscgDeptName = departmentInfo.Number
 	struct2402.DscgDeptCodg = strconv.FormatInt(int64(departmentInfo.ID), 10)
 	struct2402.MdtrtId = record.Number
@@ -1289,6 +1291,157 @@ func (c *ZHHisApiController) GetSettleInfo() {
 	}
 
 }
+func (c *ZHHisApiController) GetPreSettleInfo() {
+	order_id, _ := c.GetInt64("order_id")
+	patient_id, _ := c.GetInt64("patient_id")
+	in_hospital_id, _ := c.GetInt64("in_hospital_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+	record, _ := service.GetInHospitalRecord(in_hospital_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	order, _ := service.GetHisOrderByID(order_id)
+	allTotal := fmt.Sprintf("%.4f", order.MedfeeSumamt)
+	var rf []*ResultFive
+	json.Unmarshal([]byte(record.Iinfo), &rf)
+	chrg_bchno := order.Number
+	cert_no := record.Certno
+	if record.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	if record.InHospitalStatus == 1 && record.OutHospitalStatus == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHospitalNoExistDataException)
+		return
+	}
+	if record.IdCardType == 1 {
+	} else {
+		cert_no = record.Certno
+	}
+	var result string
+	var src_resquest string
+	result, src_resquest = service.ZHGdyb2303(record.PsnNo, record.Number, chrg_bchno, cert_no, record.InsutypeType, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "0", record.IdCardType, 0, 0, 0, 0, record.Certificates)
+	saveLog(result, src_resquest, "2303", "住院预结算")
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	userJSONBytes, _ := json.Marshal(dat)
+	var res ResultSeven
+	var resSeven10265 ResultSeven10265
+	if miConfig.Code == "H15049901371" {
+		if err := json.Unmarshal(userJSONBytes, &resSeven10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		Infcode, _ := strconv.ParseInt(resSeven10265.Infcode, 10, 64)
+		res.Infcode = Infcode
+		res.InfRefmsgid = resSeven10265.InfRefmsgid
+		res.RespondTime = resSeven10265.RespondTime
+		res.ErrMsg = resSeven10265.ErrMsg
+		res.Output = resSeven10265.Output
+		res.WarnMsg = resSeven10265.WarnMsg
+		res.Cainfo = resSeven10265.Cainfo
+
+	} else {
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+	}
+
+	if res.Infcode != 0 {
+		errlog := &models.HisOrderError{
+			UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+			Ctime:      time.Now().Unix(),
+			Mtime:      time.Now().Unix(),
+			Number:     chrg_bchno,
+			ErrMsg:     res.ErrMsg,
+			Status:     1,
+			PatientId:  patient_id,
+			RecordTime: time.Now().Unix(),
+			Stage:      6,
+		}
+		service.CreateErrMsgLog(errlog)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.ErrMsg,
+		})
+		return
+	} else {
+		//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
+		order.OrderStatus = 2
+		order.MdtrtId = res.Output.Setlinfo.MdtrtID
+		order.SetlId = res.Output.Setlinfo.SetlID
+		order.PsnNo = res.Output.Setlinfo.PsnNo
+		order.PsnName = res.Output.Setlinfo.PsnName
+		order.PsnCertType = res.Output.Setlinfo.PsnCertType
+		order.Certno = res.Output.Setlinfo.Certno
+		order.Gend = res.Output.Setlinfo.Gend
+		order.Naty = res.Output.Setlinfo.Naty
+		order.Age = res.Output.Setlinfo.Age
+		order.Insutype = res.Output.Setlinfo.Insutype
+		order.PsnType = res.Output.Setlinfo.PsnType
+		order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
+		order.SetlTime = res.Output.Setlinfo.SetlTime
+		order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
+		if res.Output.Setlinfo.MedType == "140104" {
+
+			order.MedType = "14"
+
+		} else {
+
+			order.MedType = res.Output.Setlinfo.MedType
+
+		}
+		order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
+		order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
+		order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
+		order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
+		order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
+		order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
+		order.HifpPay = res.Output.Setlinfo.HifpPay
+		order.CvlservPay = res.Output.Setlinfo.CvlservPay
+		order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
+		order.HifesPay = res.Output.Setlinfo.HifesPay
+		order.HifobPay = res.Output.Setlinfo.HifobPay
+		order.MafPay = res.Output.Setlinfo.MafPay
+		order.OthPay = res.Output.Setlinfo.OthPay
+		order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
+		order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
+		order.AcctPay = res.Output.Setlinfo.AcctPay
+		order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
+		order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
+		order.Balc = res.Output.Setlinfo.Balc
+		order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
+		order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
+		order.ClrOptins = res.Output.Setlinfo.ClrOptins
+		order.ClrWay = res.Output.Setlinfo.ClrWay
+		order.Creator = order.Creator
+		order.Modify = roles.AdminUserId
+		order.RequestLog = src_resquest
+		setlDetail, _ := json.Marshal(res.Output.Setldetail)
+		detailStr := string(setlDetail)
+		order.SetlDetail = detailStr
+		err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
+		err = service.UpDateOrder(order)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "结算成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
+			return
+		}
+	}
+
+}
+
 func (c *ZHHisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
@@ -1421,7 +1574,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		for _, item := range prescriptions {
 			if item.Type == 1 { //药品
 				for _, subItem := range item.HisDoctorAdviceInfo {
-					if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
+					if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 && subItem.BaseDrugLib.IsUser != 1 {
 						//var randNum int
 						//randNum = rand.Intn(10000) + 1000
 						cus := &models.NewCustom{

models/drug.go

@@ -68,6 +68,8 @@ type BaseDrugLib struct {
 	DoseUnit  string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	DrugDay   string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MinPrice  float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsUser    int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }
 

models/his_models.go

@@ -445,6 +445,7 @@ type VMDrug struct {
 	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"`
+	IsUser                 int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (VMDrug) TableName() string {

models/self_drug_models.go

@@ -69,6 +69,7 @@ type XtBaseDrug struct {
 	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"`
+	IsUser               int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (XtBaseDrug) TableName() string {

service/gdyb_service.go

@@ -785,6 +785,7 @@ type Custom struct {
 	DoctorName              string
 	ProvinceDrugMedListCodg string
 	ProvinceGoodMedListCodg string
+	IsUser                  int64
 }
 
 type RequestResult struct {
@@ -850,7 +851,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
-				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
+				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 && subItem.BaseDrugLib.IsUser != 1 {
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
 					role, _ := GetAdminUserInfoByID(item.UserOrgId, new_doctor_id)

service/his_service.go

@@ -416,6 +416,8 @@ type BaseDrugLib struct {
 	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"`
+	IsUser               int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+
 	//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"`

service/zh_his_service.go

@@ -749,6 +749,93 @@ func Gdyb2302(psnNo string, mdtrtId string, org_name string, doctor string, insu
 	return str, requestLog
 }
 
+func ZHGdyb2303(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2303" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	inputData["mdtrt_cert_sn"] = ""
+	inputData["mid_setl_flag"] = mid_setl_flag // 中途退费标志
+	inputData["medfee_sumamt"] = total         // 医疗费总额
+	inputData["psn_setlway"] = "01"            // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId            // 就诊 ID（来自2201接口返回）
+	inputData["acct_used_flag"] = "1"          // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype           // 险种类型
+	inputData["invono"] = ""                   // 发票号
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
+	url := gdyb_url + "2304"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2207"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	mjson, _ := json.Marshal(inputMessage)
+	str2 := string(mjson)
+
+	return str, str2
+}
+
 //  住院结算
 func ZHGdyb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
 	// 生成签名