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

conf/app.conf

@@ -3,11 +3,11 @@ httpport = 9532
 runmode = prod
 
 
-#
+
 copyrequestbody = true
 sessionon = true
 sessiongcmaxlifetime = 64800
-###
+
 tokencookiemaxlifetime = 7200
 enablexsrf = false
 xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o
@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10191
+org_id = 10387
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,10 +53,10 @@ 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/gdyb_api/prd/hsa/hgs/"
 #test
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
-gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
@@ -70,12 +70,14 @@ gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-gdyb_paasid = "sz_prd_yjyy"
+#gdyb_paasid = "sz_prd_yjyy"
 #肇庆
 #gdyb_paasid = "zq_prd_yjyy"
 # gdyb_paasid = "sztest_hosp"
 #广州
 #gdyb_paasid = "gdyb_inf"
+#江西
+#gdyb_url = "http://10.77.211.236/CSB/hsa-fsi-"
 
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com

controllers/hb/hbyb_controller.go

@@ -321,7 +321,10 @@ func (c *HBybController) PostFive() {
 	fmt.Println(respJSON["dept"].(string))
 	fmt.Println(respJSON["fixmedins_code"].(string))
 	fmt.Println(respJSON["dept_code"].(string))
+	fmt.Println(respJSON["balance_accounts_type"].(string))
+	fmt.Println("1111111")
 
+	fmt.Println(respJSON["opter"].(string))
 	fmt.Println(respJSON["insuplc_admdvs"].(string))
 	fmt.Println(respJSON["mdtrtarea_admvs"].(string))
 	fmt.Println(respJSON["secret_key"].(string))

controllers/nm/nm_controller.go

@@ -44,6 +44,7 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/2202", &NmController{}, "get:Post2202")
 
 	beego.Router("/nmyb/4101", &NmController{}, "post:Post4101")
+	beego.Router("/nmyb/2601", &NmController{}, "get:Get2601")
 
 }
 
@@ -980,3 +981,23 @@ func (c *NmController) Get3201() {
 		"pre": dat,
 	})
 }
