Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/gdyb_controller.go

@@ -1,8 +1,13 @@
 package controllers
 
 import (
+	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
+	"io/ioutil"
 )
 
 type GdybController struct {
@@ -14,7 +19,7 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/two", &GdybController{}, "get:PostTwo")
 	beego.Router("/gdyb/three", &GdybController{}, "get:PostThree")
 	beego.Router("/gdyb/four", &GdybController{}, "get:PostFour")
-	beego.Router("/gdyb/five", &GdybController{}, "get:PostFive")
+	beego.Router("/gdyb/five", &GdybController{}, "post:PostFive")
 	beego.Router("/gdyb/six", &GdybController{}, "get:PostSix")
 	beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
 	beego.Router("/gdyb/eight", &GdybController{}, "get:PostEight")
@@ -23,11 +28,56 @@ func GdybRegistRouters() {
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
 
+type Result struct {
+	ErrMsg      interface{} `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+	Output      struct {
+		Baseinfo struct {
+			Age         float64 `json:"age"`
+			Brdy        string  `json:"brdy"`
+			Certno      string  `json:"certno"`
+			Gend        string  `json:"gend"`
+			Naty        string  `json:"naty"`
+			PsnCertType string  `json:"psn_cert_type"`
+			PsnName     string  `json:"psn_name"`
+			PsnNo       string  `json:"psn_no"`
+		} `json:"baseinfo"`
+		Idetinfo []interface{} `json:"idetinfo"`
+		Iinfo    []struct {
+			Balc                   int64       `json:"balc"`
+			CvlservFlag            string      `json:"cvlserv_flag"`
+			EmpName                string      `json:"emp_name"`
+			InsuplcAdmdvs          string      `json:"insuplc_admdvs"`
+			Insutype               string      `json:"insutype"`
+			PausInsuDansuplcAdmdvs string      `json:"paus_insu_dansuplc_admdvs"`
+			PausInsuDate           interface{} `json:"paus_insu_date"`
+			PsnInsuDate            string      `json:"psn_insu_date"`
+			PsnInsuStas            string      `json:"psn_insu_stas"`
+			PsnType                string      `json:"psn_type"`
+		} `json:"iinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
 func (c *GdybController) PostOne() {
 	certNo := c.GetString("cert_no")
 	result := service.Gdyb1101(certNo)
+
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println("11111")
+		fmt.Println(dat)
+		//fmt.Println(dat["status"])
+	} else {
+		fmt.Println(err)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": result,
+		"pre": dat,
 	})
 }
 
@@ -36,8 +86,18 @@ func (c *GdybController) PostTwo() {
 	insutype := c.GetString("insutype")
 	certNo := c.GetString("cert_no")
 	result := service.Gdyb2201(psnNo, insutype, certNo)
+
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println("22222222")
+		fmt.Println(dat)
+		//fmt.Println(dat["status"])
+	} else {
+		fmt.Println(err)
+	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": result,
+		"pre": dat,
 	})
 }
 
@@ -59,15 +119,53 @@ func (c *GdybController) PostFour() {
 	})
 }
 
-func (c *GdybController) PostFive() {
-	psnNo := c.GetString("psn_no")
-	mdtrtId := c.GetString("mdtrt_id")
-	prescriptions, _ := service.GetHisPrescription(4, 1, 1605715200)
+type All struct {
+	HisPrescription HisPrescription
+	mdtrt_id        string
+	psn_no          string
+}
 
-	result := service.Gdyb2204(psnNo, mdtrtId, prescriptions)
+type HisPrescription struct {
+	ID                     int64                            `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                            `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status                 int64                            `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                            `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                            `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number                 string                           `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                            `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 int64                            `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                            `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                            `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	HisDoctorAdviceInfo    []*models.HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
+	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
+}
 
+func (c *GdybController) PostFive() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	userJSONBytes, _ := json.Marshal(respJSON["pre"])
+	var hp []*models.HisPrescription
+	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string))
+
+	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": result,
+		"pre": dat,
 	})
 }
 
@@ -76,6 +174,7 @@ func (c *GdybController) PostSix() {
 	mdtrtId := c.GetString("mdtrt_id")
 	chrgBchno := c.GetString("chrg_bchno")
 	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -87,9 +186,17 @@ func (c *GdybController) PostSeven() {
 	chrgBchno := c.GetString("chrg_bchno")
 	certNo := c.GetString("cert_no")
 	insutype := c.GetString("insutype")
-	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype)
+	total := c.GetString("total")
+
+	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total)
+	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": result,
+		"pre": dat,
 	})
 }
 
@@ -99,9 +206,17 @@ func (c *GdybController) PostEight() {
 	chrgBchno := c.GetString("chrg_bchno")
 	certNo := c.GetString("cert_no")
 	insutype := c.GetString("insutype")
-	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype)
+	total := c.GetString("total")
+	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total)
+	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": result,
+		"pre": dat,
 	})
 }
 

controllers/his_api_controller.go

@@ -5,9 +5,13 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"io/ioutil"
+	"math/rand"
+	"net/http"
 	"reflect"
 	"strconv"
 	"time"
@@ -32,6 +36,9 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
 	beego.Router("/api/doctorworkstation/printcasehistory/get", &HisApiController{}, "get:GetPrintHisPatientCaseHistory")
 
+	beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
+	beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
+
 }
 
 func (c *HisApiController) GetHisPatientList() {
@@ -91,12 +98,8 @@ func (c *HisApiController) GetHisPatientInfo() {
 	admin := c.GetAdminUserInfo()
 	his_patient_info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
-
 	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
-
-	//prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":     his_patient_info,
 		"xt_info":      xt_patient_info,
@@ -137,7 +140,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	//diagnose := c.GetString("diagnose")
 	//sick_history := c.GetString("sick_history")
 	doctor, _ := c.GetInt64("doctor")
-	//departm/**/ent, _ := c.GetInt64("department")
+	//department, _ := c.GetInt64("department")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -157,6 +160,22 @@ func (c *HisApiController) CreateHisPrescription() {
 	adminInfo := c.GetAdminUserInfo()
 	recordDateTime := theTime.Unix()
 
+	//hpInfo := models.HisPrescriptionInfo{
+	//	UserOrgId: adminInfo.CurrentOrgId,
+	//	RecordDate: theTime.Unix(),
+	//	PatientId:   patient_id,
+	//	Status: 1,
+	//	Ctime: time.Now().Unix(),
+	//	Mtime: time.Now().Unix(),
+	//	Creator: adminInfo.AdminUser.Id,
+	//	Modifier: adminInfo.AdminUser.Id,
+	//	Diagnosis: diagnose,
+	//	SickHistory: sick_history,
+	//	Departments:department,
+	//
+	//}
+	//
+
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -493,6 +512,203 @@ func (c *HisApiController) GetCaseHistoryTemplate() {
 	})
 
 }
+
+type ResultTwo struct {
+	ErrMsg      interface{} `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+	Output      struct {
+		Baseinfo struct {
+			Age         float64 `json:"age"`
+			Brdy        string  `json:"brdy"`
+			Certno      string  `json:"certno"`
+			Gend        string  `json:"gend"`
+			Naty        string  `json:"naty"`
+			PsnCertType string  `json:"psn_cert_type"`
+			PsnName     string  `json:"psn_name"`
+			PsnNo       string  `json:"psn_no"`
+		} `json:"baseinfo"`
+		Idetinfo []interface{} `json:"idetinfo"`
+		Iinfo    []struct {
+			Balc                   int64       `json:"balc"`
+			CvlservFlag            string      `json:"cvlserv_flag"`
+			EmpName                string      `json:"emp_name"`
+			InsuplcAdmdvs          string      `json:"insuplc_admdvs"`
+			Insutype               string      `json:"insutype"`
+			PausInsuDansuplcAdmdvs string      `json:"paus_insu_dansuplc_admdvs"`
+			PausInsuDate           interface{} `json:"paus_insu_date"`
+			PsnInsuDate            string      `json:"psn_insu_date"`
+			PsnInsuStas            string      `json:"psn_insu_stas"`
+			PsnType                string      `json:"psn_type"`
+		} `json:"insuinfo"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
+type ResultThree struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      interface{} `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+	Output      struct {
+		Data struct {
+			IptOtpNo string `json:"ipt_otp_no"`
+			MdtrtID  string `json:"mdtrt_id"`
+			PsnNo    string `json:"psn_no"`
+		} `json:"data"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
+func (c *HisApiController) GetRegisterInfo() {
+	id, _ := c.GetInt64("id")
+	record_time := c.GetString("record_time")
+
+	adminInfo := c.GetAdminUserInfo()
+	patient, _ := service.GetPatientByID(adminInfo.CurrentOrgId, id)
+
+	if patient == nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+	if len(patient.IdCardNo) == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIDCartNo)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + "44020219710324062X"
+	resp, requestErr := http.Get(api)
+
+	if requestErr != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	defer resp.Body.Close()
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	var respJSON map[string]interface{}
+
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	userJSONBytes, _ := json.Marshal(userJSON)
+	var res ResultTwo
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	Iinfos, _ := json.Marshal(res.Output.Iinfo)
+	Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+	infoStr := string(Iinfos)
+	idetinfoStr := string(Idetinfos)
+
+	his := models.VMHisPatient{
+		PsnNo:       res.Output.Baseinfo.PsnNo,
+		PsnCertType: res.Output.Baseinfo.PsnCertType,
+		Certno:      res.Output.Baseinfo.Certno,
+		PsnName:     res.Output.Baseinfo.PsnName,
+		Gend:        res.Output.Baseinfo.Gend,
+		Naty:        res.Output.Baseinfo.Naty,
+		Brdy:        res.Output.Baseinfo.Brdy,
+		Age:         res.Output.Baseinfo.Age,
+		Iinfo:       infoStr,
+		Idetinfo:    idetinfoStr,
+		PatientId:   patient.ID,
+		RecordDate:  theTime.Unix(),
+	}
+	fmt.Println(his)
+
+	if res.Output.Iinfo == nil || len(res.Output.Iinfo) == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterOneException)
+		return
+	}
+
+	count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
+	if count <= 0 {
+		api := "http://127.0.0.1:9531/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" + res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		userJSONBytes, _ := json.Marshal(respJSON)
+		var res ResultThree
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res.Infcode == -1 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
+			return
+		}
+		fmt.Println("000!!!!!!")
+		fmt.Println(res)
+		fmt.Println(res.Output.Data.MdtrtID)
+		fmt.Println(res.Output.Data.PsnNo)
+		fmt.Println(res.Output.Data.IptOtpNo)
+
+		his.Number = res.Output.Data.MdtrtID
+		his.PsnNo = res.Output.Data.PsnNo
+		his.IptOtpNo = res.Output.Data.IptOtpNo
+		his.IdCardNo = patient.IdCardNo
+		his.PhoneNumber = patient.Phone
+		his.UserOrgId = adminInfo.CurrentOrgId
+		his.Status = 1
+		his.Ctime = time.Now().Unix()
+		his.Mtime = time.Now().Unix()
+		err := service.CreateHisPatientTwo(&his)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"his_info": his,
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+	}
+
+}
+
 func (c *HisApiController) GetPrintHisPatientCaseHistory() {
 
 }
@@ -567,6 +783,11 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
 		advice.Price = price
 	}
+	if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
+		med_list_codg, _ := json["medical_insurance_number"].(string)
+		advice.MedListCodg = med_list_codg
+	}
+
 	return 0
 }
 
@@ -587,3 +808,160 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 	return 0
 
 }
+
+type ResultFour struct {
+	Cainfo      string `json:"cainfo"`
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Result []struct {
+			BasMednFlag      string `json:"bas_medn_flag"`
+			ChldMedcFlag     string `json:"chld_medc_flag"`
+			ChrgitmLv        string `json:"chrgitm_lv"`
+			Cnt              int64  `json:"cnt"`
+			DetItemFeeSumamt int64  `json:"det_item_fee_sumamt"`
+			DrtReimFlag      string `json:"drt_reim_flag"`
+			FeedetlSn        string `json:"feedetl_sn"`
+			FulamtOwnpayAmt  int64  `json:"fulamt_ownpay_amt"`
+			HiNegoDrugFlag   string `json:"hi_nego_drug_flag"`
+			InscpScpAmt      int64  `json:"inscp_scp_amt"`
+			ListSpItemFlag   string `json:"list_sp_item_flag"`
+			LmtUsedFlag      string `json:"lmt_used_flag"`
+			MedChrgitmType   string `json:"med_chrgitm_type"`
+			Memo             string `json:"memo"`
+			OverlmtAmt       int64  `json:"overlmt_amt"`
+			PreselfpayAmt    int64  `json:"preselfpay_amt"`
+			Pric             int64  `json:"pric"`
+			PricUplmtAmt     int64  `json:"pric_uplmt_amt"`
+			SelfpayProp      int64  `json:"selfpay_prop"`
+		} `json:"result"`
+	} `json:"output"`
+	RefmsgTime  string `json:"refmsg_time"`
+	RespondTime string `json:"respond_time"`
+	Signtype    string `json:"signtype"`
+	WarnMsg     string `json:"warn_msg"`
+}
+
+type ResultFive struct {
+	Insutype string `json:"insutype"`
+}
+
+func (c *HisApiController) GetUploadInfo() {
+	id, _ := c.GetInt64("id")
+	record_time := c.GetString("record_time")
+
+	//record_date := c.GetString("record_date")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	adminUser := c.GetAdminUserInfo()
+	prescriptions, _ := service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
+
+	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
+
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormat := tempTime.Format("20060102150405")
+	chrgBchno := rand.Intn(100000) + 10000
+	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+
+	client := &http.Client{}
+	data := make(map[string]interface{})
+	data["psn_no"] = his.PsnNo
+	data["mdtrt_id"] = his.Number
+	data["pre"] = prescriptions
+	data["chrg_bchno"] = chrg_bchno
+	bytesData, _ := json.Marshal(data)
+	req, _ := http.NewRequest("POST", "http://127.0.0.1:9531/"+"gdyb/five", bytes.NewReader(bytesData))
+	resp, _ := client.Do(req)
+
+	defer resp.Body.Close()
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+	userJSONBytes, _ := json.Marshal(respJSON)
+	var res ResultFour
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	var total float64
+	for _, item := range prescriptions {
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				total = total + (subItem.Price * subItem.PrescribingNumber)
+			}
+		}
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				total = total + (subItem.Price * float64(subItem.Count))
+			}
+		}
+	}
+	allTotal := fmt.Sprintf("%.2f", total)
+	fmt.Println(allTotal)
+	if res.Infcode == 0 {
+		var rf []*ResultFive
+		json.Unmarshal([]byte(his.Iinfo), &rf)
+		psn_no := his.PsnNo
+		mdtrt_id := his.Number
+		chrg_bchno := chrg_bchno
+		cert_no := his.Certno
+		insutype := rf[0].Insutype
+		api := "http://127.0.0.1:9531/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
+			insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
+			"&total=" + allTotal
+		resp, requestErr := http.Get(api)
+
+		if requestErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		defer resp.Body.Close()
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		fmt.Println(respJSON)
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		userJSONBytes, _ := json.Marshal(respJSON)
+		var res ResultFour
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+	} else {
+
+	}
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -643,7 +643,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		evaluation.WeightBefore = weighing_before
 		evaluation.AssessmentTime = time.Now().Unix()
 
-		err = service.UpadatePredialysisEvaluation(&evaluation)
+		err := service.UpadatePredialysisEvaluation(&evaluation)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 			return

enums/error_code.go

