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

controllers/dialysis_record_api_controller.go

@@ -265,6 +265,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.CurrentOrgId)
 
+	his_advices, _ := service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+
 	returnData := map[string]interface{}{
 		"patient":                     patient,
 		"schedual":                    schedual,
@@ -289,6 +291,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		"lastDryWeightDislysis":       lastDryWeightDislysis,
 		"headNurses":                  headNurses,
 		"system_prescribe":            systemDialysisPrescribe,
+		"his_advices":                 his_advices,
 	}
 	this.ServeSuccessJSON(returnData)
 

controllers/gdyb_controller.go

@@ -25,7 +25,7 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/eight", &GdybController{}, "get:PostEight")
 	beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
 
-	beego.Router("/gdyb/tem", &GdybController{}, "get:PostTen")
+	//beego.Router("/gdyb/tem", &GdybController{}, "get:PostTen")
 
 }
 
@@ -68,15 +68,14 @@ type Result struct {
 
 func (c *GdybController) PostOne() {
 	certNo := c.GetString("cert_no")
-	result := service.Gdyb1101(certNo)
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+
+	result := service.Gdyb1101(certNo, org_name, doctor)
 
 	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{}{
@@ -88,15 +87,17 @@ func (c *GdybController) PostTwo() {
 	psnNo := c.GetString("psn_no")
 	insutype := c.GetString("insutype")
 	certNo := c.GetString("cert_no")
-	result := service.Gdyb2201(psnNo, insutype, certNo)
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	ipt_otp_no := c.GetString("ipt_otp_no")
+	dept := c.GetString("dept")
+
+	result := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept)
 
 	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{}{
@@ -107,7 +108,11 @@ func (c *GdybController) PostTwo() {
 func (c *GdybController) PostThree() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
-	result := service.Gdyb2202(psnNo, mdtrtId)
+	iptOtpNo := c.GetString("ipt_otp_no")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+
+	result := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -116,7 +121,12 @@ func (c *GdybController) PostThree() {
 func (c *GdybController) PostFour() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
-	result := service.Gdyb2203(psnNo, mdtrtId)
+	doctor := c.GetString("doctor")
+	department := c.GetString("department")
+	diag := c.GetString("diag")
+	org_name := c.GetString("org_name")
+
+	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -159,7 +169,7 @@ func (c *GdybController) PostFive() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string))
+	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string), respJSON["doctor"].(string), respJSON["dept"].(string))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -176,7 +186,10 @@ func (c *GdybController) PostSix() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
 	chrgBchno := c.GetString("chrg_bchno")
-	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno)
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+
+	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
@@ -190,8 +203,10 @@ func (c *GdybController) PostSeven() {
 	certNo := c.GetString("cert_no")
 	insutype := c.GetString("insutype")
 	total := c.GetString("total")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
 
-	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total)
+	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -210,7 +225,10 @@ func (c *GdybController) PostEight() {
 	certNo := c.GetString("cert_no")
 	insutype := c.GetString("insutype")
 	total := c.GetString("total")
-	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total)
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+
+	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -227,16 +245,21 @@ func (c *GdybController) PostNine() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
 	setlId := c.GetString("setl_id")
-	result := service.Gdyb2208(psnNo, mdtrtId, setlId)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": result,
-	})
-}
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
 
-func (c *GdybController) PostTen() {
-	fixmedins_type := c.GetString("fixmedins_type")
-	result := service.Gdyb1201(fixmedins_type)
+	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
 }
+
+//func (c *GdybController) PostTen() {
+//	fixmedins_type := c.GetString("fixmedins_type")
+//	//fixmedins_type := c.GetString("org_name")
+//
+//	result := service.Gdyb1201(fixmedins_type)
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre": result,
+//	})
+//}

controllers/his_api_controller.go