+func (c *NmController) Get2601() {
+	result := service.Gdyb26011("150000CFSJM100000100135084", "H15049901371202210111721190000", "2305", "赤峰费森血液透析中心", "李彩星", "H15049901371", "150402", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57\n")
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	result2 := service.Gdyb26011("150000CFSJM100000100135084", "H15049901371202209281143070000", "2304", "赤峰费森血液透析中心", "李彩星", "H15049901371", "150402", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57\n")
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+		fmt.Println(dat2)
+	} else {
+		fmt.Println(err)
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}

controllers/zh/zh_his_api_controller.go

@@ -1492,6 +1492,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 		var struct2401 service.Struct2401
 		struct2401.PsnNo = res2.Output.Baseinfo.PsnNo
+		//insutype = "310"
 		struct2401.Insutype = insutype
 		psn_info, _ := service.GetPsnByPatientId(patient.ID)
 
@@ -1509,7 +1510,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			if med_type == 14 {
 				if insutype == "390" {
 
-					struct2401.MedType = "9933"
+					struct2401.MedType = "990502"
 
 				} else if insutype == "310" {
 
@@ -1777,7 +1778,7 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 		dise.DiagCode = item.CountryCode
 		dise.DiagName = item.ClassName
 		dise.DiagDept = departmentInfo.Name
-		dise.DiseDorNo = strconv.FormatInt(int64(doctorInfo.AdminUserId), 10)
+		dise.DiseDorNo = doctorInfo.DoctorNumber
 		dise.DiagTime = timeFormatOne
 
 		dises = append(dises, dise)
@@ -2981,11 +2982,11 @@ func (c *ZHHisApiController) ZHRefund() {
 
 		if res.Infcode == 0 {
 			err := service.UpdataOrderStatusThree(order_id, order.Number, adminUser.CurrentOrgId, "", result)
-			////不同地区退费流程不一样，肇庆那边退费就包括撤销出院，内蒙古退费不包括撤销明细，所以下面需要根据不同情况进行判断
-			//if miConfig.UserOrgId == 10215 {
-			//	record.OutHospitalStatus = 0
-			//	service.CreateHospitalRecord(&record)
-			//}
+			//不同地区退费流程不一样，肇庆那边退费就包括撤销出院，内蒙古退费不包括撤销明细，所以下面需要根据不同情况进行判断
+			if miConfig.UserOrgId == 10215 {
+				record.OutHospitalStatus = 0
+				service.CreateHospitalRecord(&record)
+			}
 			service.UpdataOrderStatusByNumber(record.Number)
 			if err == nil {
 				////当押金不为零时产生退费记录
@@ -3688,6 +3689,12 @@ func (c *ZHHisApiController) ReadCard() {
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
+	if miConfig.MdtrtareaAdmvs == "" {
+
+	} else {
+
+	}
+
 	var api string
 	api = "http://172.16.13.254:9532/" + "nmyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
 		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&operator_id=" + strconv.FormatInt(admin_user_id, 10) + "&operator=" + roles.UserName

service/fj_service.go

@@ -87,7 +87,7 @@ func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	return output, inputLog, err_msg
 }
 
-func FJyb1101ForEleToken(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, token string) (string, string, string) {
+func FJyb1101ForEleToken(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, token string, name string) (string, string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -102,6 +102,7 @@ func FJyb1101ForEleToken(certNo string, org_name string, doctor string, fixmedin
 		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
 		inputData["certno"] = certNo        // 证件号码
 		inputData["psn_cert_type"] = "99"   // 人员证件类型
+		inputData["psn_name"] = ""          // 人员姓名
 
 	} else {
 		if id_card_type == 1 {
@@ -109,25 +110,27 @@ func FJyb1101ForEleToken(certNo string, org_name string, doctor string, fixmedin
 			inputData["card_sn"] = card_sn      // 卡识别码
 			inputData["psn_cert_type"] = ""     // 人员证件类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["psn_name"] = ""          // 人员姓名
 
 		} else if id_card_type == 4 {
 			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["mdtrt_cert_no"] = token  // 就诊凭证编号
-			inputData["psn_cert_type"] = ""     // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["psn_name"] = name        // 人员姓名
 
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["psn_cert_type"] = "01"   // 人员证件类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["psn_name"] = ""          // 人员姓名
 
 		}
 	}
 	inputData["certno"] = certNo // 证件号码
 
 	inputData["begntime"] = "" // 开始时间
-	inputData["psn_name"] = "" // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -2683,7 +2686,7 @@ func ReadEleCard(code string) (string, string, string) {
 	DllDef := syscall.MustLoadDLL("chs_fjs_standard.dll")
 	readCard := DllDef.MustFindProc("ec_decode")
 
-	pCardInfo := make([]byte, 2048)
+	//pCardInfo := make([]byte, 8192)
 	pBusiCardInfo := make([]byte, 2048)
 	pErrMsg := make([]byte, 2048)
 
@@ -2694,22 +2697,23 @@ func ReadEleCard(code string) (string, string, string) {
 	inputData["businessType"] = "01101"
 	inputData["operatorId"] = "1"
 	inputData["operatorName"] = "admin"
-	inputData["officeId"] = "001"
-	inputData["officeName"] = "111"
+	inputData["officeId"] = "101"
+	inputData["officeName"] = "xt"
+	inputData["deviceType"] = ""
+
 	data["data"] = inputData
 	data["transType"] = "ec.query"
 	data["orgId"] = code
-	bytesData, _ := json.Marshal(data)
-	pCardInfo = bytesData
-	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
 
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])), (uintptr)(unsafe.Pointer(&pErrMsg[0])))
-	fmt.Println(ret2)
+	bytesData, _ := json.Marshal(data)
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&bytesData[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])), (uintptr)(unsafe.Pointer(&pErrMsg[0])))
+	fmt.Println(ConvertToString(DeleteExtraSpace(string(pErrMsg)), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
 	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
 	if ret2 != 0 {
 		return "", "", ""
 	}
+	//readCard.Dll.Release()
 	return ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"), ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"), ConvertToString(DeleteExtraSpace(string(pErrMsg)), "gbk", "utf-8")
 
 }

service/gdyb_service.go

@@ -2871,6 +2871,8 @@ type Struct4101 struct {
 	AdmTime        string
 	AdmEndTime     string
 	HisNo          string
+	DoctorName     string
+	DoctorCode     string
 }
 
 //
@@ -2899,19 +2901,26 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["setl_id"] = struct4101.SetlId   // 结算 ID  必填
 	inputData["psn_no"] = struct4101.PsnNo     // 结算 ID  必填
 
-	inputData["fixmedins_name"] = org_name                    // 定点医药机构名称  必填
-	inputData["fixmedins_code"] = fixmedins_code              // 定点医药机构编码  必填
-	inputData["hi_setl_lv"] = ""                              // 医保结算等级
-	inputData["hi_no"] = struct4101.PsnNo                     // 医保编号
-	inputData["medcasno"] = struct4101.PsnNo                  // 病案号  必填
-	inputData["dcla_time"] = year + "-" + month + "-" + day   // 申报时间  必填
-	inputData["psn_name"] = struct4101.PsnName                // 人员姓名  必填
-	inputData["gend"] = struct4101.Gend                       // 性别  必填
-	inputData["brdy"] = struct4101.Brdy                       // 出生日期  必填
-	inputData["age"] = struct4101.Age                         // 年龄  必填
-	inputData["ntly"] = struct4101.Ntly                       // 国籍  必填
-	inputData["nwb_age"] = ""                                 // 年龄  必填
-	inputData["naty"] = struct4101.Naty                       // 民族  必填
+	inputData["fixmedins_name"] = org_name                  // 定点医药机构名称  必填
+	inputData["fixmedins_code"] = fixmedins_code            // 定点医药机构编码  必填
+	inputData["hi_setl_lv"] = ""                            // 医保结算等级
+	inputData["hi_no"] = struct4101.PsnNo                   // 医保编号
+	inputData["medcasno"] = struct4101.PsnNo                // 病案号  必填
+	inputData["dcla_time"] = year + "-" + month + "-" + day // 申报时间  必填
+	inputData["psn_name"] = struct4101.PsnName              // 人员姓名  必填
+	inputData["gend"] = struct4101.Gend                     // 性别  必填
+	inputData["brdy"] = struct4101.Brdy                     // 出生日期  必填
+	inputData["age"] = struct4101.Age                       // 年龄  必填
+	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
+	inputData["nwb_age"] = ""                               // 年龄  必填
+	inputData["naty"] = struct4101.Naty                     // 民族  必填
+	if org_id == 10138 {
+		inputData["dscg_way"] = "9" // 民族  必填
+
+		inputData["resp_nurs_code"] = "N441623001432" // 民族  必填
+
+	}
+
 	inputData["patn_cert_type"] = struct4101.PatnCertType     // 患者证件类别  必填
 	inputData["certno"] = struct4101.Certno                   // 证件号码  必填
 	inputData["prfs"] = struct4101.Prfs                       // 职业  必填
@@ -2933,8 +2942,8 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["opsp_diag_caty"] = ""                          // 门诊慢特病诊断  必填
 	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
 	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
-	inputData["adm_way"] = ""                                 // 入院途径  必填
-	inputData["trt_type"] = ""                                // 治疗类别  必填
+	inputData["adm_way"] = "2"                                // 入院途径  必填
+	inputData["trt_type"] = "1"                               // 治疗类别  必填
 	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
 	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
 	inputData["refldept_dept"] = ""                           // 转科科别  必填
@@ -2963,8 +2972,8 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["biz_sn"] = struct4101.BizSn                    // 业务流水号  必填
 	inputData["days_rinp_flag_31"] = ""                       // 出院 31 天内再住院计划标志  必填
 	inputData["days_rinp_pup_31"] = ""                        // 出院 31 天内再住院目的  必填
-	inputData["chfpdr_name"] = ""                             // 主诊医师姓名  必填
-	inputData["chfpdr_code"] = ""                             // 主诊医师代码  必填
+	inputData["chfpdr_name"] = struct4101.DoctorName          // 主诊医师姓名  必填
+	inputData["chfpdr_code"] = struct4101.DoctorCode          // 主诊医师代码  必填
 	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
 	inputData["setl_end_date"] = struct4101.SetlEndDate       // 结算结束日期  必填
 	inputData["psn_selfpay"] = struct4101.PsnSelfPay          // 个人自付  必填

service/his_service.go

@@ -1036,7 +1036,7 @@ func GetPatientByID(orgID int64, patientID int64) (*models.Patients, error) {
 
 func FindDiagnoseById(id int64) (models.HisXtDiagnoseConfig, error) {
 	dealer := models.HisXtDiagnoseConfig{}
-	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? AND status = 1", id).First(&dealer).Error
+	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ?", id).First(&dealer).Error
 	return dealer, err
 }
 
@@ -1299,6 +1299,11 @@ func GetHisPatientByNumber(number string) (his models.HisPatient, err error) {
 	err = readDb.Model(&models.HisPatient{}).Where("number = ? AND status = 1", number).First(&his).Error
 	return
 }
+func GetNewHisPrescriptionByNumber(number string) (pre models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).Where("batch_number = ? AND status = 1", number).First(&pre).Error
+	return
+
+}
 
 func CreateUploadRecord(result *models.HisFundSettleListResult) (err error) {
 	err = writeDb.Create(&result).Error
@@ -1417,7 +1422,7 @@ func GetPsnByPatientIdTwo(patient_id int64, record_date int64) (psn models.HisPs
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-05-01 00:00:00' AND setl_time <= '2022-06-01 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-08-01 00:00:00' AND setl_time <= '2022-09-30 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {

service/zh_his_service.go

@@ -1046,6 +1046,62 @@ func ZHGdyb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, i
 
 	return str, str2
 }
+func Gdyb26011(psnNo string, omsgid string, oinfno string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key 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"] = "2601" // 交易编码
+	inputData["psn_no"] = psnNo
+	inputData["omsgid"] = omsgid
+	inputData["oinfno"] = oinfno
+
+	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 := gdyb_url + "2601"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+	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)
+	return str
+}
 
 //  住院结算撤销
 func Gdyb2305(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {