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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true

controllers/sg/gdyb_controller.go

@@ -22,7 +22,7 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/four", &GdybController{}, "get:PostFour")
 	beego.Router("/gdyb/five", &GdybController{}, "post:PostFive")
 	beego.Router("/gdyb/six", &GdybController{}, "get:PostSix")
-	beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
+	//beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
 	beego.Router("/gdyb/eight", &GdybController{}, "get:PostEight")
 	//beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
 	beego.Router("/gdyb/ten", &GdybController{}, "get:PostTen")
@@ -274,36 +274,36 @@ func (c *GdybController) PostSix() {
 	})
 }
 
-func (c *GdybController) PostSeven() {
-	psnNo := c.GetString("psn_no")
-	mdtrtId := c.GetString("mdtrt_id")
-	chrgBchno := c.GetString("chrg_bchno")
-	certNo := c.GetString("cert_no")
-	insutype := c.GetString("insutype")
-	total := c.GetString("total")
-	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
-	fixmedins_code := c.GetString("fixmedins_code")
-	insuplc_admdvs := c.GetString("insuplc_admdvs")
-	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	secret_key := c.GetString("secret_key")
-	med_type := c.GetString("med_type")
-	id_card_type, _ := c.GetInt64("id_card_type")
-
-	//result := service.Gdyb2206(psnNo/**/, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, secret_key)
-
-	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type)
-
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
-	})
-}
+//func (c *GdybController) PostSeven() {
+//	psnNo := c.GetString("psn_no")
+//	mdtrtId := c.GetString("mdtrt_id")
+//	chrgBchno := c.GetString("chrg_bchno")
+//	certNo := c.GetString("cert_no")
+//	insutype := c.GetString("insutype")
+//	total := c.GetString("total")
+//	org_name := c.GetString("org_name")
+//	doctor := c.GetString("doctor")
+//	fixmedins_code := c.GetString("fixmedins_code")
+//	insuplc_admdvs := c.GetString("insuplc_admdvs")
+//	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+//	secret_key := c.GetString("secret_key")
+//	med_type := c.GetString("med_type")
+//	id_card_type, _ := c.GetInt64("id_card_type")
+//
+//	//result := service.Gdyb2206(psnNo/**/, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, secret_key)
+//
+//	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type)
+//
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre": dat,
+//	})
+//}
 
 func (c *GdybController) PostEight() {
 	psnNo := c.GetString("psn_no")

controllers/sz/sz_his_api_controller.go

@@ -2152,6 +2152,9 @@ func (c *SZHisApiController) GetSettleInfo() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type, _ := c.GetInt64("p_type")
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -2186,7 +2189,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 		var end_time int64
 
 		if settle_accounts_type == 1 { //日结
-			prescriptions, _ = service.GetNewHisPrescription(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+			prescriptions, _ = service.GetNewHisPrescriptionTwo(adminUser.CurrentOrgId, his_patient_id, recordDateTime, his.MedicalTreatmentType)
 
 		} else { //月结
 			start_time_str := c.GetString("start_time")
@@ -2209,7 +2212,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 			recordEndTime := theEndTime.Unix()
 			end_time = recordEndTime
 
-			prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, patient_id, recordStartTime, recordEndTime)
+			prescriptions, _ = service.GetMonthHisPrescriptionTwo(adminUser.CurrentOrgId, patient_id, recordStartTime, recordEndTime, his.MedicalTreatmentType)
 		}
 
 		var ids []int64
@@ -2219,7 +2222,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 		patientPrescription, _ := service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 
-		sick, _ := service.FindSickById(patientPrescription.SickType)
+		sick, _ := service.FindSickById(sick_type)
 
 		if sick.ID == 0 {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamSickTypeWrong)
@@ -2543,7 +2546,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 				//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 				tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 				if tempPatient.ID == patient_id {
-					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType, sick.CountryCode)
+					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 						fmt.Println(dat)
@@ -2579,6 +2582,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 						order.PsnCashPay = res.Transbody.Akb067
 						order.PsnPartAmt = res.Transbody.Akb067
 						order.AccountPrice = res.Transbody.Aae240