@@ -105,11 +105,14 @@ func (c *HisApiController) GetHisPatientInfo() {
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
 	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":     his_patient_info,
 		"xt_info":      xt_patient_info,
 		"prescription": prescriptions,
 		"case_history": case_history,
+		"info":         patientPrescriptionInfo,
 	})
 	return
 
@@ -144,8 +147,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	diagnose := c.GetString("diagnose")
 	sick_history := c.GetString("sick_history")
-	doctor, _ := c.GetInt64("doctor")
-	department, _ := c.GetInt64("department")
+	doctor := c.GetString("doctor")
+	department := c.GetString("department")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -658,8 +661,19 @@ func (c *HisApiController) GetRegisterInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
 
+	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()
+
 	adminInfo := c.GetAdminUserInfo()
 	patient, _ := service.GetPatientByID(adminInfo.CurrentOrgId, id)
+	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
 
 	if patient == nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
@@ -670,15 +684,9 @@ func (c *HisApiController) GetRegisterInfo() {
 		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
-	}
+	org, _ := service.GetOrgById(adminInfo.CurrentOrgId)
 
-	api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo
+	api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor
 	resp, requestErr := http.Get(api)
 
 	if requestErr != nil {
@@ -734,9 +742,18 @@ func (c *HisApiController) GetRegisterInfo() {
 		return
 	}
 
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormat := tempTime.Format("20060102150405")
+	chrgBchno := rand.Intn(100000) + 10000
+	ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
+
 	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
+		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 +
+			"&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
+			"&dept=" + patientPrescription.Departments
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -978,12 +995,19 @@ func (c *HisApiController) GetUploadInfo() {
 	chrgBchno := rand.Intn(100000) + 10000
 	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 
+	org, _ := service.GetOrgById(adminUser.CurrentOrgId)
+	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
+
 	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
+	data["org_name"] = org.OrgName
+	data["doctor"] = patientPrescription.Doctor
+	data["dept"] = patientPrescription.Departments
+
 	bytesData, _ := json.Marshal(data)
 	req, _ := http.NewRequest("POST", "http://127.0.0.1:9531/"+"gdyb/five", bytes.NewReader(bytesData))
 	resp, _ := client.Do(req)
@@ -1102,6 +1126,8 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 		}
 
+		org, _ := service.GetOrgById(adminUser.CurrentOrgId)
+		patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
 		allTotal := fmt.Sprintf("%.2f", total)
 		if res.Infcode == 0 {
 			var rf []*ResultFive
@@ -1113,7 +1139,7 @@ func (c *HisApiController) GetUploadInfo() {
 			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
+				"&total=" + allTotal + "&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor
 			resp, requestErr := http.Get(api)
 
 			if requestErr != nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -367,6 +367,8 @@ func (this *DialysisAPIController) DialysisRecord() {
 
 	//operators, _ := service.GetAllAdminUserES(adminInfo.Org.Id, adminInfo.App.Id)
 
+	his_advices, _ := service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
+
 	if getLPEErr != nil {
 		this.ErrorLog("获取上一次透前评估失败:%v", getLPEErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -412,6 +414,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"config":                         gobalConfig,
 		"dry_weight":                     lastDryWeightDislysis,
 		"system_prescription":            systemDialysisPrescribe,
+		"his_advices":                    his_advices,
 	}
 	this.ServeSuccessJSON(returnData)
 }

models/his_models.go

@@ -251,8 +251,8 @@ type HisPrescriptionInfo struct {
 	Modifier     int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
-	Doctor       int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments  int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	Doctor       string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments  string `gorm:"column:departments" json:"departments" form:"departments"`
 	SickHistory  string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
 }
 
@@ -271,7 +271,7 @@ type HisPrescription struct {
 	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"`
+	Doctor                 string                    `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"`
 	IsFinish               int64                     `gorm:"column:is_finish" json:"is_finish" form:"is_finish"`

service/gdyb_service.go

@@ -17,18 +17,18 @@ import (
 
 const (
 	SceretKey     = "RhaDw4H0RUbWYyTxmRKM1eSeN0qyGLds" //     secretKey 私钥
-	FixmedinsCOde = "H44020500197"                     // 定点医药机构编号
+	FixmedinsCOde = "H44022900158"                     // 定点医药机构编号
 )
 
 // 人员基本信息
-func Gdyb1101(certNo string) string {
+func Gdyb1101(certNo string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101"      // 交易编码
@@ -80,7 +80,7 @@ func Gdyb1101(certNo string) string {
 }
 
 // 门诊挂号
-func Gdyb2201(psnNo string, insutype string, certNo string) string {
+func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doctor string, ipt_otp_no string, dept string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -89,7 +89,7 @@ func Gdyb2201(psnNo string, insutype string, certNo string) string {
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2201"        // 交易编码
@@ -98,11 +98,11 @@ func Gdyb2201(psnNo string, insutype string, certNo string) string {
 	inputData["begntime"] = timeFormatOne // 开始时间
 	inputData["mdtrt_cert_type"] = "02"   // 就诊凭证类型
 	inputData["mdtrt_cert_no"] = certNo   // 就诊凭证编号
-	inputData["ipt_otp_no"] = "10000110"  // 住院/门诊号
+	inputData["ipt_otp_no"] = ipt_otp_no  // 住院/门诊号
 	inputData["atddr_no"] = "1002"        // 医师编码
-	inputData["dr_name"] = "刘志刚"          // 医师姓名
+	inputData["dr_name"] = doctor         // 医师姓名
 	inputData["dept_code"] = "3002"       // 科室编码
-	inputData["dept_name"] = "血透中心"       // 科室名称
+	inputData["dept_name"] = dept         // 科室名称
 	inputData["caty"] = "A03.06"          // 科别
 
 	input["data"] = inputData
@@ -146,20 +146,20 @@ func Gdyb2201(psnNo string, insutype string, certNo string) string {
 }
 
 // 门诊挂号撤销
-func Gdyb2202(psnNo string, mdtrtId string) string {
+func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2202"       // 交易编码
 	inputData["psn_no"] = psnNo          // 人员编号 （来自1101接口返回）
 	inputData["mdtrt_id"] = mdtrtId      // 就诊 ID（来自2201接口返回）
-	inputData["ipt_otp_no"] = "10000110" // 住院/门诊号
+	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -202,7 +202,7 @@ func Gdyb2202(psnNo string, mdtrtId string) string {
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string) string {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -211,7 +211,7 @@ func Gdyb2203(psnNo string, mdtrtId string) string {
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
@@ -231,10 +231,10 @@ func Gdyb2203(psnNo string, mdtrtId string) string {
 	diseinfo_sun["diag_type"] = "1"           // 诊断类别
 	diseinfo_sun["diag_srt_no"] = "1"         // 诊断排序号
 	diseinfo_sun["diag_code"] = "A04.902"     // 诊断代码
-	diseinfo_sun["diag_name"] = "细菌性腹泻"       // 诊断名称
-	diseinfo_sun["diag_dept"] = "肾内科"         // 诊断科室
+	diseinfo_sun["diag_name"] = diag          // 诊断名称
+	diseinfo_sun["diag_dept"] = department    // 诊断科室
 	diseinfo_sun["dise_dor_no"] = "1002"      // 诊断医生编码
-	diseinfo_sun["dise_dor_name"] = "马桂平"     // 诊断医生姓名
+	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
 	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
 	diseinfo_sun["vali_flag"] = "1"           // 有效标志
 
@@ -335,7 +335,7 @@ type Result struct {
 }
 
 //  门诊费用明细信息上传
-func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string) string {
+func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -374,6 +374,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+					MedListCodg:      subItem.MedListCodg,
 				}
 				fmt.Println(cus.FeedetlSn)
 
@@ -385,7 +386,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	fmt.Println(customs)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	feedetail := make([]map[string]interface{}, 0)
 	inputMessage["infno"] = "2204" // 交易编码
@@ -411,9 +412,9 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["prd_days"] = "0"                              // 周期天数
 		feedetailInfo["medc_way_dscr"] = ""                          // 用药途径描述
 		feedetailInfo["bilg_dept_codg"] = "3002"                     // 开单科室编码
-		feedetailInfo["bilg_dept_name"] = "血透中心"                     // 开单科室名称
+		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
 		feedetailInfo["bilg_dr_codg"] = "1002"                       // 开单医生编码
-		feedetailInfo["bilg_dr_name"] = "刘志刚"                        // 开单医师姓名
+		feedetailInfo["bilg_dr_name"] = doctor                       // 开单医师姓名
 		feedetailInfo["acord_dept_codg"] = ""                        // 受单科室编码
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
 		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
@@ -471,14 +472,14 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 }
 
 //  门诊费用明细信息撤销
-func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string) string {
+func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2205" // 交易编码
@@ -531,20 +532,20 @@ func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string) string {
 }
 
 //  门诊预结算
-func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string) string {
+func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2206" // 交易编码
 
 	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
-	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+	inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型,
 	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["med_type"] = "11"        // 医疗类别 11 普通门诊  12 门诊挂号
 	inputData["medfee_sumamt"] = total  // 医疗费总额
@@ -595,14 +596,14 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算
-func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string) string {
+func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2207" // 交易编码
@@ -660,14 +661,14 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算撤销
-func Gdyb2208(psnNo string, mdtrtId string, setlId string) string {
+func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2208" // 交易编码
@@ -743,7 +744,7 @@ func GetRandomString(l int) string {
 }
 
 // 生成基础报文
-func SetInputMessage(nonce string, timestamp int64) map[string]interface{} {
+func SetInputMessage(nonce string, timestamp int64, org_name string, doctor string) map[string]interface{} {
 	// 生成签名
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -765,10 +766,10 @@ func SetInputMessage(nonce string, timestamp int64) map[string]interface{} {
 	inputMessage["infver"] = "V1.1"                                                            // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                           // 经办人类别
 	inputMessage["opter"] = "mockuser"                                                         // 经办人
-	inputMessage["opter_name"] = "测试用户"                                                        // 经办人姓名
+	inputMessage["opter_name"] = doctor                                                        // 经办人姓名
 	inputMessage["inf_time"] = timeFormatOne                                                   // 交易时间
 	inputMessage["fixmedins_code"] = FixmedinsCOde                                             // 定点医药机构编号
-	inputMessage["fixmedins_name"] = "韶关市曲江区小坑镇卫生院"                                            //定点医药机构名称
+	inputMessage["fixmedins_name"] = org_name                                                  //定点医药机构名称
 	inputMessage["sign_no"] = ""                                                               //交易签到流水号
 	return inputMessage
 }
@@ -780,20 +781,20 @@ func FindHisRegisterRecord(record_time int64, patient_id int64, org_id int64) (t
 	return
 }
 
-func Gdyb1201(psnNo string) string {
+func Gdyb1201(psnNo string, org_name string, doctor string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "1201"      // 交易编码
-	inputData["fixmedins_type"] = psnNo // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_name"] = "韶关"  // 人员编号 （来自1101接口返回）
-	inputData["fixmedins_code"] = ""    // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "1201"             // 交易编码
+	inputData["fixmedins_type"] = psnNo        // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_name"] = "翁源沅胜血液透析中心" // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_code"] = ""           // 人员编号 （来自1101接口返回）
 
 	input["medinsinfo"] = inputData
 	inputMessage["input"] = input //交易输入

service/mobile_dialysis_service.go

@@ -1611,3 +1611,9 @@ func GetAssessmentBefor(orgid int64, patientid int64, recorddate int64) (*models
 	}
 	return &evaluation, nil
 }
+
+func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his []*models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Find(&his).Error
+	return
+
+}