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

models/his_models.go

@@ -117,6 +117,8 @@ type HisPatient struct {
 	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
 	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
+	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 }
 
 func (HisPatient) TableName() string {
@@ -573,6 +575,8 @@ type XtHisPatient struct {
 	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
 	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
+	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 }
 
 func (XtHisPatient) TableName() string {
@@ -656,6 +660,9 @@ type HisOrder struct {
 	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
 	SzMedicineInsuranceInfo string `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
 
+	MzNumber      string `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber string `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
 	SettleEndTime   int64 `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
@@ -754,6 +761,8 @@ type VMHisPatient struct {
 	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 }
 
 func (VMHisPatient) TableName() string {

service/his_service.go

@@ -553,6 +553,9 @@ type HisOrder struct {
 	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
 	SzMedicineInsuranceInfo string `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
 
+	MzNumber      string `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber string `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
@@ -855,7 +858,7 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 }
 
 func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (orders []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND is_medicine_insurance = 1 AND settle_accounts_date <= ? AND settle_accounts_date >= ? AND insutype = ? AND clr_type = ? ", org_id, end_time, start_time, insutype, clr_type).Find(&orders).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND is_medicine_insurance = 1 AND settle_accounts_date <= ? AND settle_accounts_date >= ? AND insutype = ?", org_id, end_time, start_time, insutype, clr_type).Find(&orders).Error
 	return
 }
 

service/sz_his_service.go

@@ -6,19 +6,18 @@ import (
 	"fmt"
 	"gdyb/models"
 	"io/ioutil"
-	"math/rand"
 	"net/http"
 	"time"
 	_ "unsafe"
 )
 
-func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string) string {
+func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, other_number string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "MZ002" // 交易编码
 
-	inputData["akc190"] = serial_number
+	inputData["akc190"] = "202104080950121452"
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
 	inputData["aka130"] = "11"
@@ -26,15 +25,17 @@ func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_co
 	inputData["bkc368"] = "2"
 	inputData["akc264"] = 10.00
 	inputData["listsize"] = 1
-
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormat := tempTime.Format("20060102150405")
 	feedetail := make([]map[string]interface{}, 0)
 	feedetailInfo := make(map[string]interface{})
-	feedetailInfo["aae072"] = "202123242526272829"
-	feedetailInfo["bkf500"] = "202123242526272829"
+	feedetailInfo["aae072"] = timeFormat
+	feedetailInfo["bkf500"] = timeFormat
 	feedetailInfo["ake001"] = "110100002"
 	feedetailInfo["ake005"] = "110100002"
 	feedetailInfo["ake006"] = "普通门诊诊查费"
-	feedetailInfo["aae019"] = "10.00"
+	feedetailInfo["aae019"] = 10.00
 	feedetail = append(feedetail, feedetailInfo)
 	inputData["inputlist"] = feedetail
 
@@ -79,7 +80,7 @@ func SzybFY001(doctor string, doctor_code string, fixmedins_code string, datas [
 	inputMessage["transChannel"] = "10" // 交易编码
 
 	inputData["akc190"] = "G554020210305"
-	inputData["bke384"] = "G5540202103316180298"
+	inputData["bke384"] = serial_number
 	inputData["listsize"] = len(datas)
 
 	feedetail := make([]map[string]interface{}, 0)
@@ -196,9 +197,9 @@ func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
-func SzybFY004(doctor string, doctor_code string, fixmedins_code string, dept_code string, total float64, number string, verify_code string, serial_number string) string {
+func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, verify_code string, serial_number string) string {
 	// 生成输入报文
-	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, number)
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "FY004" // 交易编码
 
@@ -253,7 +254,6 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_co
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
 	inputData["akc190"] = "G554020210305"
-
 	inputData["aka130"] = "11"
 	inputData["bkc320"] = doctor_code
 	inputData["ckc350"] = doctor
@@ -297,6 +297,58 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_co
 	str := string(respBytes)
 	return str
 }
+func SzybJY001(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string) string {
+	// 生成输入报文
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, setl_number)
+	inputData := make(map[string]interface{})
+	inputMessage["transType"] = "JY001" // 交易编码
+
+	inputData["akc190"] = mz_number
+	inputData["bke384"] = setl_number
+
+	inputMessage["transBody"] = inputData
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	//url := "http://192.168.1.99:10000"
+	url := "http://192.168.1.228:17001/szsi-portal/transData"
+
+	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")
+
+	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
+}
+
+func SzybJY002(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string) string {
+	// 生成输入报文
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, setl_number)
+	inputData := make(map[string]interface{})
+	inputMessage["transType"] = "JY002" // 交易编码
+
+	inputData["akc190"] = mz_number
+	inputData["bke384"] = setl_number
 
 //func SzybJY002(doctor string, doctor_code string, fixmedins_code string, dept_code string, number string, verify_code string) string {
 //	// 生成输入报文
@@ -386,15 +438,40 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, dept_co
 //	return str
 //}
 
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+
+	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
+}
+func SzybJY003(doctor string, doctor_code string, fixmedins_code string, setl_number string, mz_number string, verify_code string) string {
+
+	// 生成输入报文
+	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, setl_number)
+
 func SzybML008(doctor string, doctor_code string, fixmedins_code string, datas []*models.DrugDetail) string {
 	//生成输入报文
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
 
 	inputData := make(map[string]interface{})
+	inputMessage["transType"] = "JY003" // 交易编码
 
 	inputData["listsize"] = len(datas)
 	inputMessage["transType"] = "ML008" // 交易编码
 	feedetail := make([]map[string]interface{}, 0)
+	inputData["akc190"] = mz_number
+	inputData["bke384"] = setl_number
 
 	for _, item := range datas {
 		fmt.Println("中国222222", item.DrugDosageName)
@@ -479,8 +556,6 @@ func SetSZInputMessage(doctor string, doctor_code string, fixmedins_code string,
 	inputMessage["operatorCode"] = doctor_code    // 操作员编码
 	inputMessage["operatorName"] = doctor         // 操作员名字
 	inputMessage["operatorPass"] = ""             // 定点协议机构操作人员编码
-	inputMessage["serialNumber"] = fixmedins_code + year + month + day +
-		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
 	inputMessage["serialNumber"] = number
 
 	inputMessage["transReturnCode"] = ""                                           //