@@ -212,6 +212,12 @@ const ( // ErrorCode
 	ErrorCodeOpenStocktWrong = 20053
 
 	ErrorCodeDrugRepeatDataException = 20054
+
+	ErrorCodeIDCartNo = 20055
+
+	ErrorCodeRegisterOneException = 20066
+
+	ErrorCodeRegisterTwoException = 20067
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -414,6 +420,12 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeOpenStocktWrong:   "未开启自动扣减功能,无法出库",
 
 	ErrorCodeDrugRepeatDataException: "该药已经存在，无法添加",
+
+	ErrorCodeIDCartNo: "身份证不能为空",
+
+	ErrorCodeRegisterOneException: "无参保信息",
+
+	ErrorCodeRegisterTwoException: "挂号失败",
 }
 
 type SGJError struct {

models/his_models.go

@@ -237,7 +237,7 @@ func (HisPatientCaseHistory) TableName() string {
 	return "his_patient_case_history"
 }
 
-type HisPatientInfo struct {
+type HisPrescriptionInfo struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	RecordDate   int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
@@ -251,10 +251,12 @@ type HisPatientInfo struct {
 	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType     string `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PType        string `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	SickHistory  string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	Departments  int64  `gorm:"column:departments" json:"departments" form:"departments"`
 }
 
-func (HisPatientInfo) TableName() string {
-	return "his_patient_info"
+func (HisPrescriptionInfo) TableName() string {
+	return "his_prescription_info"
 }
 
 type HisPrescription struct {
@@ -403,18 +405,19 @@ func (HisDoctorAdviceTemplate) TableName() string {
 }
 
 type HisPrescriptionProject struct {
-	ID             int64   `gorm:"column:id" json:"id" form:"id"`
-	ProjectId      int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price          float64 `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status         int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime          int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime          int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId   int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	RecordDate     int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count          int64   `gorm:"column:count" json:"count" form:"count"`
+	ID             int64       `gorm:"column:id" json:"id" form:"id"`
+	ProjectId      int64       `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price          float64     `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId      int64       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status         int64       `gorm:"column:status" json:"status" form:"status"`
+	Ctime          int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId      int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId   int64       `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate     int64       `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId int64       `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count          int64       `gorm:"column:count" json:"count" form:"count"`
+	HisProject     *HisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -498,3 +501,108 @@ type XtHisPatient struct {
 func (XtHisPatient) TableName() string {
 	return "his_patient"
 }
+
+type HisOrder struct {
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Number             int64  `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode            int64  `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg            string `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo             string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg             string `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime        string `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid        string `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+}
+
+func (HisOrder) TableName() string {
+	return "his_order"
+}
+
+type HisOrderInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber      int64   `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	FeedtlSn         int64   `gorm:"column:feedtl_sn" json:"feedtl_sn" form:"feedtl_sn"`
+	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt int64   `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              int64   `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp      float64 `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt  float64 `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt       float64 `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt    float64 `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag      string  `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType   string  `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag   string  `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	Memo             string  `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn        string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt      float64 `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag      string  `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag   string  `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag     string  `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag      string  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv        string  `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId     int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+}
+
+func (HisOrderInfo) TableName() string {
+	return "his_order_info"
+}
+
+type VMHisPatient struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Age                    float64 `gorm:"column:age" json:"age" form:"age"`
+	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
+	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
+	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
+	TreatmentCost          float64 `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
+	CostOfProduction       float64 `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	PsnNo                  string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType            string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                 string  `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName                string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                   string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                   string  `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                   string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                  string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+}
+
+func (VMHisPatient) TableName() string {
+	return "his_patient"
+}

service/gdyb_service.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	SceretKey     = "RhaDw4H0RUbWYyTxmRKM1eSeN0qyGLds" //     secretKey 私钥
-	FixmedinsCOde = "H44022900214"                     // 定点医药机构编号
+	FixmedinsCOde = "H44022900158"                     // 定点医药机构编号
 )
 
 // 人员基本信息
@@ -74,8 +74,8 @@ func Gdyb1101(certNo string) string {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
+	fmt.Println(string(respBytes))
 	str := string(respBytes)
-	fmt.Println(str)
 	return str
 }
 
@@ -285,10 +285,57 @@ type Custom struct {
 	Cut              string
 	FeedetlSn        string
 	Price            string
+	MedListCodg      string
+}
+
+type RequestResult struct {
+	Output      Output `json:"output" form:"output"`
+	Infcode     int64  `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg     string `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo      string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg      string `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime string `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid string `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+}
+type Output struct {
+	Result Result `json:"result" form:"result"`
+}
+
+type Result struct {
+	BasMednFlag      string  `json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType   string  `json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	DetItemFeeSumamt int64   `json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	HiNegoDrugFlag   string  `json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	FulamtOwnpayAmt  float64 `json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+
+	FeedtlSn       int64   `json:"feedtl_sn" form:"feedtl_sn"`
+	UploadDate     int64   `json:"upload_date" form:"upload_date"`
+	AdviceId       int64   `json:"advice_id" form:"advice_id"`
+	Cnt            int64   `json:"cnt" form:"cnt"`
+	Pric           float64 `json:"pric" form:"pric"`
+	PatientId      int64   `json:"patient_id" form:"patient_id"`
+	PricUplmtAmt   float64 `json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp    float64 `json:"selfpay_prop" form:"selfpay_prop"`
+	OverlmtAmt     float64 `json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt  float64 `json:"preselfpay_amt" form:"preselfpay_amt"`
+	Status         int64   `json:"status" form:"status"`
+	Memo           string  `json:"memo" form:"memo"`
+	FeedetlSn      string  `json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime          int64   `json:"mtime" form:"mtime"`
+	InscpScpAmt    float64 `json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag    string  `json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime          int64   `json:"ctime" form:"ctime"`
+	ListSpItemFlag string  `json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag   string  `json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag    string  `json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv      string  `json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId      int64   `json:"user_org_id" form:"user_org_id"`
+	HisPatientId   int64   `json:"his_patient_id" form:"his_patient_id"`
+	OrderId        int64   `json:"order_id" form:"order_id"`
 }
 
 //  门诊费用明细信息上传
-func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription) string {
+func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -296,7 +343,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
-	chrgBchno := rand.Intn(100000) + 10000
+	//chrgBchno := rand.Intn(100000) + 10000
 
 	var customs []*Custom
 
@@ -311,6 +358,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
 					FeedetlSn:        timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(subItem.DrugId, 10),
 					Price:            fmt.Sprintf("%.2f", subItem.Price),
+					MedListCodg:      subItem.MedListCodg,
 				}
 
 				customs = append(customs, cus)
@@ -342,7 +390,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	feedetail := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "2204" // 交易编码
 
-	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
 	for _, item := range customs {
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
@@ -353,7 +401,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["rxno"] = ""                                   // 处方号
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
 		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
-		feedetailInfo["med_list_codg"] = "XN05AEQ010B001010101435"   // 医疗目录编码
+		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = FixmedinsCOde            // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
 		feedetailInfo["cnt"] = item.Cut                              // 数量
@@ -388,7 +436,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return ""
 	}
 	reader := bytes.NewReader(bytesData)
 
@@ -396,7 +444,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
@@ -409,16 +457,17 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return ""
 	}
-	str := string(respBytes)
-	fmt.Println(str)
-	return ""
+	return string(respBytes)
+	//var result RequestResult
+	//json.Unmarshal(respBytes, &result)
+	//return &result
 }
 
 //  门诊费用明细信息撤销
@@ -482,7 +531,7 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string) string {
 }
 
 //  门诊预结算
-func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string) string {
+func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -494,16 +543,16 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2206" // 交易编码
 
-	inputData["psn_no"] = psnNo          // 人员编号 （来自1101接口返回）
-	inputData["mdtrt_cert_type"] = "02"  // 就诊凭证类型
-	inputData["mdtrt_cert_no"] = certNo  // 就诊凭证编号
-	inputData["med_type"] = "11"         // 医疗类别 11 普通门诊  12 门诊挂号
-	inputData["medfee_sumamt"] = "99.00" // 医疗费总额
-	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["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["med_type"] = "11"        // 医疗类别 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    // 险种类型
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -546,7 +595,7 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string) string {
+func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -558,17 +607,17 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2207" // 交易编码
 
-	inputData["psn_no"] = psnNo            // 人员编号 （来自1101接口返回）
-	inputData["mdtrt_cert_type"] = "02"    // 就诊凭证类型
-	inputData["mdtrt_cert_no"] = certNo    // 就诊凭证编号
-	inputData["med_type"] = "11"           // 医疗类别 11 普通门诊  12 门诊挂号
-	inputData["medfee_sumamt"] = "3226.00" // 医疗费总额
-	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"] = ""               // 发票号
+	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	inputData["med_type"] = "11"        // 医疗类别 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 //交易输入
@@ -719,7 +768,14 @@ func SetInputMessage(nonce string, timestamp int64) map[string]interface{} {
 	inputMessage["opter_name"] = "测试用户"                                                        // 经办人姓名
 	inputMessage["inf_time"] = timeFormatOne                                                   // 交易时间
 	inputMessage["fixmedins_code"] = FixmedinsCOde                                             // 定点医药机构编号
-	inputMessage["fixmedins_name"] = "翁源百伦血液透析有限公司透析中心"                                        //定点医药机构名称
+	inputMessage["fixmedins_name"] = "翁源沅胜血液透析中心"                                              //定点医药机构名称
 	inputMessage["sign_no"] = ""                                                               //交易签到流水号
 	return inputMessage
 }
+
+func FindHisRegisterRecord(record_time int64, patient_id int64, org_id int64) (total int64, err error) {
+
+	err = readDb.Model(&models.VMHisPatient{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND record_date = ?", org_id, patient_id, record_time).Count(&total).Error
+
+	return
+}

service/his_service.go

@@ -75,7 +75,7 @@ func GetAllBaseDrugStockList(org_id int64) (drugs []*models.BaseDrugLib, err err
 }
 
 func GetHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info HisPatient, err error) {
-	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, patient_id).First(&info).Error
+	err = readDb.Model(&models.HisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
 	return
 }
 
@@ -119,7 +119,9 @@ func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
 func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
-		Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
@@ -161,3 +163,13 @@ func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
 	err = writeDb.Create(project).Error
 	return
 }
+
+func CreateHisPatientTwo(patient *models.VMHisPatient) error {
+	err := writeDb.Create(&patient).Error
+	return err
+}
+
+func GetVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info models.VMHisPatient, err error) {
+	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
+	return
+}