+						order.MedType = strconv.Itoa(int(reg_type))
 						order.MzNumber = mz_number
 						order.MdtrtId = mz_number
 						order.YiliaoNumber = yiliao_number
@@ -2709,7 +2713,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 				//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 				tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 				if tempPatient.ID == patient_id {
-					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, order.MedfeeSumamt, yiliao_number, verifyCode, order.OrgSetlNumber, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType, sick.CountryCode)
+					result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, order.MedfeeSumamt, yiliao_number, verifyCode, order.OrgSetlNumber, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 						fmt.Println(dat)
@@ -2971,6 +2975,9 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
+	reg_type, _ := c.GetInt64("p_type")
+	sick_type, _ := c.GetInt64("sick_type")
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -3032,7 +3039,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 
 	patientPrescription, _ := service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 
-	sick, _ := service.FindSickById(patientPrescription.SickType)
+	sick, _ := service.FindSickById(sick_type)
 
 	if sick.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamSickTypeWrong)
@@ -3265,6 +3272,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 			InfRefmsgid:         "",
 			OrderStatus:         1,
 			IsMedicineInsurance: 1,
+			MedType:             strconv.Itoa(int(reg_type)),
 			SettleType:          settle_accounts_type,
 			SettleStartTime:     start_time,
 			SettleEndTime:       end_time,
@@ -3356,7 +3364,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 			//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 			tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 			if tempPatient.ID == patient_id {
-				result_three := service.SzybFY004(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType, sick.CountryCode)
+				result_three := service.SzybFY004(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, reg_type, sick.CountryCode)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 					fmt.Println(dat)

service/gdyb_service.go

@@ -872,7 +872,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 
 //  门诊预结算
 //func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, secret_key string) string {
-func Gdyb2206(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, med_type string, id_card_type int64) string {
+func Gdyb2206(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, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) string {
 
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -881,28 +881,30 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 	// 生成输入报文
 	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"] = "2206" // 交易编码
-
-	inputData["psn_no"] = psnNo // 人员编号 （来自1101接口返回）
-
-	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		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["med_type"] = "11"        // 医疗类别 11 普通门诊  12 门诊挂号
+	inputData["med_type"] = med_type    // 医疗类别 11 普通门诊  12 门诊挂号
 	inputData["medfee_sumamt"] = total  // 医疗费总额
 	inputData["psn_setlway"] = "01"     // 个人结算方式 01 按项目结 02 按定额结算
 	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
 	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
 	inputData["acct_used_flag"] = "1"   // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype    // 险种类型
+	inputData["invono"] = ""            // 发票号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -2713,3 +2715,83 @@ func Gdyb2601(psnNo string, omsgid string, oinfno string, org_name string, docto
 	fmt.Println(str)
 	return str
 }
+
+//人员信息版本3
+func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64) 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"] = "1101" // 交易编码
+
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "1"    // 人员证件类型
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "1"    // 人员证件类型
+		}
+	}
+
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = ""          // 人员姓名
+	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 + "1101"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	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()
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str
+}

service/his_service.go

@@ -1253,3 +1253,39 @@ func GetNewHisOrderThree(mdtrt_id string) (order HisOrder, err error) {
 	err = readDb.Model(&HisOrder{}).Where("status = 1 AND mdtrt_id=?  ", mdtrt_id).First(&order).Error
 	return
 }
+
+func UpdateHisPatientThree(his *models.HisPatient) {
+	writeDb.Save(&his)
+}
+
+func GetNewHisPrescriptionTwo(org_id int64, his_patient_id int64, record_date int64, med_type int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1").Preload("GoodInfo", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ? AND order_status <> 2 AND p_type <> 1 AND med_type = ?", org_id, record_date, his_patient_id, med_type).
+		Find(&prescription).Error
+	return
+}
+
+func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_time int64, end_time int64, med_type int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1").Preload("GoodInfo", "status=1")
+		}).
+		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1  AND p_type <> 1 AND med_type = ?", org_id, start_time, end_time, patient_id, med_type).
+		Find(&prescription).Error
+	return
+}