更新

conf/app.conf

@@ -58,68 +58,34 @@ org_id = 10485
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
 gdyb_paasid = test_hosp
 
-readmysqlhost = shengws1.mysql.rds.aliyuncs.com
+readmysqlhost = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 readmysqlport = 3306
-readmysqluser = syh
-readmysqlpass = xhPECP2nFObR8aUK
+readmysqluser = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
+readmysqlpass = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 readmysqlname = sgj_xt
 
-writemysqlhost = shengws1.mysql.rds.aliyuncs.com
+writemysqlhost = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 writemysqlport = 3306
-writemysqluser = syh
-writemysqlpass = xhPECP2nFObR8aUK
+writemysqluser = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
+writemysqlpass = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 writemysqlname = sgj_xt
 
 
-readuserhost = shengws1.mysql.rds.aliyuncs.com
+readuserhost = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 readuserport = 3306
-readuseruser = syh
-readuserpass = xhPECP2nFObR8aUK
+readuseruser = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
+readuserpass = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 readusername = sgj_users
 
-writeuserhost = shengws1.mysql.rds.aliyuncs.com
+writeuserhost = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 writeuserport = 3306
-writeuseruser = syh
-writeuserpass = xhPECP2nFObR8aUK
+writeuseruser = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
+writeuserpass = d7d152f2bc9050ae96752337128bcf8d1f44dd368acb9a86a972f52a0feaf4661c736fa9c0ed44e0aabfb4faf44480cbdf14da00313d
 writeusername = sgj_users
 
-readmiddlehost = shengws1.mysql.rds.aliyuncs.com
-readmiddleport = 3306
-readmiddleuser = syh
-readmiddlepass = xhPECP2nFObR8aUK
-readmiddlename = ky_xt_middle
 
-writemiddlehost = shengws1.mysql.rds.aliyuncs.com
-writemiddleport = 3306
-writemiddleuser = syh
-writemiddlepass = xhPECP2nFObR8aUK
-writemiddlename = ky_xt_middle
 
 
-readsgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
-readsgjpatientmysqlport = 3306
-readsgjpatientmysqluser = syh
-readsgjpatientmysqlpass = xhPECP2nFObR8aUK
-readsgjpatientmysqlname = sgj_patient
-
-writesgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
-writesgjpatientmysqlport = 3306
-writesgjpatientmysqluser = syh
-writesgjpatientmysqlpass = xhPECP2nFObR8aUK
-writesgjpatientmysqlname = sgj_patient
-
-
-readpatienthost = shengws1.mysql.rds.aliyuncs.com
-readpatientport = 3306
-readpatientuser = syh
-readpatientpass = xhPECP2nFObR8aUK
-readpatientname = sgj_cdm
-
-writepatienthost = shengws1.mysql.rds.aliyuncs.com
-writepatientport = 3306
-writepatientuser = syh
-writepatientpass = xhPECP2nFObR8aUK
-writepatientname = sgj_cdm
 
 redishost = 349e580b2a524290.redis.rds.aliyuncs.com
 redisport = 6379
@@ -131,129 +97,3 @@ redisdb = 0
 
 
 
-
-niprocart =  63
-jms = 58
-fistula_needle_set = 65
-fistula_needle_set_16 = 64
-hemoperfusion = 55
-dialyser_sterilised = 12
-filtryzer = 53
-dialyzers = 8
-injector = 81
-bloodlines = 42
-tubingHemodialysis = 30
-package = 82
-aliquid = 83
-
-
-
-[dev]
-mobile_token_expiration_second = 3600
-httpdomain = http://new_mobile.xt.api.sgjyun.com
-sso_domain = https://testsso.sgjyun.com
-call_domain = http://hf.szjkhd.com
-front_end_domain = "http://xt.test.sgjyun.com/#"
-
-org_id = 4
-#url  = "http://192.168.1.228:17001/szsi-portal/transData"
-# gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
-#gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
-#url = "http://192.168.1.88:6666/szsi-portal/transData"
-gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
-#gdyb_url = "http://10.87.67.83:8080/mbs-hi-intf/web/api/webservices/hb/interface/"
-gdyb_paasid = "sztest_hosp"
-#gdyb_paasid = zh_cs
-# gdyb_paasid = test_hosp
-#gdyb_paasid = zq_prd_yjyy
-
-#gdyb_paasid = "zh_prd_yjyy"
-readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readmysqlport = 3306
-readmysqluser = root
-readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = sgj_xt
-
-writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writemysqlport = 3306
-writemysqluser = root
-writemysqlpass = 1Q2W3e4r!@#$　
-writemysqlname = sgj_xt
-
-readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readuserport = 3306
-readuseruser = root
-readuserpass = 1Q2W3e4r!@#$
-readusername = sgj_users
-
-
-writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writeuserport = 3306
-writeuseruser = root
-writeuserpass = 1Q2W3e4r!@#$
-writeusername = sgj_users
-
-
-
-readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readmiddleport = 3306
-readmiddleuser = root
-readmiddlepass = 1Q2W3e4r!@#$
-readmiddlename = ky_xt_middle
-
-writemiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writemiddleport = 3306
-writemiddleuser = root
-writemiddlepass = 1Q2W3e4r!@#$
-writemiddlename = ky_xt_middle
-
-readpatienthost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readpatientport = 3306
-readpatientuser = root
-readpatientpass = 1Q2W3e4r!@#$
-readpatientname = sgj_cdm
-
-writepatienthost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writepatientport = 3306
-writepatientuser = root
-writepatientpass = 1Q2W3e4r!@#$
-writepatientname = sgj_cdm
-
-readsgjpatientmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readsgjpatientmysqlport = 3306
-readsgjpatientmysqluser = root
-readsgjpatientmysqlpass = 1Q2W3e4r!@#$
-readsgjpatientmysqlname = sgj_patient
-
-writesgjpatientmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writesgjpatientmysqlport = 3306
-writesgjpatientmysqluser = root
-writesgjpatientmysqlpass = 1Q2W3e4r!@#$
-writesgjpatientmysqlname = sgj_patient
-
-
-
-
-
-
-
-#redishost = 120.77.235.13
-#redishost = 112.74.16.180
-redishost = localhost
-redisport = 6379
-redispasswrod = syh@#$%123456!
-redisdb = 0
-
-niprocart =  83
-jms = 80
-fistula_needle_set = 81
-fistula_needle_set_16 = 82
-hemoperfusion = 85
-dialyser_sterilised = 84
-filtryzer = 79
-dialyzers = 10000
-injector = 10001
-bloodlines = 10002
-tubingHemodialysis = 10003
-package = 10004
-aliquid = 10005

controllers/coordinate/coordinate_net_controller.go

@@ -0,0 +1,888 @@
+package coordinate
+
+import (
+
+	"fmt"
+	"gdyb/controllers"
+
+	"gdyb/models"
+	"gdyb/service"
+	"gdyb/utils"
+	"github.com/astaxie/beego"
+	"io/ioutil"
+	"encoding/xml"
+
+	"os"
+
+	"time"
+	"encoding/json"
+)
+
+type CoordinatenetController struct {
+	controllers.BaseAuthAPIController
+}
+
+
+func CoordinatenetRcegistRouters() {
+	////内蒙古
+	//beego.Router("/nmg/coordinate/settleAccount", &CoordinatenetController{}, "get:NMGSettleAccount")
+	//beego.Router("/nmg/coordinate/settleAccount/cancel", &CoordinatenetController{}, "get:NMGCancelSettleAccount")
+
+	beego.Router("/nmg/coordinate/querystock", &CoordinatenetController{}, "get:QueryStock")
+	beego.Router("/nmg/coordinate/patient", &CoordinatenetController{}, "get:NMGpatientinfo")
+	beego.Router("/nmg/coordinate/patienttwo", &CoordinatenetController{}, "get:NMGpatientinfotwo")
+
+	beego.Router("/nmg/coordinate/del", &CoordinatenetController{}, "post:NMGdelinfo")
+	beego.Router("/nmg/coordinate/upload", &CoordinatenetController{}, "post:NMGuploadinfo")
+	beego.Router("/nmg/coordinate/settle", &CoordinatenetController{}, "post:NMGsettle")
+
+
+}
+
+////删医嘱
+//func (c *CoordinateController)NMGdeladvice(){
+//	patient_id, _ := c.GetInt64("patient_id")
+//	id, _ := c.GetInt64("id")
+//
+//
+//	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
+//	result, _ := service.GetNMGHisPatientForCoordinate(0,0,0,patient.Name)
+//	var res Data
+//	if err := json.Unmarshal([]byte(result), &res); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	service.CancleNMGPrescriptionForCoordinate(res.List[0].Acf01,)
+//
+//}
+
+
+
+
+
+type ProjectStruct struct {
+	Data []struct {
+		Bbx01   int64       `json:"bbx01"`
+		Bda02   string    `json:"bda02"`
+		Bby01 int64 `json:"bby01"`
+		Bbx04   string    `json:"bbx04"`
+		Bbx05   string    `json:"bbx05"`
+		Bby06   string    `json:"bby06"`
+		Bdg02   string    `json:"bdg02"`
+		Acf01   int64       `json:"acf01"`
+		Price   float64       `json:"price"`
+		Bck01   int64      `json:"bck01"`
+		Lsqty   float64       `json:"lsqty"`
+		Bce03a  string    `json:"bce03a"`
+		Bbx24   string `json:"bbx24"`
+		Bbx25   string `json:"bbx25"`
+	} `json:"data"`
+}
+
+type Medicine struct {
+	Data []struct {
+		Bby01 int `json:"bby01"`
+		Ypmc string  `json:"ypmc"`
+		Gg   string  `json:"gg"`
+		Dw   string  `json:"dw"`
+		Jhj  float64     `json:"jhj"`
+		Pfj  float64 `json:"pfj"`
+		Lsj  float64 `json:"lsj"`
+		Sysl float64     `json:"sysl"`
+		Ypjx string  `json:"ypjx"`
+		Jldw string  `json:"jldw"`
+		Sccj string  `json:"sccj"`
+		Cd   string  `json:"cd"`
+	} `json:"data"`
+}
+
+func (c *CoordinatenetController)QueryStock(){
+	result, _ := service.GetDrugs()
+	result2, _ := service.GetProject()
+	fmt.Println(result)
+	fmt.Println(result2)
+
+	saveLog(result, "", "查询", "查询", "")
+	saveLog(result2, "", "查询", "查询", "")
+	//var dat map[string]interface{}
+	//if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	//
+	//} else {
+	//
+	//}
+	//var dat2 map[string]interface{}
+	//if err := json.Unmarshal([]byte(result2), &dat2); err == nil {
+	//
+	//} else {
+	//
+	//}
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"drug": dat,
+	//	"project":       dat2,
+	//})
+}
+
+
+
+
+//获取患者信息
+func (c *CoordinatenetController) NMGpatientinfo() {
+	name := c.GetString("name")
+	//住院
+	result, _ := service.GetNMGHisPatientForCoordinate(0,0,2,name)
+	////门诊
+	//result1, request1 := service.GetNMGHisPatientForCoordinate(0,0,1,name)
+	saveLog(result, "", "住院查询", "住院查询", "")
+	//saveLog(result1, request1, "门诊查询", "门诊查询", "")
+
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+	//var dat2 map[string]interface{}
+	//if err := json.Unmarshal([]byte(result1), &dat2); err == nil {
+	//
+	//} else {
+	//
+	//}
+
+
+	c.ServeSuccessJSON(map[string]interface{}{
+			"res":        dat,
+			//"res1":			dat2,
+	})
+}
+
+func (c *CoordinatenetController) NMGpatientinfotwo() {
+	name := c.GetString("name")
+	//住院
+	//result, request := service.GetNMGHisPatientForCoordinate(0,0,2,name)
+	//门诊
+	result1, request1 := service.GetNMGHisPatientForCoordinate(0,0,1,name)
+	//saveLog(result, request, "住院查询", "住院查询", "")
+	saveLog(result1, request1, "门诊查询", "门诊查询", "")
+	//
+	//var dat map[string]interface{}
+	//if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	//
+	//} else {
+	//
+	//}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(result1), &dat2); err == nil {
+
+	} else {
+
+	}
+
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		//"res":        dat,
+		"res":			dat2,
+	})
+}
+
+type Responsexml1 struct {
+	XMLName   xml.Name `xml:"root"`
+	ErrorCode int      `xml:"errorcode"`
+	ErrorMsg  string   `xml:"errormsg"`
+	Data      string   `xml:"data"`
+}
+
+
+func (c *CoordinatenetController) NMGdelinfo() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回: %v", err)
+		return
+	}
+	//utils.ErrorLog()
+	result, log := service.CancleNMGPrescriptionForCoordinatetwo("0002", respJSON["xmlStr"].(string))
+	saveLog(result, log, "删除", "删除", "")
+	var res8 Responsexml1
+	if err2 := xml.Unmarshal([]byte(result), &res8); err2 != nil {
+		fmt.Println(err2)
+		return
+	}
+	if res8.ErrorCode == 0{
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":       "成功",
+		})
+
+	}else{
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":      res8.ErrorMsg ,
+		})
+	}
+}
+func (c *CoordinatenetController) NMGuploadinfo() {
+	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
+	}
+
+
+	result, request := service.UploadNMGPrescriptionForCoordinatetwo("0001", respJSON["xmlStr"].(string))
+	saveLog(result, request, "上传", "上传", "")
+
+	var res3 Responsexml
+	if err2 := xml.Unmarshal([]byte(result), &res3); err2 != nil {
+		fmt.Println(err2)
+	}
+
+
+	if res3.ErrorCode == 0{
+		c.ServeSuccessJSON(map[string]interface{}{
+			"res":       res3.Data,
+			"msg":       "成功",
+		})
+
+	}else{
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":      res3.ErrorMsg ,
+			"res":       "",
+		})
+	}
+
+}
+func (c *CoordinatenetController) NMGsettle() {
+	//xmlStr := c.GetString("xmlStr")
+	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["info"])
+	var info models.UploadInfo
+	if err := json.Unmarshal(userJSONBytes, &info); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+
+
+	result, request := service.NMGSettleForCoordinate(info)
+
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+	saveLog(result, request, "记账", "记账", "")
+	c.ServeSuccessJSON(map[string]interface{}{
+		"res":        dat,
+	})
+}
+
+//func (c *CoordinateController)NMGgetcheck(){
+//	patient_id, _ := c.GetInt64("patient_id")
+//	record_date := c.GetString("record_date")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	//diagnosis_id := c.GetString("diagnosis")
+//	//sick_type, _ := c.GetInt64("sick_type")
+//	//reg_type, _ := c.GetInt64("p_type")
+//	org_id, _ := c.GetInt64("org_id")
+//	org_id = 10454
+//	org, _ := service.GetOrgById(org_id)
+//	patient, _ := service.GetPatientByID(org.Id, patient_id)
+//	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
+//	result, request := service.GetNMGHisPatientForCoordinate(0,0,2,patient.Name)
+//	result5, request5 := service.GetNMGHisPatientForCoordinate(0,0,1,patient.Name)
+//
+//	saveLog(result, request, "查询", "查询", "")
+//	saveLog(result5, request5, "查询", "查询", "")
+//
+//	var res Data
+//	if err := json.Unmarshal([]byte(result), &res); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//	var res8 Data
+//	if err := json.Unmarshal([]byte(result5), &res8); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//	if res.Code == 200 || res8.Code == 200 {
+//		var res9  Data
+//		res9.List = append(res9.List,res.List...)
+//		res9.List = append(res9.List,res8.List...)
+//
+//
+//		var li ListItem
+//		for _, item := range  res9.List{
+//			cure_date := strings.Split(item.Vae11, " ")
+//			if cure_date[0] == record_date && patient.Name == item.Vaa05{
+//				li = item
+//			}
+//		}
+//		fmt.Println("11111111")
+//		fmt.Println(li)
+//		fmt.Println("11111111")
+//		timeLayout := "2006-01-02"
+//		loc, _ := time.LoadLocation("Local")
+//		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+//		if err != nil {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//			return
+//		}
+//		org_id := org.Id
+//		recordDateTime := theTime.Unix()
+//		patientPrescription, _ := service.FindPatientPrescriptionInfoTwo(org_id, patient.ID, recordDateTime, 2)
+//		if patientPrescription.ID == 0 {
+//			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(org_id, patient.ID, recordDateTime)
+//		}
+//		//departmwnt, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+//		//admin_user_info, _ := service.GetAdminUserInfoByID(org_id, admin_user_id)
+//		//doctor_info, _ := service.GetAdminUserInfoByID(org_id, patientPrescription.DoctorId)
+//
+//
+//
+//
+//		//service.QueryNMGChenckForCoordinate(li.Acf01,li.Vaa01,li.Vaa07,"")
+//
+//
+//	} else {
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"failed_code": -10,
+//			"msg":         res.Msg,
+//		})
+//	}
+//
+//
+//}
+//func (c *CoordinateController) SettleAccount() {
+//	patient_id, _ := c.GetInt64("patient_id")
+//	record_date := c.GetString("record_date")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	diagnosis_id := c.GetString("diagnosis")
+//	sick_type, _ := c.GetInt64("sick_type")
+//	reg_type, _ := c.GetInt64("p_type")
+//	org_id, _ := c.GetInt64("org_id")
+//	org_id = 3877
+//	org, _ := service.GetOrgById(org_id)
+//	patient, _ := service.GetPatientByID(org.Id, patient_id)
+//	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
+//
+//	result, request := service.GetHisPatientForCoordinate(patient.IdCardNo)
+//	saveLog(result, request, "查询", "查询", org.OrgName)
+//	var res ResultQuery
+//	if err := json.Unmarshal([]byte(result), &res); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	if res.Code == "10000" {
+//		if len(res.Result) == 0 {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisPatientNoRegException)
+//			return
+//		}
+//		timeLayout := "2006-01-02"
+//		loc, _ := time.LoadLocation("Local")
+//		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+//		if err != nil {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//			return
+//		}
+//		org_id := org.Id
+//		recordDateTime := theTime.Unix()
+//		patientPrescription, _ := service.FindPatientPrescriptionInfoTwo(org_id, patient.ID, recordDateTime, 2)
+//		if patientPrescription.ID == 0 {
+//			patientPrescription, _ = service.FindLastPatientPrescriptionInfo(org_id, patient.ID, recordDateTime)
+//		}
+//		departmwnt, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+//		doctor_info, _ := service.GetAdminUserInfoByID(org_id, patientPrescription.DoctorId)
+//		//admin_user_info, _ := service.GetAdminUserInfoByID(org_id, admin_user_id)
+//
+//		var prescriptions []*models.HisPrescription
+//
+//		if settle_accounts_type == 1 { //日结
+//			prescriptions, _ = service.GetUnSettleHisPrescriptionFive(org_id, patient_id, recordDateTime, 2)
+//		} else { //月结
+//
+//			start_time_str := c.GetString("start_time")
+//			end_time_str := c.GetString("end_time")
+//			timeLayout := "2006-01-02"
+//			loc, _ := time.LoadLocation("Local")
+//			theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+//			if err != nil {
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//				return
+//			}
+//			recordStartTime := theStartTime.Unix()
+//			theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+//			if err != nil {
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//				return
+//			}
+//			recordEndTime := theEndTime.Unix()
+//			prescriptions, _ = service.GetUnSettleMonthHisPrescription(org_id, patient_id, recordStartTime, recordEndTime)
+//		}
+//		var total float64
+//
+//		for _, item := range prescriptions {
+//			fmt.Println(item)
+//			if item.Type == 1 { //药品
+//				for _, subItem := range item.HisDoctorAdviceInfo {
+//					total = total + (subItem.Price * subItem.PrescribingNumber)
+//				}
+//			}
+//			if item.Type == 2 { //项目
+//				for _, subItem := range item.HisPrescriptionProject {
+//					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+//					total = total + (subItem.Price * cnt)
+//				}
+//			}
+//
+//		}
+//
+//		var ids []int64
+//
+//		for _, item := range prescriptions {
+//			ids = append(ids, item.ID)
+//		}
+//
+//		var customs []*models.NewCustomTwo
+//		for _, item := range prescriptions {
+//			if item.Type == 1 { //药品
+//				for _, subItem := range item.HisDoctorAdviceInfo {
+//					cus := &models.NewCustomTwo{
+//						AdviceId:         subItem.ID,
+//						ProjectId:        0,
+//						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+//						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
+//						FeedetlSn:        subItem.FeedetlSn,
+//						Price:            fmt.Sprintf("%.2f", subItem.Price),
+//						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
+//						Type:             1,
+//					}
+//					customs = append(customs, cus)
+//				}
+//			}
+//			if item.Type == 2 { //项目
+//				for _, subItem := range item.HisPrescriptionProject {
+//					if subItem.Type == 2 {
+//						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+//						cus := &models.NewCustomTwo{
+//							AdviceId:         0,
+//							ProjectId:        subItem.ID,
+//							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+//							Cut:              fmt.Sprintf("%.4f", cnt),
+//							FeedetlSn:        subItem.FeedetlSn,
+//							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+//							MedListCodg:      subItem.HisProject.MedicalCode,
+//							Type:             2,
+//						}
+//						customs = append(customs, cus)
+//
+//					} else {
+//						cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+//						cus := &models.NewCustomTwo{
+//							AdviceId:         0,
+//							ProjectId:        subItem.ID,
+//							DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
+//							Cut:              fmt.Sprintf("%.4f", cnt),
+//							FeedetlSn:        subItem.FeedetlSn,
+//							Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
+//							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
+//							Type:             3,
+//						}
+//						customs = append(customs, cus)
+//					}
+//
+//				}
+//			}
+//		}
+//
+//		var info models.UploadInfo
+//		info.Vaa01 = int64(res.Result[0].Vaa01)
+//		info.Fasong = "1"
+//		info.Vaa07 = int64(res.Result[0].Vaa07)
+//		info.Bck01c = departmwnt.Number
+//		info.Bce02a = doctor_info.DoctorNumber
+//
+//		diagnosis_ids := strings.Split(patientPrescription.Diagnosis, ",")
+//		var config []*models.HisXtDiagnoseConfig
+//		for _, item := range diagnosis_ids {
+//			id, _ := strconv.ParseInt(item, 10, 64)
+//			diagnosisConfig, _ := service.FindDiagnoseById(id)
+//			config = append(config, &diagnosisConfig)
+//		}
+//		for index, item := range config {
+//			var diag models.Diag
+//			diag.Vao06 = strconv.FormatInt(int64(index+1), 10)
+//			diag.Bak02 = item.CountryCode
+//			info.Diag = append(info.Diag, &diag)
+//		}
+//		var presInfos []*models.PresInfo
+//		var presDetails []*models.PresDetail
+//		for index, item := range prescriptions {
+//			var presDetail models.PresDetail
+//			var presInfo models.PresInfo
+//			presInfo.Cbmid = strconv.FormatInt(item.ID, 10)
+//			if item.Type == 1 {
+//				presInfo.Cbm06 = "0"
+//			} else {
+//				presInfo.Cbm06 = "5"
+//			}
+//
+//			if item.Type == 1 {
+//				presInfo.Cbm07 = item.MedType
+//			} else {
+//				presInfo.Cbm07 = item.MedType
+//			}
+//
+//			presDetail.Vaf59 = strconv.FormatInt(int64(index+1), 10)
+//			var infoItems []*models.Item
+//			for _, subItem := range item.HisDoctorAdviceInfo {
+//				ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
+//
+//				var infoItem models.Item
+//				infoItem.Rownr = "0"
+//				infoItem.Vaf11 = "1"
+//				infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+//				infoItem.Bbx01 = subItem.BaseDrugLib.MedicalInsuranceNumber
+//				infoItem.Bda01 = "1"
+//				infoItem.Bby01 = ""
+//				if subItem.BaseDrugLib.MinUnit != subItem.BaseDrugLib.DoseUnit {
+//					infoItem.Vaf22 = subItem.BaseDrugLib.DrugName + " " + subItem.BaseDrugLib.Dose + subItem.BaseDrugLib.DoseUnit + "*" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit + "/" + subItem.BaseDrugLib.MaxUnit
+//				}
+//				infoItem.Vaf14 = subItem.BaseDrugLib.DrugName
+//				infoItem.Bdi01 = ef.Code
+//				infoItem.Vaf17 = strconv.FormatInt(subItem.Day, 10)
+//				infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
+//				infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
+//				infoItem.Vaf35 = "0"
+//				infoItem.Vaf32 = "0"
+//				infoItem.Bck01b = departmwnt.Number
+//				infoItem.Bck01d = departmwnt.Number
+//				infoItem.Vaf58 = "0"
+//				infoItem.Vaf61 = "1"
+//				infoItems = append(infoItems, &infoItem)
+//			}
+//			for _, subItem := range item.HisPrescriptionProject {
+//				ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
+//
+//				if subItem.Type == 2 {
+//					var infoItem models.Item
+//					infoItem.Rownr = "0"
+//					infoItem.Vaf11 = "1"
+//					infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+//					infoItem.Bbx01 = subItem.HisProject.MedicalCode
+//
+//					if subItem.HisProject.CostClassify == 2 {
+//						infoItem.Bda01 = "T"
+//					} else if subItem.HisProject.CostClassify == 3 {
+//						infoItem.Bda01 = "L"
+//					} else {
+//						infoItem.Bda01 = "T"
+//					}
+//					infoItem.Bby01 = ""
+//					infoItem.Vaf22 = subItem.HisProject.ProjectName
+//					infoItem.Bdi01 = ef.Code
+//					infoItem.Vaf17 = subItem.Day
+//					infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
+//					infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.Count)
+//					infoItem.Vaf35 = "0"
+//					infoItem.Vaf18 = "0"
+//					infoItem.Vaf32 = "0"
+//					infoItem.Bck01b = departmwnt.Number
+//					infoItem.Bck01d = departmwnt.Number
+//					infoItem.Vaf58 = "0"
+//					infoItem.Vaf61 = "1"
+//					infoItems = append(infoItems, &infoItem)
+//
+//				} else {
+//					var infoItem models.Item
+//					infoItem.Rownr = "0"
+//					infoItem.Vaf11 = "1"
+//					infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
+//					infoItem.Bbx01 = subItem.GoodInfo.MedicalInsuranceNumber
+//					infoItem.Bda01 = "M"
+//					infoItem.Bby01 = ""
+//					infoItem.Vaf22 = subItem.GoodInfo.GoodName + " " + subItem.GoodInfo.SpecificationName
+//					infoItem.Bdi01 = ef.Code
+//					infoItem.Vaf17 = subItem.Day
+//					infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
+//					infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.Count)
+//					infoItem.Vaf35 = "0"
+//					infoItem.Vaf32 = "0"
+//					infoItem.Bck01b = departmwnt.Number
+//					infoItem.Bck01d = departmwnt.Number
+//					infoItem.Vaf58 = "0"
+//					infoItem.Vaf61 = "1"
+//					infoItems = append(infoItems, &infoItem)
+//
+//				}
+//
+//			}
+//			presDetail.Item = infoItems
+//			presDetails = append(presDetails, &presDetail)
+//			presInfo.PresDetail = presDetails
+//			presInfos = append(presInfos, &presInfo)
+//		}
+//		info.PresInfo = presInfos
+//
+//		result2, request2 := service.UploadPrescriptionForCoordinate(info)
+//		saveLog(result2, request2, "上传明细", "上传明细", org.OrgName)
+//
+//		var res2 ResultUpload
+//		if err := json.Unmarshal([]byte(result2), &res2); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//		if res2.Code == "10000" {
+//
+//			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(patient.ID, 10)
+//			his := models.VMHisPatient{
+//				Name:                   patient.Name,
+//				Gender:                 patient.Gender,
+//				Birthday:               patient.Birthday,
+//				MedicalTreatmentType:   0,
+//				IdType:                 1,
+//				IdCardNo:               patient.IdCardNo,
+//				BalanceAccountsType:    1,
+//				MedicalInsuranceNumber: "",
+//				RegisterType:           0,
+//				RegisterCost:           0,
+//				TreatmentCost:          0,
+//				Status:                 1,
+//				Ctime:                  time.Now().Unix(),
+//				Mtime:                  time.Now().Unix(),
+//				PsnNo:                  strconv.FormatInt(int64(res.Result[0].Vaa01), 10),
+//				PsnCertType:            "",
+//				Certno:                 patient.IdCardNo,
+//				PsnName:                patient.Name,
+//				Gend:                   "",
+//				Naty:                   "",
+//				Brdy:                   "",
+//				Age:                    0,
+//				Iinfo:                  "",
+//				Idetinfo:               "",
+//				PatientId:              patient.ID,
+//				RecordDate:             theTime.Unix(),
+//				UserOrgId:              org_id,
+//				AdminUserId:            admin_user_id,
+//				IsReturn:               1,
+//				Doctor:                 patientPrescription.DoctorId,
+//				Departments:            patientPrescription.Departments,
+//				IptOtpNo:               ipt_otp_no,
+//				Number:                 strconv.FormatInt(int64(res.Result[0].Vaa07), 10),
+//				PhoneNumber:            patient.Phone,
+//			}
+//			service.UpdateHisPatientStatusten(&his)
+//			service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, org_id)
+//			tm := time.Unix(time.Now().Unix(), 0)
+//
+//			order := &models.HisOrder{
+//				PsnNo:              his.PsnNo,
+//				UserOrgId:          org_id,
+//				HisPatientId:       his.ID,
+//				PatientId:          patient_id,
+//				SettleAccountsDate: recordDateTime,
+//				Ctime:              time.Now().Unix(),
+//				Mtime:              time.Now().Unix(),
+//				Status:             1,
+//				OrderStatus:        1,
+//				MdtrtId:            his.Number,
+//				Number:             ipt_otp_no,
+//				SetlId:             "",
+//				MedfeeSumamt:       total,
+//				MedType:            strconv.Itoa(int(reg_type)),
+//				SettleEndTime:      0,
+//				SettleStartTime:    0,
+//				SettleType:         settle_accounts_type,
+//				Diagnosis:          diagnosis_id,
+//				PType:              2,
+//				SetlTime:           tm.Format("2006-01-02 15:04:05"),
+//			}
+//			err = service.CreateOrder(order)
+//			if err != nil {
+//				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+//				return
+//			}
+//
+//			for _, item := range customs {
+//				var advice_id int64 = 0
+//				var project_id int64 = 0
+//				var item_id int64 = 0
+//
+//				var types int64 = 0
+//
+//				if item.Type == 1 {
+//					advice_id = item.AdviceId
+//					project_id = 0
+//					item_id = 0
+//				} else if item.Type == 2 {
+//					advice_id = 0
+//					item_id = 0
+//
+//					project_id = item.ProjectId
+//				} else if item.Type == 3 {
+//					advice_id = 0
+//					item_id = item.ItemId
+//					project_id = 0
+//				}
+//				detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
+//				cut, _ := strconv.ParseFloat(item.Cut, 32)
+//				pric, _ := strconv.ParseFloat(item.Price, 32)
+//				info := &models.HisOrderInfo{
+//					OrderNumber:      order.Number,
+//					UploadDate:       time.Now().Unix(),
+//					AdviceId:         advice_id,
+//					DetItemFeeSumamt: detItemFeeSumamt,
+//					Cnt:              cut,
+//					Pric:             pric,
+//					PatientId:        patient_id,
+//					Status:           1,
+//					Mtime:            time.Now().Unix(),
+//					Ctime:            time.Now().Unix(),
+//					UserOrgId:        org_id,
+//					HisPatientId:     his.ID,
+//					OrderId:          order.ID,
+//					ProjectId:        project_id,
+//					Type:             types,
+//					ItemId:           item_id,
+//				}
+//				service.CreateOrderInfo(info)
+//			}
+//			his.Diagnosis = diagnosis_id
+//			his.SickType = sick_type
+//			his.RegisterType = reg_type
+//			his.MedicalTreatmentType = reg_type
+//			service.UpdataHisPateintTwo(&his)
+//			err = service.UpDatePrescriptionNumber(org_id, ids, strconv.FormatInt(int64(chrgBchno), 10))
+//			err = service.UpDateHisPrescriptionInfoNumbertwo(org_id, patient_id, strconv.FormatInt(int64(chrgBchno), 10), recordDateTime, his.ID)
+//			err = service.UpdataOrderStatusThreef(strconv.FormatInt(int64(chrgBchno), 10), org_id)
+//
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"msg": "医嘱保存成功",
+//			})
+//
+//		} else {
+//			c.ServeSuccessJSON(map[string]interface{}{
+//				"failed_code": -10,
+//				"msg":         res.Msg,
+//			})
+//
+//		}
+//
+//	} else {
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"failed_code": -10,
+//			"msg":         res.Msg,
+//		})
+//
+//	}
+//
+//}
+
+
+
+
+//func saveLog(result string, request string, infno string, desc string) {
+//
+//	org_id, _ := beego.AppConfig.Int64("org_id")
+//	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+//	dir := miConfig.OrgName + "日志"
+//	utils.Mkdir(dir)
+//	month := time.Unix(1557042972, 0).Format("1")
+//	year := time.Now().Format("2006")
+//	month = time.Now().Format("01")
+//	day := time.Now().Format("02")
+//	hour := time.Now().Format("15")
+//	min := time.Now().Format("04")
+//	sec := time.Now().Format("05")
+//
+//	result_time := year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec
+//
+//	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+//	file_name := file + ".txt"
+//	file_path := miConfig.OrgName + "日志" + "/" + file_name
+//	exist, _ := utils.PathExists(file_path)
+//	if exist { //存在
+//		fmt.Println("存在")
+//		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+//		if err != nil {
+//			fmt.Println("read fail")
+//		}
+//		content := "\r\n" + "\r\n" + "\r\n" + result_time + " " + "【 " + desc + infno + "入参" + " 】：" + "\r\n" + request + "\r\n" + result_time + " " + "【 " + desc + infno + "出参" + " 】：" + "\r\n" + result
+//		n, _ := f.Seek(0, 2)
+//		_, err = f.WriteAt([]byte(content), n)
+//
+//	} else { //不存在
+//		fmt.Println("文件不存在，创建文件")
+//		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+//		defer f.Close()
+//		if err != nil {
+//		} else {
+//			_, err = f.Write([]byte("记录日志"))
+//		}
+//	}
+//
+//}
+
+type Charset string
+
+const (
+	UTF8    = Charset("UTF-8")
+	GB18030 = Charset("GB18030")
+)
+
+func saveLog(result string, request string, infno string, desc string, org_name string) {
+
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	dir := org_name + "日志"
+	utils.Mkdir(dir)
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	hour := time.Now().Format("15")
+	min := time.Now().Format("04")
+	sec := time.Now().Format("05")
+
+	result_time := year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec
+
+	file := org_name + "_" + year + month + day + "_log"
+	file_name := file + ".txt"
+	file_path := org_name + "日志" + "/" + file_name
+	exist, _ := utils.PathExists(file_path)
+	if exist { //存在
+		fmt.Println("存在")
+		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+		if err != nil {
+			fmt.Println("read fail")
+		}
+		content := "\r\n" + "\r\n" + "\r\n" + result_time + " " + "【 " + desc + infno + "入参" + " 】：" + "\r\n" + request + "\r\n" + result_time + " " + "【 " + desc + infno + "出参" + " 】：" + "\r\n" + result
+		n, _ := f.Seek(0, 2)
+		_, err = f.WriteAt([]byte(content), n)
+
+	} else { //不存在
+		fmt.Println("文件不存在，创建文件")
+		f, err := os.Create(org_name + "日志" + "/" + file_name)
+		defer f.Close()
+		if err != nil {
+		} else {
+			_, err = f.Write([]byte("记录日志"))
+		}
+	}
+
+}

controllers/gz/new_his_api_controller.go

@@ -10118,7 +10118,7 @@ func (c *HisApiController) GetSettleAccounts() {
 
 		}
 
-		if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+		if item.MedChrgitmType == "05" { //治疗费
 
 			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
@@ -10126,13 +10126,25 @@ func (c *HisApiController) GetSettleAccounts() {
 
 		}
 
-		if item.MedChrgitmType == "06" { //手术费
+		if item.MedChrgitmType == "06" && adminUser.CurrentOrgId == 9504  { //手术费
+				fmt.Println("------------")
+
+			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+
+		}
+		if item.MedChrgitmType == "06" && adminUser.CurrentOrgId != 9504  { //手术费
 			operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
 		}
 
-		if item.MedChrgitmType == "08" { //材料费
+
+
+		if item.MedChrgitmType == "08"  || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403"{ //材料费
 			materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
 			materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
 			materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()

controllers/hb/hbyb_controller.go

@@ -3,6 +3,10 @@ package hb
 import (
 	"encoding/json"
 	"fmt"
+	"time"
+	"os"
+
+
 	"gdyb/controllers"
 	"gdyb/models"
 	"gdyb/service"
@@ -28,11 +32,347 @@ func HbybRegistRouters() {
 	beego.Router("/hbyb/5203", &HBybController{}, "get:PostTen")
 	beego.Router("/hbyb/2001", &HBybController{}, "get:Post2001")
 	beego.Router("/hbyb/3202", &HBybController{}, "post:Post3202a")
+	beego.Router("/hbyb/1608", &HBybController{}, "post:Post1608")
+
+	beego.Router("/hbyb/3202b", &HBybController{}, "post:Post3202b")
+	//beego.Router("/hbyb/3202c", &HBybController{}, "post:Post3202")
+
+
 	beego.Router("/hbyb/4101", &HBybController{}, "post:Post4101")
 
 	beego.Router("/hbyb/5262", &HBybController{}, "post:Post5262")
 	beego.Router("/hbyb/5267", &HBybController{}, "post:Post5267")
+	beego.Router("/hbyb/5301", &HBybController{}, "get:Post5301")
+
+
+	beego.Router("/hbyb/2401", &HBybController{}, "post:Post2401")
+	beego.Router("/hbyb/2402", &HBybController{}, "post:Post2402")
+	beego.Router("/hbyb/2404", &HBybController{}, "get:Post2404")
+	beego.Router("/hbyb/2405", &HBybController{}, "get:Post2405")
+	beego.Router("/hbyb/2301", &HBybController{}, "post:Post2301")
+	beego.Router("/hbyb/2302", &HBybController{}, "get:Post2302")
+	beego.Router("/hbyb/2303", &HBybController{}, "get:Post2303")
+	beego.Router("/hbyb/2304", &HBybController{}, "get:Post2304")
+	beego.Router("/hbyb/2305", &HBybController{}, "get:Post2305")
+
+
+
+}
+
+func (c *HBybController) Post2401() {
+	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["struct_2401"])
+	var struct2401 service.Struct2401
+	if err := json.Unmarshal(userJSONBytes, &struct2401); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	org_name := respJSON["org_name"].(string)
+	fixmedins_code := respJSON["fixmedins_code"].(string)
+	doctor := respJSON["doctor"].(string)
+	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
+	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
+	secret_key := respJSON["secret_key"].(string)
+	result, request_log := service.Hbyb2401(struct2401, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, request_log, "2401", "入院登记", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+func (c *HBybController) Post2404() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	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")
+	org_name := c.GetString("org_name")
+
+	result, requestLog := service.Hbyb2404(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, requestLog, "2404", "入院登记撤销", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+		"log": dat2,
+	})
+
+}
+func (c *HBybController) Post2405() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	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")
+	org_name := c.GetString("org_name")
+
+	result, requestLog := service.Hb2405(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, requestLog, "2405", "出院登记撤销", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+		"log": dat2,
+	})
+
+}
+func (c *HBybController) Post2402() {
+	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["struct_2402"])
+	var struct2402 service.Struct2402
+	if err := json.Unmarshal(userJSONBytes, &struct2402); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	org_name := respJSON["org_name"].(string)
+	fixmedins_code := respJSON["fixmedins_code"].(string)
+	doctor := respJSON["doctor"].(string)
+	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
+	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
+	secret_key := respJSON["secret_key"].(string)
+	result, request_log := service.Hb2402(struct2402, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	saveJsLog(result, request_log, "2402", "出院", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+func (c *HBybController) Post2301() {
+
+	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["customs"])
+	var customs []*models.NewCustom
+	if err := json.Unmarshal(userJSONBytes, &customs); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	number := respJSON["number"].(string)
+
+	chrg_bchno := respJSON["chrg_bchno"].(string)
+	dept := respJSON["dept"].(string)
+	dept_code := respJSON["dept_code"].(string)
+	doctor_code := respJSON["doctor_code"].(string)
+
+	doctor_name := respJSON["doctor_name"].(string)
+	opertor := respJSON["opertor"].(string)
+
+	org_name := respJSON["org_name"].(string)
+	fixmedins_code := respJSON["fixmedins_code"].(string)
+	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
+	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
+	secret_key := respJSON["secret_key"].(string)
+	med_type := respJSON["med_type"].(string)
+	//med_type := strconv.FormatInt(int64(respJSON["med_type"].(float64)), 10)
+	psn_no := respJSON["psn_no"].(string)
+
+	result, requestLog := service.Hb2301A(psn_no, number, customs, chrg_bchno, org_name, doctor_name, dept, fixmedins_code, dept_code, doctor_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, opertor)
+	saveJsLog(result, requestLog, "2301", "上传明细", org_name)
+
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+func (c *HBybController) Post2302() {
+	mdtrt_id := c.GetString("mdtrtId")
+	psn_no := c.GetString("psn_no")
+	number := c.GetString("feedetl_sn")
+	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")
+	org_name := c.GetString("org_name")
+	refund_type, _ := c.GetInt64("refund_type")
+
+	result, requestLog := service.Hb2302(psn_no, mdtrt_id, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, number, refund_type)
+	saveJsLog(result, requestLog, "2302", "退明细", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+func (c *HBybController) Post2303() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	chrg_bchno := c.GetString("chrg_bchno")
+	cert_no := c.GetString("cert_no")
+	insutype_type := c.GetString("insutype_type")
+
+	allTotal := c.GetString("total")
+	id_card_type, _ := c.GetInt64("id_card_type")
+
+	doctor := c.GetString("doctor")
+	certificates, _ := c.GetInt64("certificates")
+
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
+
+	result, src_resquest := service.Hb2303(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates)
+	saveJsLog(result, src_resquest, "2303", "预结算", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(src_resquest), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+func (c *HBybController) Post2304() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	chrg_bchno := c.GetString("chrg_bchno")
+	cert_no := c.GetString("cert_no")
+	insutype_type := c.GetString("insutype_type")
+
+	allTotal := c.GetString("total")
+	id_card_type, _ := c.GetInt64("id_card_type")
+
+	doctor := c.GetString("doctor")
+	certificates, _ := c.GetInt64("certificates")
+
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
+	fapiao_number := c.GetString("fapiao_number")
+	acct_used_flag := c.GetString("acct_used_flag")
+
+	result, src_resquest := service.Hb2304(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates, fapiao_number, acct_used_flag)
+	saveJsLog(result, src_resquest, "2304", "住院结算", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(src_resquest), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+func (c *HBybController) Post2305() {
+	mdtrt_id := c.GetString("mdtrt_id")
+	psn_no := c.GetString("psn_no")
+	doctor := c.GetString("doctor")
+	setl_id := c.GetString("setl_id")
 
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
+
+	result, requestLog := service.Hb2305(psn_no, mdtrt_id, setl_id, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	saveJsLog(result, requestLog, "2305", "退费", org_name)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+
+func (c *HBybController)Post5301(){
+	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")
+	psn_no := c.GetString("psn_no")
+	result := service.Hbyb5301(psn_no,"",org_name, doctor,fixmedins_code,"",insuplc_admdvs,mdtrtarea_admvs,secret_key,"","")
+	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 *HBybController)Post5262(){
@@ -143,6 +483,82 @@ func (c *HBybController) Post3202a() {
 	})
 }
 
+
+func (c *HBybController) Post1608() {
+
+	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
+	}
+
+
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+
+
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+	cnt := respJSON["cnt"].(string)
+	medfee_sumamt := respJSON["medfee_sumamt"].(string)
+	func_smamt := respJSON["func_smamt"].(string)
+
+	start_time := respJSON["start_time"].(string)
+	end_time := respJSON["end_time"].(string)
+
+	result := service.Hbyb1608(baseParams,cnt,medfee_sumamt,start_time,end_time,func_smamt)
+	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 *HBybController) Post3202b() {
+
+	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["bps"])
+	var bps []*models.BusinessParamsTwo
+	if err := json.Unmarshal(userJSONBytes, &bps); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+
+	result := service.Hbyb3202b(baseParams, bps)
+	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 *HBybController) Post4101() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -575,8 +991,18 @@ func (c *HBybController) PostTen() {
 		MdtrtId: mdtrtId,
 		SetlId:  setlId,
 	}
+	var result string
+	if mdtrtarea_admvs == "421182"{
+
+
+		result = service.Hbyb5203(baseParams, businessParams,med_type)
+
+	}else{
+
+		result = service.Hbyb5203aa(baseParams, businessParams)
+
+	}
 
-	result := service.Hbyb5203(baseParams, businessParams, med_type)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -587,3 +1013,46 @@ func (c *HBybController) PostTen() {
 		"pre": dat,
 	})
 }
+
+
+func saveJsLog(result string, request string, infno string, desc string, org_name string) {
+
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	dir := org_name + "日志"
+	utils.Mkdir(dir)
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	hour := time.Now().Format("15")
+	min := time.Now().Format("04")
+	sec := time.Now().Format("05")
+
+	result_time := year + "-" + month + "-" + day + " " + hour + ":" + min + ":" + sec
+
+	file := org_name + "_" + year + month + day + "_log"
+	file_name := file + ".txt"
+	file_path := org_name + "日志" + "/" + file_name
+	exist, _ := utils.PathExists(file_path)
+	if exist { //存在
+		fmt.Println("存在")
+		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+		if err != nil {
+			fmt.Println("read fail")
+		}
+		content := "\r\n" + "\r\n" + "\r\n" + result_time + " " + "【 " + desc + infno + "入参" + " 】：" + "\r\n" + request + "\r\n" + result_time + " " + "【 " + desc + infno + "出参" + " 】：" + "\r\n" + result
+		n, _ := f.Seek(0, 2)
+		_, err = f.WriteAt([]byte(content), n)
+
+	} else { //不存在
+		fmt.Println("文件不存在，创建文件")
+		f, err := os.Create(org_name + "日志" + "/" + file_name)
+		defer f.Close()
+		if err != nil {
+		} else {
+			_, err = f.Write([]byte("记录日志"))
+		}
+	}
+
+}

controllers/js/jsyb_controller.go

@@ -56,6 +56,8 @@ func JSybRegistRouters() {
 
 	beego.Router("/jsyb/readcardcharge", &JSybController{}, "get:Readcardcharge")
 	beego.Router("/jsyb/readcardchargeother", &JSybController{}, "get:Readcardchargeother")
+	beego.Router("/jsyb/readcardface", &JSybController{}, "get:Readcardface")
+
 
 	beego.Router("/jsyb/3260", &JSybController{}, "get:Get3260")
 	beego.Router("/jsyb/3261", &JSybController{}, "get:Get3261")
@@ -73,11 +75,57 @@ func JSybRegistRouters() {
 	beego.Router("/jsyb/3273", &JSybController{}, "post:Get3273")
 	beego.Router("/jsyb/3274", &JSybController{}, "post:Get3274")
 	beego.Router("/jsyb/3275", &JSybController{}, "post:Get3275")
+
+
+
+
+	beego.Router("/jsyb/3501", &JSybController{}, "post:Get3501")
+	beego.Router("/jsyb/3502", &JSybController{}, "post:Get3502")
+	beego.Router("/jsyb/3503", &JSybController{}, "post:Get3503")
+	beego.Router("/jsyb/3504", &JSybController{}, "post:Get3504")
+	beego.Router("/jsyb/3505", &JSybController{}, "post:Get3505")
+	beego.Router("/jsyb/3506", &JSybController{}, "post:Get3506")
+	beego.Router("/jsyb/3507", &JSybController{}, "post:Get3507")
+
+
+
+	beego.Router("/jsyb/1318", &JSybController{}, "get:Get1318")
+
+
+
 	//beego.Router("/jsyb/3276", &JSybController{}, "post:Get3276")
 	//beego.Router("/jsyb/3277", &JSybController{}, "post:Get3277")
 
 }
 
+func (c *JSybController)Get1318(){
+	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")
+	url := c.GetString("url")
+	ak := c.GetString("ak")
+	h_code := c.GetString("h_code")
+	cainfo := c.GetString("cainfo")
+	result, request := service.Jsyb1318(h_code,org_name,doctor,fixmedins_code,insuplc_admdvs,mdtrtarea_admvs,secret_key,url,ak,cainfo)
+	var dat2 map[string]interface{}
+	if err := json.Unmarshal([]byte(request), &dat2); err == nil {
+	} else {
+	}
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+
+}
+
 func (c *JSybController) Get3260() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
@@ -1330,9 +1378,12 @@ func (c *JSybController) PostFive() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
+
+
+
 	//fmt.Println("2203A的time_stamp=" + respJSON["time_stamp"].(string))
 	result, request_log := service.Jsyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
-		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["diag_code"].(string), respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), "", respJSON["cainfo"].(string))
+		respJSON["opter"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), "", respJSON["url"].(string), respJSON["ak"].(string), respJSON["new_doctor_name"].(string), "", respJSON["cainfo"].(string))
 
 	saveJsLog(result, request_log, "2204", "上传明细", respJSON["org_name"].(string))
 	var dat map[string]interface{}
@@ -1689,6 +1740,100 @@ type ELeCertData struct {
 	Message string `json:"message"`
 }
 
+type ELeCertDatathree struct {
+	Data struct {
+		AuthNo       string `json:"authNo"`
+		Extra       string `json:"extra"`
+		IDNo        string `json:"idNo"`
+		IDType      string `json:"idType"`
+		EcToken     string `json:"ecToken"`
+		InsuOrg     string `json:"insuOrg"`
+		UserName    string `json:"userName"`
+		EcIndexNo   string `json:"ecIndexNo"`
+		Gender      string `json:"gender"`
+		Birthday    string `json:"birthday"`
+		Nationality string `json:"nationality"`
+		Email       string `json:"email"`
+	} `json:"data"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+
+
+type ELeCertDatatwo struct {
+	Data struct {
+		AuthNo       string `json:"authNo"`
+		OutBizNo        string `json:"outBizNo"`
+	} `json:"data"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+func (c *JSybController) Readcardface() {
+	fixmedins_code := c.GetString("fixmedins_code")
+	secret_key := c.GetString("secret_key")
+	ak := c.GetString("ak")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	url := c.GetString("url")
+	cainfo := c.GetString("cainfo")
+	operator_id := c.GetString("operator_id")
+	operator := c.GetString("operator")
+
+	fmt.Println(operator_id)
+	fmt.Println(operator)
+	_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator,"01301")
+	fmt.Println(pBusiCardInfo)
+	pBusiCardInfo = Remove0000(pBusiCardInfo)
+	var eletwo ELeCertDatatwo
+	json.Unmarshal([]byte(pBusiCardInfo), &eletwo)
+
+	_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator,eletwo.Data.AuthNo,eletwo.Data.OutBizNo,"01301")
+
+	var ele ELeCertDatathree
+	err2 := json.Unmarshal([]byte(pBusiCardInfotwo), &ele)
+	if err2 != nil {
+		utils.ErrorLog("解析失败：%v", err2)
+	}
+	token := ele.Data.EcToken
+	fmt.Println(token)
+	if len(token) > 0 {
+		userName := ele.Data.UserName
+		fmt.Println(userName)
+		userName = Remove0000(userName)
+		userName = DeleteExtraSpace(userName)
+		fmt.Println(userName)
+		enc := mahonia.NewEncoder("gbk")
+		fmt.Println(enc.ConvertString(userName))
+		result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
+		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{}{
+			"status":         "0",
+			"card_info":      "",
+			"busi_card_info": pBusiCardInfotwo,
+			"token":          token,
+			"result":         dat,
+			"eletwo":	pBusiCardInfo,
+
+		})
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": "-1",
+		})
+
+	}
+
+
+}
+
+
 func (c *JSybController) Readcardcharge() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
@@ -2098,6 +2243,59 @@ func (c *JSybController) ReadCard() {
 
 		}
 		break
+	case "5": //电子凭证
+		fmt.Println(operator_id)
+		fmt.Println(operator)
+		_, pBusiCardInfo := c.GetELeCertInfoByFace(fixmedins_code, operator_id, operator,"01101")
+		fmt.Println(pBusiCardInfo)
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		var eletwo ELeCertDatatwo
+		json.Unmarshal([]byte(pBusiCardInfo), &eletwo)
+
+
+		_, pBusiCardInfotwo := GetELeCertInfoByFacetwo(fixmedins_code, operator_id, operator,eletwo.Data.AuthNo,eletwo.Data.OutBizNo,"01301")
+
+
+
+		var ele ELeCertDatathree
+		err2 := json.Unmarshal([]byte(pBusiCardInfotwo), &ele)
+		if err2 != nil {
+			utils.ErrorLog("解析失败：%v", err2)
+		}
+		token := ele.Data.EcToken
+		fmt.Println(token)
+		if len(token) > 0 {
+			userName := ele.Data.UserName
+			fmt.Println(userName)
+			userName = Remove0000(userName)
+			userName = DeleteExtraSpace(userName)
+			fmt.Println(userName)
+			enc := mahonia.NewEncoder("gbk")
+			fmt.Println(enc.ConvertString(userName))
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, userName)
+			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{}{
+				"status":         "0",
+				"card_info":      "",
+				"busi_card_info": pBusiCardInfotwo,
+				"token":          token,
+				"result":         dat,
+				"eletwo":	pBusiCardInfo,
+
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
+
 
 	}
 
@@ -2293,6 +2491,104 @@ func (c *JSybController) GetELeCertInfoFour2223(code string, operator_id string,
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
+func (c *JSybController) GetELeCertInfoByFace(code string, operator_id string, operator_name string,businessType string) (string, string) {
+	// WebSocket服务器地址
+	serverURL := "ws://127.0.0.1:8899"
+
+	// 解析WebSocket服务器地址
+	u, err := url.Parse(serverURL)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// 建立WebSocket连接
+	conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer conn.Close()
+	input2 := make(map[string]interface{})
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["outBizNo"] = time.Now().Unix()
+	inputData["businessType"] = businessType
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	inputData["deviceType"] = ""
+	input["data"] = inputData
+	input["orgId"] = code
+	input["transType"] = "cn.nhsa.ec.auth"
+	input2["url"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
+	input2["indata"] = input
+
+	bytesData, _ := json.Marshal(input2)
+	err = conn.WriteMessage(websocket.TextMessage, bytesData)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	// 接收消息
+	_, receivedMessage, err := conn.ReadMessage()
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	return "", string(receivedMessage)
+}
+func GetELeCertInfoByFacetwo(code string, operator_id string, operator_name string,authNo string,outBizNo string,businessType string) (string, string) {
+	//	// WebSocket服务器地址
+	serverURL := "ws://127.0.0.1:8899"
+
+	// 解析WebSocket服务器地址
+	u, err := url.Parse(serverURL)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// 建立WebSocket连接
+	conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer conn.Close()
+	input2 := make(map[string]interface{})
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["outBizNo"] = outBizNo
+	inputData["authNo"] = authNo
+	inputData["businessType"] = businessType
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	inputData["deviceType"] = ""
+	input["data"] = inputData
+	input["orgId"] = code
+	input["transType"] = "cn.nhsa.auth.check"
+	input2["url"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
+	input2["indata"] = input
+
+	bytesData, _ := json.Marshal(input2)
+	err = conn.WriteMessage(websocket.TextMessage, bytesData)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	// 接收消息
+	_, receivedMessage, err := conn.ReadMessage()
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	return "", string(receivedMessage)
+}
+
 func (c *JSybController) GetELeCertInfoTwo(code string, operator_id string, operator_name string) (string, string) {
 	// WebSocket服务器地址
 	serverURL := "ws://127.0.0.1:8899"
@@ -2388,6 +2684,8 @@ func (c *JSybController) GetELeCertInfoThree(code string, operator_id string, op
 	return "", string(receivedMessage)
 }
 
+
+
 func GetELeCertInfoSettle(code string, operator_id string, operator_name string) (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	readCard := DllDef.MustFindProc("GetPersonInfo")

controllers/nm/nm_controller.go

@@ -47,7 +47,7 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/4101", &NmController{}, "post:Post4101")
 	beego.Router("/nmyb/2601", &NmController{}, "get:Get2601")
 	beego.Router("/api/token", &NmController{}, "get:GetToken")
-	beego.Router("/api/eleinfo", &NmController{}, "get:GetNewELeInfo")
+	//beego.Router("/api/eleinfo", &NmController{}, "get:GetNewELeInfo")
 	beego.Router("/nmyb/4102", &NmController{}, "get:Post4102")
 	beego.Router("/nmyb/4103", &NmController{}, "get:Post4103")
 
@@ -495,56 +495,56 @@ func (c *NmController) Post2503() {
 	})
 }
 
-func (c *NmController) GetNewELeInfo() {
-	token := c.GetString("token")
-	user_name := c.GetString("user_name")
-	id_card_no := c.GetString("id_card_no")
-
-	result, _ := service.Gdyb1101ForEleCert("赤峰费森血液透析中心", "关学丽", "H15049901371", "150499", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57", token, user_name, id_card_no)
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes, _ := json.Marshal(dat)
-	var res ResultTwo
-
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-
-	infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
-	if infocode == 0 {
-		data := make(map[string]interface{})
-		data["token"] = token
-		data["result"] = dat
-		var req *http.Request
-		bytesData, _ := json.Marshal(data)
-		req, _ = http.NewRequest("POST", "http://172.16.13.253:9532/"+"api/ele/info", bytes.NewReader(bytesData))
-		client := &http.Client{}
-		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
-		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "成功",
-		})
-
-	}
-}
+//func (c *NmController) GetNewELeInfo() {
+//	token := c.GetString("token")
+//	user_name := c.GetString("user_name")
+//	id_card_no := c.GetString("id_card_no")
+//
+//	result, _ := service.Gdyb1101ForEleCert("赤峰费森血液透析中心", "关学丽", "H15049901371", "150499", "150499", "MSDBYGxXm1Mtyi3PtOUB7n1ktcxwyW57", token, user_name, id_card_no)
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	userJSONBytes, _ := json.Marshal(dat)
+//	var res ResultTwo
+//
+//	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//
+//	infocode, _ := strconv.ParseInt(res.Infcode, 10, 64)
+//	if infocode == 0 {
+//		data := make(map[string]interface{})
+//		data["token"] = token
+//		data["result"] = dat
+//		var req *http.Request
+//		bytesData, _ := json.Marshal(data)
+//		req, _ = http.NewRequest("POST", "http://172.16.13.253:9532/"+"api/ele/info", bytes.NewReader(bytesData))
+//		client := &http.Client{}
+//		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
+//		}
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"msg": "成功",
+//		})
+//
+//	}
+//}
 func (c *NmController) GetToken() {
 	token := c.GetString("token")
 	results := strings.Split(token, "-")
@@ -733,7 +733,7 @@ func (c *NmController) Post4101() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	result, _ := service.Gdyb4101(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0)
+	result, _ := service.Gdyb4101fornm(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0,0)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -911,7 +911,7 @@ func (c *NmController) Post1101() {
 	certificates := c.GetString("certificates")
 	name := c.GetString("name")
 	certificate, _ := strconv.ParseInt(certificates, 10, 64)
-	result, request_log, result_log := service.ZHGdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificate, name)
+	result, request_log, result_log := service.ZHGdyb1101(certNo, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, certificate, name,0)
 
 	saveJsLog(result_log, request_log, "1101", "查询个人信息", org_name)
 	var dat map[string]interface{}
@@ -953,7 +953,7 @@ func (c *NmController) Post2401() {
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
-	result, request_log := service.ZHGdyb2401(struct2401, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	result, request_log := service.Hbyb2401(struct2401, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
 	saveJsLog(result, request_log, "2401", "入院登记", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
@@ -980,7 +980,7 @@ func (c *NmController) Post2404() {
 	secret_key := c.GetString("secret_key")
 	org_name := c.GetString("org_name")
 
-	result, requestLog := service.ZHGdyb2404(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	result, requestLog := service.Hbyb2404(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
 	saveJsLog(result, requestLog, "2404", "入院登记撤销", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -996,7 +996,6 @@ func (c *NmController) Post2404() {
 	})
 
 }
-
 func (c *NmController) Post2405() {
 	mdtrt_id := c.GetString("mdtrt_id")
 	psn_no := c.GetString("psn_no")
@@ -1007,7 +1006,7 @@ func (c *NmController) Post2405() {
 	secret_key := c.GetString("secret_key")
 	org_name := c.GetString("org_name")
 
-	result, requestLog := service.ZHGdyb2405(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
+	result, requestLog := service.Hb2405(mdtrt_id, psn_no, secret_key, org_name, fixmedins_code, doctor, insuplc_admdvs, mdtrtarea_admvs)
 	saveJsLog(result, requestLog, "2405", "出院登记撤销", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -1023,7 +1022,6 @@ func (c *NmController) Post2405() {
 	})
 
 }
-
 func (c *NmController) Post2402() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -1043,7 +1041,7 @@ func (c *NmController) Post2402() {
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
-	result, request_log := service.ZHGdyb2402(struct2402, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	result, request_log := service.Hb2402(struct2402, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
 	saveJsLog(result, request_log, "2402", "出院", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
@@ -1058,7 +1056,6 @@ func (c *NmController) Post2402() {
 		"request_log": dat2,
 	})
 }
-
 func (c *NmController) Post2301() {
 
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
@@ -1093,7 +1090,7 @@ func (c *NmController) Post2301() {
 	//med_type := strconv.FormatInt(int64(respJSON["med_type"].(float64)), 10)
 	psn_no := respJSON["psn_no"].(string)
 
-	result, requestLog := service.ZHGdyb2301A(psn_no, number, customs, chrg_bchno, org_name, doctor_name, dept, fixmedins_code, dept_code, doctor_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, opertor)
+	result, requestLog := service.Hb2301A(psn_no, number, customs, chrg_bchno, org_name, doctor_name, dept, fixmedins_code, dept_code, doctor_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, opertor)
 	saveJsLog(result, requestLog, "2301", "上传明细", org_name)
 
 	var dat2 map[string]interface{}
@@ -1121,7 +1118,7 @@ func (c *NmController) Post2302() {
 	org_name := c.GetString("org_name")
 	refund_type, _ := c.GetInt64("refund_type")
 
-	result, requestLog := service.Gdyb2302(psn_no, mdtrt_id, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, number, refund_type)
+	result, requestLog := service.Hb2302(psn_no, mdtrt_id, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code, number, refund_type)
 	saveJsLog(result, requestLog, "2302", "退明细", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
@@ -1136,7 +1133,6 @@ func (c *NmController) Post2302() {
 		"request_log": dat2,
 	})
 }
-
 func (c *NmController) Post2303() {
 	mdtrt_id := c.GetString("mdtrt_id")
 	psn_no := c.GetString("psn_no")
@@ -1156,7 +1152,7 @@ func (c *NmController) Post2303() {
 	secret_key := c.GetString("secret_key")
 	org_name := c.GetString("org_name")
 
-	result, src_resquest := service.ZHGdyb2303(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates)
+	result, src_resquest := service.Hb2303(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates)
 	saveJsLog(result, src_resquest, "2303", "预结算", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(src_resquest), &dat2); err == nil {
@@ -1192,7 +1188,7 @@ func (c *NmController) Post2304() {
 	fapiao_number := c.GetString("fapiao_number")
 	acct_used_flag := c.GetString("acct_used_flag")
 
-	result, src_resquest := service.ZHGdyb2304(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates, fapiao_number, acct_used_flag)
+	result, src_resquest := service.Hb2304(psn_no, mdtrt_id, chrg_bchno, cert_no, insutype_type, allTotal, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, "0", id_card_type, 0, 0, 0, 0, certificates, fapiao_number, acct_used_flag)
 	saveJsLog(result, src_resquest, "2304", "住院结算", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(src_resquest), &dat2); err == nil {
@@ -1219,7 +1215,7 @@ func (c *NmController) Post2305() {
 	secret_key := c.GetString("secret_key")
 	org_name := c.GetString("org_name")
 
-	result, requestLog := service.Gdyb2305(psn_no, mdtrt_id, setl_id, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	result, requestLog := service.Hb2305(psn_no, mdtrt_id, setl_id, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	saveJsLog(result, requestLog, "2305", "退费", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
@@ -1789,7 +1785,7 @@ func (c *NmController) Get3201() {
 		AcctPay:          acctPay,
 		FixmedinsSetlCnt: fixmedinsSetlCnt,
 	}
-	result := service.Gdyb3201(baseParams, businessParams)
+	result := service.Gdyb3201(baseParams, businessParams,0)
 	saveJsLog(result, "", "3201", "对总账", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/gdyb_controller.go

@@ -16,23 +16,84 @@ type GdybController struct {
 }
 
 func GdybRegistRouters() {
-	beego.Router("/gdyb/one", &GdybController{}, "get:PostOne")
-	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{}, "post:PostFive")
+	beego.Router("/gdyb/1101", &GdybController{}, "get:PostOne")
+	beego.Router("/gdyb/2201", &GdybController{}, "get:PostTwo")
+	beego.Router("/gdyb/2202", &GdybController{}, "get:PostThree")
+	beego.Router("/gdyb/2203", &GdybController{}, "post:PostFour")
+	beego.Router("/gdyb/2204", &GdybController{}, "post:PostFive")
 	beego.Router("/gdyb/six", &GdybController{}, "get:PostSix")
-	//beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
-	beego.Router("/gdyb/eight", &GdybController{}, "get:PostEight")
-	//beego.Router("/gdyb/nine", &GdybController{}, "get:PostNine")
+	beego.Router("/gdyb/2206", &GdybController{}, "get:PostSeven")
+	beego.Router("/gdyb/2207", &GdybController{}, "get:PostEight")
+	beego.Router("/gdyb/2208", &GdybController{}, "get:PostNine")
 	beego.Router("/gdyb/ten", &GdybController{}, "get:PostTen")
 	beego.Router("/gdyb/eleven", &GdybController{}, "get:PostEleven")
 	beego.Router("/gdyb/twelve", &GdybController{}, "get:PostTwelve")
+	beego.Router("/gdyb/5203", &GdybController{}, "get:Post5203")
+	beego.Router("/gdyb/4101", &GdybController{}, "post:Post4101")
+	beego.Router("/gdyb/5301", &GdybController{}, "get:Post5301")
 
-	beego.Router("/gdyb/zh/five", &GdybController{}, "post:PostZHFive")
 
+
+}
+func (c *GdybController) Post5301() {
+	psnNo := c.GetString("psn_no")
+	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")
+
+	result := service.Gdyb5301(psnNo,org_name,doctor,fixmedins_code,insuplc_admdvs,mdtrtarea_admvs,secret_key,0)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	saveLogq(result, "", "5301", "备案")
+
+	//saveLog(result, "", "4101", "上传明细清单")
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
 }
 
+func (c *GdybController) Post4101() {
+	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
+	}
+	struct4101UserJSONBytes, _ := json.Marshal(respJSON["struct4101"])
+	var struct4101 service.Struct4101
+	if err := json.Unmarshal(struct4101UserJSONBytes, &struct4101); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	ppUserJSONBytes, _ := json.Marshal(respJSON["pp"])
+	var pp models.PublicParams
+	if err := json.Unmarshal(ppUserJSONBytes, &pp); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	result, _ := service.Gdyb4101(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0,0)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	saveLogq(result, "", "4101", "上传明细清单")
+
+	//saveLog(result, "", "4101", "上传明细清单")
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+
+
 type Result struct {
 	ErrMsg      interface{} `json:"err_msg"`
 	InfRefmsgid string      `json:"inf_refmsgid"`
@@ -100,23 +161,27 @@ func (c *GdybController) PostOne() {
 		"log": dat2,
 	})
 }
-
 func (c *GdybController) PostTwo() {
 	psnNo := c.GetString("psn_no")
 	insutype := c.GetString("insutype")
 	certNo := c.GetString("cert_no")
 	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
+	operator := c.GetString("operator")
 	ipt_otp_no := c.GetString("ipt_otp_no")
 	dept := c.GetString("dept")
 	fixmedins_code := c.GetString("fixmedins_code")
 	dept_code := c.GetString("dept_code")
 	doctor_id := c.GetString("doctor_id")
+	doctor_name := c.GetString("doctor_name")
+	verify_number := c.GetString("verify_number")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	id_card_type, _ := c.GetInt64("id_card_type")
-	result, _ := service.Gdyb2201(psnNo, insutype, certNo, org_name, doctor, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, "")
+	record_time  := c.GetString("record_time")
+
+	result, inputLog := service.Gdyb2201A(psnNo, insutype, certNo, org_name, operator, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, record_time, verify_number,0)
+	saveLogq(result, inputLog, "2201", "退号")
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -125,6 +190,7 @@ func (c *GdybController) PostTwo() {
 
 	}
 
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": dat,
 	})
@@ -135,13 +201,15 @@ func (c *GdybController) PostThree() {
 	mdtrtId := c.GetString("mdtrt_id")
 	iptOtpNo := c.GetString("ipt_otp_no")
 	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
+	operator := c.GetString("operator")
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
-	result, requestLog := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
-	saveLog(result, requestLog, "2202", "退号")
+	admin_user_id,_ := c.GetInt64("admin_user_id")
+
+	result, requestLog := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, operator, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code,admin_user_id)
+	saveLogq(result, requestLog, "2202", "退号")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {
@@ -151,41 +219,60 @@ func (c *GdybController) PostThree() {
 	})
 }
 
-//func (c *GdybController) PostFour() {
-//	psnNo := c.GetString("psn_no")
-//	mdtrtId := c.GetString("mdtrt_id")
-//	doctor := c.GetString("doctor")
-//	department := c.GetString("department")
-//	diag := c.GetString("diag")
-//	org_name := c.GetString("org_name")
-//	med_type := c.GetString("med_type")
-//	doctor_id, _ := c.GetInt64("doctor_id", 0)
-//	fixmedins_code := c.GetString("fixmedins_code")
-//	diag_code := c.GetString("diag_code")
-//	sick_code := c.GetString("sick_code")
-//	sick_name := c.GetString("sick_name")
-//	dept := c.GetString("dept")
-//
-//	insuplc_admdvs := c.GetString("insuplc_admdvs")
-//	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-//	secret_key := c.GetString("secret_key")
-//
-//	var result string
-//	if insuplc_admdvs == "440781" { //
-//		result = service.Gdyb2203A(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept)
-//	} else {
-//		result = service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept)
-//	}
-//	var dat map[string]interface{}
-//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//
-//	} else {
-//
-//	}
-//	c.ServeSuccessJSON(map[string]interface{}{
-//		"pre": dat,
-//	})
-//}
+func (c *GdybController) PostFour() {
+	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["config"])
+	var config []*models.HisXtDiagnoseConfig
+	if err := json.Unmarshal(userJSONBytes, &config); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	fmt.Println(respJSON["psn_no"].(string))
+	fmt.Println(respJSON["mdtrt_id"].(string))
+
+	psnNo := respJSON["psn_no"].(string)
+	mdtrtId := respJSON["mdtrt_id"].(string)
+	doctor := respJSON["doctor"].(string)
+	department := respJSON["department"].(string)
+
+	org_name := respJSON["org_name"].(string)
+	med_type := respJSON["med_type"].(string)
+	doctor_id := respJSON["doctor_id"].(string)
+	fixmedins_code := respJSON["fixmedins_code"].(string)
+	sick_code := respJSON["sick_code"].(string)
+	sick_name := respJSON["sick_name"].(string)
+	dept := respJSON["dept"].(string)
+
+	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
+	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
+	secret_key := respJSON["secret_key"].(string)
+	begin_time := respJSON["begin_time"].(string)
+
+	new_doctor_name := respJSON["new_doctor_name"].(string)
+
+
+
+
+
+	result, request_log := service.Gdyb2203c(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, begin_time,new_doctor_name)
+	saveLogq(result, request_log, "2203", "上传就诊信息")
+
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+
+	} else {
+
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+
+	})
+}
 
 type All struct {
 	HisPrescription HisPrescription
@@ -211,73 +298,71 @@ type HisPrescription struct {
 	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
-//	}
-//	fmt.Println(respJSON["psn_no"].(string))
-//	fmt.Println(respJSON["mdtrt_id"].(string))
-//
-//	fmt.Println(respJSON["chrg_bchno"].(string))
-//	fmt.Println(respJSON["org_name"].(string))
-//	fmt.Println(respJSON["doctor"].(string))
-//	fmt.Println(respJSON["dept"].(string))
-//
-//	fmt.Println(respJSON["fixmedins_code"].(string))
-//	fmt.Println(respJSON["dept_code"].(string))
-//	fmt.Println(respJSON["doctor_id"].(string))
-//
-//	fmt.Println(respJSON["insuplc_admdvs"].(string))
-//	fmt.Println(respJSON["mdtrtarea_admvs"].(string))
-//	fmt.Println(respJSON["secret_key"].(string))
-//
-//	result, requestLog := 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), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string))
-//
-//	var dat map[string]interface{}
-//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//		fmt.Println(dat)
-//	} else {
-//		fmt.Println(err)
-//	}
-//
-//	var dat2 map[string]interface{}
-//	if err := json.Unmarshal([]byte(requestLog), &dat2); err == nil {
-//		fmt.Println(dat2)
-//	} else {
-//		fmt.Println(err)
-//	}
-//
-//	c.ServeSuccessJSON(map[string]interface{}{
-//		"pre":         dat,
-//		"request_log": requestLog,
-//	})
-//}
+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
+	}
+	fmt.Println(respJSON["psn_no"].(string))
+	fmt.Println(respJSON["mdtrt_id"].(string))
+
+	fmt.Println(respJSON["chrg_bchno"].(string))
+	fmt.Println(respJSON["org_name"].(string))
+	fmt.Println(respJSON["doctor"].(string))
+	fmt.Println(respJSON["dept"].(string))
+
+	fmt.Println(respJSON["fixmedins_code"].(string))
+	fmt.Println(respJSON["dept_code"].(string))
+	fmt.Println(respJSON["doctor_id"].(string))
+
+	fmt.Println(respJSON["insuplc_admdvs"].(string))
+	fmt.Println(respJSON["mdtrtarea_admvs"].(string))
+	fmt.Println(respJSON["secret_key"].(string))
+
+	result, requestLog := service.Gdyb2204For441799(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
+		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["new_doctor_name"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string), respJSON["doctor_id"].(string), respJSON["diag_code"].(string))
+	saveLogq(result, requestLog, "2204", "上传明细")
+
+	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) PostSix() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
 	chrgBchno := c.GetString("chrg_bchno")
 	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
+	operator := c.GetString("doctor")
 
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
+	//fixmedins_code := c.Get("fixmedins_code")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+
+	result, requestlog := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, operator, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code,admin_user_id)
+	saveLogq(result, requestlog, "2205", "上传就诊信息")
 
-	result, requestlog := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
-	fmt.Println(requestlog)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -285,40 +370,40 @@ func (c *GdybController) PostSix() {
 		fmt.Println(err)
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": result,
+		"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) 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")
+	operator := c.GetString("operator")
+	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")
+
+	certificates, _ := c.GetInt64("certificates")
+	result, log := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, 0, 0, 0, 0, certificates,0)
+	saveLogq(result, log, "2206", "预结算")
+
+	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")
@@ -328,20 +413,23 @@ func (c *GdybController) PostEight() {
 	insutype := c.GetString("insutype")
 	total := c.GetString("total")
 	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
+	operator := c.GetString("operator")
 	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")
+	verify_number := c.GetString("verify_number")
+	acct_used_flag := c.GetString("acct_used_flag")
 
 	fulamt_ownpay_amt, _ := c.GetFloat("fulamt_ownpay_amt")
 	overlmt_selfpay, _ := c.GetFloat("overlmt_selfpay")
 	preselfpay_amt, _ := c.GetFloat("preselfpay_amt")
 	inscp_scp_amt, _ := c.GetFloat("inscp_scp_amt")
 
-	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1, "0", "")
+	result, srcRequest := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype, total, org_name, operator, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, med_type, id_card_type, fulamt_ownpay_amt, overlmt_selfpay, preselfpay_amt, inscp_scp_amt, 1, acct_used_flag, verify_number,0)
+	saveLogq(result, srcRequest, "2207", "结算")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -349,36 +437,37 @@ func (c *GdybController) PostEight() {
 		fmt.Println(err)
 	}
 
-	var dat2 map[string]interface{}
-	if err := json.Unmarshal([]byte(srcRequest), &dat2); err == nil {
-		fmt.Println(dat2)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":  dat,
+	})
+}
+
+func (c *GdybController) PostNine() {
+	psnNo := c.GetString("psn_no")
+	mdtrtId := c.GetString("mdtrt_id")
+	setlId := c.GetString("setl_id")
+	org_name := c.GetString("org_name")
+	operator := c.GetString("operator")
+	secret_key := c.GetString("secret_key")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	result, srcRequest := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, operator, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,0)
+	saveLogq(result, srcRequest, "2208", "退费")
+
+	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,
-		"pre2": dat2,
 	})
 }
 
-//func (c *GdybController) PostNine() {
-//	psnNo := c.GetString("psn_no")
-//	mdtrtId := c.GetString("mdtrt_id")
-//	setlId := c.GetString("setl_id")
-//	org_name := c.GetString("org_name")
-//	doctor := c.GetString("doctor")
-//	secret_key := c.GetString("secret_key")
-//	fixmedins_code := c.GetString("fixmedins_code")
-//	insuplc_admdvs := c.GetString("insuplc_admdvs")
-//	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-//	//result, src_request := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
-//
-//}
-
 func (c *GdybController) PostTen() {
-	fmt.Println("11222333-----")
-
 	insutype := c.GetString("insutype")
 	clrType := c.GetString("clr_type")
 	setlOptins := c.GetString("setl_optins")
@@ -394,6 +483,10 @@ func (c *GdybController) PostTen() {
 	secret_key := c.GetString("secret_key")
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
+	//doctor := c.Get("doctor")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+
+
 
 	fmt.Println(insutype)
 	fmt.Println(clrType)
@@ -424,7 +517,7 @@ func (c *GdybController) PostTen() {
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
 
-	result := service.Gdyb3201(baseParams, businessParams)
+	result := service.Gdyb3201(baseParams, businessParams,admin_user_id)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -521,45 +614,38 @@ func (c *GdybController) PostTwelve() {
 	})
 }
 
-func (c *GdybController) PostZHFive() {
-	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
+func (c *GdybController) Post5203() {
+	org_name := c.GetString("org_name")
+	operator := 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")
+	psn_no := c.GetString("psn_no")
+	mdtrt_id := c.GetString("mdtrt_id")
+	setl_id := c.GetString("setl_id")
+	bp := models.BaseParams{
+		SecretKey:      secret_key,
+		FixmedinsCode:  fixmedins_code,
+		InsuplcAdmdvs:  insuplc_admdvs,
+		MdtrtareaAdmvs: mdtrtarea_admvs,
+		OrgName:        org_name,
+		Doctor:         operator,
 	}
-	userJSONBytes, _ := json.Marshal(respJSON["pre"])
-	var hp []*models.NewCustom
-	if err := json.Unmarshal(userJSONBytes, &hp); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		return
+	bps := models.BusinessParams{
+		PsnNo:   psn_no,
+		MdtrtId: mdtrt_id,
+		SetlId:  setl_id,
 	}
-	fmt.Println(respJSON["psn_no"].(string))
-	fmt.Println(respJSON["mdtrt_id"].(string))
-
-	fmt.Println(respJSON["chrg_bchno"].(string))
-	fmt.Println(respJSON["org_name"].(string))
-	fmt.Println(respJSON["doctor"].(string))
-	fmt.Println(respJSON["dept"].(string))
-
-	fmt.Println(respJSON["fixmedins_code"].(string))
-	fmt.Println(respJSON["dept_code"].(string))
-	fmt.Println(respJSON["doctor_id"].(string))
-
-	fmt.Println(respJSON["insuplc_admdvs"].(string))
-	fmt.Println(respJSON["mdtrtarea_admvs"].(string))
-	fmt.Println(respJSON["secret_key"].(string))
+	result := service.Gdyb5203(bp, bps)
+	saveLogq(result, "", "5203", "结算单")
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 
-	//result := service.ZHGdyb2301(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
-	//	respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["med_type"].(string))
+	} else {
 
-	//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": "",
+		"pre": dat,
 	})
 }

models/doctor_advice_models.go

@@ -28,6 +28,8 @@ type DrugwayDic struct {
 	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	Creator     int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Bby01     string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
+
 }
 
 func (DrugwayDic) TableName() string {

models/his_models.go

@@ -40,6 +40,8 @@ type XtHisProject struct {
 	DeliveryWay               string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	NumberDays                string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
 	Total                     string  `gorm:"column:total" json:"total" form:"total"`
+	Vaf14             string    `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
+
 }
 
 func (XtHisProject) TableName() string {
@@ -232,6 +234,11 @@ type HisDoctorAdviceInfo struct {
 	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
 	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	DrugWayCount               string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+
+	NewGroupno               string   `gorm:"column:-" json:"new_groupno" form:"new_groupno"`
+	Newfn               string   `gorm:"column:-" json:"newfn" form:"newfn"`
+
 
 	BaseDrugLib BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
@@ -306,6 +313,9 @@ type HisPrescriptionInfo struct {
 	DoctorId           int64           `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+
+
+
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -332,10 +342,10 @@ type HisPrescription struct {
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
-	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
-	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
-	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
-	VMHisPrescriptionInfo  HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	HisDoctorAdviceInfo    []HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProject []HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	HisAdditionalCharge    []HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
+	VMHisPrescriptionInfo  HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"info"`
 	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
 	Cbm01                string                    `gorm:"column:cbm01" json:"cbm01" form:"cbm01"`
 	Cbm07                string                    `gorm:"column:cbm07" json:"cbm07" form:"cbm07"`
@@ -380,6 +390,8 @@ type HisProject struct {
 	ZuobiaoId             string    `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
 	Bck01b	 string    `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
 	Bby01             string    `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	Vaf14             string    `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
+
 
 }
 
@@ -1213,6 +1225,8 @@ type MyHisProject struct {
 	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Vaf14             string    `gorm:"column:vaf14" json:"vaf14" form:"vaf14"`
+
 }
 
 func (MyHisProject) TableName() string {
@@ -1381,6 +1395,10 @@ type HisPsn struct {
 	RecordDate    int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	InsuplcAdmdvs string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
 	IdCardType    int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	AuthInfo    string   `gorm:"column:auth_info" json:"auth_info" form:"auth_info"`
+
+
+
 }
 
 func (HisPsn) TableName() string {
@@ -1469,6 +1487,8 @@ type HisDoctorAdviceInfoTen struct {
 	HospApprFlag          int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	BaseDrugLib           BaseDrugLib  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 	HisOrderInfo          HisOrderInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"order_info"`
+	DrugWayCount               string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+
 }
 
 func (HisDoctorAdviceInfoTen) TableName() string {
@@ -1712,8 +1732,8 @@ type ChargeList struct {
 
 
 type ChargeListtwo struct {
-	Bby01 			string
-	Vaj25              string
+	Bby01 			int64  `json:"bby01"`
+	Vaj25              float64 `json:"vaj25"`
 
 }
 type UploadInfo struct {
@@ -1721,9 +1741,7 @@ type UploadInfo struct {
 	Acf01   int64 `json:"acf01"`
 	Bce01   string `json:"bce01"`
 	Bck01   string `json:"bck01"`
-	ChargeList []ChargeList `json:"chargeList"`
-	ChargeListtwo []ChargeListtwo `json:"chargeList"`
-
+	ChargeListtwo []*ChargeListtwo `json:"chargeList"`
 	Bce01a   string `json:"bce01a"`
 
 	Bck01c   string `json:"bck01c"`
@@ -2018,6 +2036,9 @@ type IEtwo struct {
 	UnameA  string `xml:"UnameA,attr"`
 	VEH02  string `xml:"VEH02,attr"`
 	BCK01C  string `xml:"BCK01C,attr"`
+	VAF07  string `xml:"VAF07,attr"`
+
+
 
 
 

models/stock_models.go

@@ -1358,6 +1358,8 @@ type BloodHisDoctorAdviceInfo struct {
 	HospApprFlag          int64                       `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag           int64                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	ExecutionFrequencyId  int64                       `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	DrugWayCount               string  `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
+
 }
 
 func (BloodHisDoctorAdviceInfo) TableName() string {

models/yb_models.go

@@ -58,3 +58,20 @@ type Result9001 struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnInfo    interface{} `json:"warn_info"`
 }
+
+
+type Result9001Two struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		Signinoutb struct {
+			SignNo   string `json:"sign_no"`
+
+		} `json:"signinoutb"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}

models/zuobiao_models.go

@@ -17,9 +17,46 @@ type HisZuobiaoAdvice struct {
 	SettleResultLog string `gorm:"column:settle_result_log" json:"settle_result_log" form:"settle_result_log"`
 	Cbm01 string `gorm:"column:cbm01" json:"cbm01" form:"cbm01"`
 	AdiviceIds string `gorm:"column:adivice_ids" json:"adivice_ids" form:"adivice_ids"`
+	Oid int64 `gorm:"column:oid" json:"oid" form:"oid"`
+	StartTime           int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime             int64   `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	Vaa01 string `gorm:"column:vaa01" json:"vaa01" form:"vaa01"`
+	Vaa07 string `gorm:"column:vaa07" json:"vaa07" form:"vaa07"`
+
+
+
 }
 
 
 func (HisZuobiaoAdvice) TableName() string {
 	return "his_zuobiao_advice"
 }
+
+
+type CmResult struct {
+	HisUserID     int       `gorm:"column:his_user_id;primaryKey"`
+	PatientName   string    `gorm:"column:patient_name"`
+	ProjectID     int       `gorm:"column:project_id"`
+	ProjectName   string    `gorm:"column:project_name"`
+	InspectDate   string       `gorm:"column:inspect_date"`
+	ItemID        int       `gorm:"column:item_id"`
+	ItemName      string    `gorm:"column:item_name"`
+	ItemType      int       `gorm:"column:item_type"`
+	ItemValue     string    `gorm:"column:item_value"`
+	RangeMin      string    `gorm:"column:range_min"`
+	RangeMax      string    `gorm:"column:range_max"`
+	RangeValue    string    `gorm:"column:range_value"`
+
+
+	RangeOptions  string    `gorm:"column:range_options"`
+	Unit          string    `gorm:"column:unit"`
+	State         string       `gorm:"column:state"`
+	CTime         string       `gorm:"column:c_time"`
+	UTime         string       `gorm:"column:u_time"`
+}
+
+// TableName sets the table name for the MedicalRecord model.
+func (CmResult) TableName() string {
+	return "xk_jy"
+}
+

routers/router.go

@@ -1,6 +1,7 @@
 package routers
 
 import (
+	"gdyb/controllers/ah"
 	"gdyb/controllers/coordinate"
 	"gdyb/controllers/hb"
 	"gdyb/controllers/js"
@@ -32,6 +33,8 @@ func init() {
 	zh.ZHHisManagerApiRegistRouters()
 	js.JSybRegistRouters()
 	nm.NmybRegistRouters()
+	ah.AHybRegistRouters()
 	coordinate.CoordinateRcegistRouters()
+	coordinate.CoordinatenetRcegistRouters()
 
 }

service/auto_create_week_schedules_service.go

@@ -70,21 +70,20 @@ func AutoCreateStock() {
 	var NewDrugCancelStock []*models.NewDrugCancelStockInfo
 
 	var XtDrugInventorys []*models.XtDrugInventory
-
 	var NewDrugWarehouseOutTwo []*models.NewDrugWarehouseOutInfo
 
 	//var XtDrugInventorys2 []*models.XtDrugInventory
 
-	//readDb.Model(&models.XtDrugInventory{}).Where("user_org_id = ? and status = 1 and is_upload <> 1 AND stock_max_number > 0", org_id).Preload("BaseDrugLib", "status = 1").Find(&XtDrugInventorys)
+	readDb.Model(&models.XtDrugInventory{}).Where("user_org_id = ? and status = 1 and is_upload <> 1 AND stock_max_number > 0", org_id).Preload("BaseDrugLib", "status = 1").Find(&XtDrugInventorys)
 
-	//readDb.Model(&models.NewWarehousingInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).First(&NewWarehousing)
-	//readDb.Model(&models.NewWarehouseOutInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehouseOut)
-	//readDb.Model(&models.NewCancelStockInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewCancelStock)
+	readDb.Model(&models.NewWarehousingInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).First(&NewWarehousing)
+	readDb.Model(&models.NewWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehouseOut)
+	readDb.Model(&models.NewCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewCancelStock)
 
 	////大丰
-	//readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 4778", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
-	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 360136", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
-	//readDb.Model(&models.NewDrugCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
+	readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 ", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
+	readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
+	readDb.Model(&models.NewDrugCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
 
 	//响水
 	//readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 5720", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
@@ -122,10 +121,10 @@ func AutoCreateStock() {
 
 	}
 
-	for _, item := range NewWarehousing {
-		res := Post3503ForGoodInfo(org_id, item)
+	for _, item := range NewDrugWarehouse {
+		res := Post3503ForDrug(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewWarehousingInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.NewDrugWarehouseInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
 		} else {
@@ -134,22 +133,19 @@ func AutoCreateStock() {
 		}
 	}
 
-	for _, item := range NewWarehouseOut {
-		res := Post3505ForGoodInfo(org_id, item)
+	for _, item := range NewDrugWarehouseOut {
+		res := Post3505ForDrug(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewWarehouseOutInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
-		} else {
-
-			continue
 		}
 	}
 
-	for _, item := range NewCancelStock {
-		res := Post3506ForGoodInfo(org_id, item)
+	for _, item := range NewDrugCancelStock {
+		res := Post3506ForDrug(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewCancelStockInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.NewDrugCancelStockInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
 		} else {
@@ -158,10 +154,12 @@ func AutoCreateStock() {
 		}
 	}
 
-	for _, item := range NewDrugWarehouse {
-		res := Post3503ForDrug(org_id, item)
+
+
+	for _, item := range NewWarehousing {
+		res := Post3503ForGoodInfo(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewDrugWarehouseInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.NewWarehousingInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
 		} else {
@@ -170,19 +168,22 @@ func AutoCreateStock() {
 		}
 	}
 
-	for _, item := range NewDrugWarehouseOut {
-		res := Post3505ForDrug(org_id, item)
+	for _, item := range NewWarehouseOut {
+		res := Post3505ForGoodInfo(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.NewWarehouseOutInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
+		} else {
+
+			continue
 		}
 	}
 
-	for _, item := range NewDrugCancelStock {
-		res := Post3506ForDrug(org_id, item)
+	for _, item := range NewCancelStock {
+		res := Post3506ForGoodInfo(org_id, item)
 		if res.Infcode == 0 {
-			writeDb.Model(&models.NewDrugCancelStockInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+			writeDb.Model(&models.NewCancelStockInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
 				"is_upload": 1,
 			})
 		} else {
@@ -191,6 +192,8 @@ func AutoCreateStock() {
 		}
 	}
 
+
+
 }
 
 func AutoGdybCreateStock() {

service/coordinate_service.go

@@ -290,10 +290,11 @@ func UpdateHisPatientStatusten(his *models.VMHisPatient) {
 	writeDb.Save(&his)
 }
 
-func GetUnSettleHisPrescriptionFive(org_id int64, patient_id int64, record_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
+func GetUnSettleHisPrescriptionFive(org_id int64, patient_id int64, record_date int64, p_type int64) (prescription []models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
+		Preload("VMHisPrescriptionInfo","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")
+			return db.Where("status = 1 AND user_org_id = ? and is_self_drug <> 1", 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").Preload("GoodInfo", "status=1")
@@ -302,14 +303,30 @@ func GetUnSettleHisPrescriptionFive(org_id int64, patient_id int64, record_date
 		Find(&prescription).Error
 	return
 }
+func GetUnSettleHisPrescriptionFiveone(id int64) (prescription []models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("VMHisPrescriptionInfo","status = 1").
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1  and is_self_drug <> 1").Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).
+		Where("id = ?", id).
+		Find(&prescription).Error
+	return
+}
+
+
 
-func GetUnSettleMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+func GetUnSettleMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
+		Preload("VMHisPrescriptionInfo","status = 1").
 		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("Drug", "status=1")
+			return db.Where("status = 1 AND user_org_id = ? and is_self_drug <> 1 ", 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").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
@@ -634,8 +651,8 @@ func GetDrugs() (string, string) {
 	request.Header.Set("Authorization", "Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJIT0RTV1NlcnZlciIsImV4cCI6NzczNjI2NzE1ODUsIm5iZiI6MTY3NjI3MTI4NSwiaWF0IjoxNjc2MjcxNTg1LCJ1c2VyY29kZSI6IjEwMDAwMSIsInJvbGVzIjoicm9sZTEiLCJjdXN0b20xIjoidmFsdWUxIiwidXNlcm5hbWUiOiLlnZDmoIdIT-ezu-e7nyIsImx2dyI6IjMwMjQwMDAwIn0.s9upThmOj_t2ZqC5_s7UIXbIdphQ6b4XE-nqQaUs5RTTA8jr2UtMlYZkV4B1b0J1maReMnENaJ3hud5Tfw7eug")
 	request.Header.Set("Accept", "*/*")
 
-	fmt.Println(request)
-	fmt.Println(request.Header)
+	//fmt.Println(request)
+	//fmt.Println(request.Header)
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {
@@ -643,19 +660,13 @@ func GetDrugs() (string, string) {
 		return err.Error(), ""
 	}
 	defer resp.Body.Close()
-	fmt.Println(resp)
-	fmt.Println("resp.Status")
-	fmt.Println(resp.Status)
-	fmt.Println("resp.Body")
 
-	fmt.Println(resp.Body)
 
 	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, inputLog
 
@@ -667,8 +678,8 @@ func GetProject() (string, string) {
 
 	var inputLog string
 	bytesData, err := json.Marshal(inputData)
-	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
+	//inputLog = string(bytesData)
+
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
@@ -689,8 +700,7 @@ func GetProject() (string, string) {
 	request.Header.Set("Authorization", "Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJIT0RTV1NlcnZlciIsImV4cCI6NzczNjI2NzE1ODUsIm5iZiI6MTY3NjI3MTI4NSwiaWF0IjoxNjc2MjcxNTg1LCJ1c2VyY29kZSI6IjEwMDAwMSIsInJvbGVzIjoicm9sZTEiLCJjdXN0b20xIjoidmFsdWUxIiwidXNlcm5hbWUiOiLlnZDmoIdIT-ezu-e7nyIsImx2dyI6IjMwMjQwMDAwIn0.s9upThmOj_t2ZqC5_s7UIXbIdphQ6b4XE-nqQaUs5RTTA8jr2UtMlYZkV4B1b0J1maReMnENaJ3hud5Tfw7eug")
 	request.Header.Set("Accept", "*/*")
 
-	fmt.Println(request)
-	fmt.Println(request.Header)
+
 	client := http.Client{}
 	resp, err := client.Do(request)
 	if err != nil {
@@ -698,19 +708,12 @@ func GetProject() (string, string) {
 		return err.Error(), ""
 	}
 	defer resp.Body.Close()
-	fmt.Println(resp)
-	fmt.Println("resp.Status")
-	fmt.Println(resp.Status)
-	fmt.Println("resp.Body")
-
-	fmt.Println(resp.Body)
 
 	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, inputLog
 
@@ -718,76 +721,73 @@ func GetProject() (string, string) {
 
 
 
-
-
-
 //开医嘱版本1
-func UploadNMGPrescriptionForCoordinate(info models.UploadInfo) (string, string) {
-
-
-	inputData := make(map[string]interface{})
-
-
-	presInfos := make([]map[string]interface{}, 0)
-
-
-	for _, item := range info.ChargeList {
-		inputDataPresInfo := make(map[string]interface{})
-		inputDataPresInfo["bbx01"] = item.Bbx01
-		inputDataPresInfo["vaf21"] = item.Vaf21
-		inputDataPresInfo["vaf22"] = item.Vaf22
-		inputDataPresInfo["vaf42"] = item.Vaf42
-		presInfos = append(presInfos, inputDataPresInfo)
-	}
-	inputData["vaa01"] = info.Vaa01   // 就诊凭证编号
-	inputData["vaa07"] = info.Vaa07   // 就诊凭证编号
-	inputData["acf01"] = info.Acf01   // 就诊凭证编号
-	inputData["vaa05"] = info.Vaa05   // 就诊凭证编号
-	inputData["bck01"] = info.Bck01   // 就诊凭证编号
-	inputData["bce01a"] = info.Bce01a   // 就诊凭证编号
-	inputData["bck01a"] = info.Bck01a   // 就诊凭证编号
-	inputData["vafReqList"] = presInfos // 就诊凭证编号
-	var inputLog string
-	bytesData, err := json.Marshal(inputData)
-	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error(), ""
-	}
-	reader := bytes.NewReader(bytesData)
-	var url string
-	gdyb_url := "http://192.168.100.199:8080/HO/HOClinical/v1/VAF_New"
-
-	//gdyb_url := "http://218.104.146.179:9091/esb/listener/sendPretreat"
-	url = gdyb_url
-
-	//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("Authorization", "Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJIT0RTV1NlcnZlciIsImV4cCI6NzczNjI2NzE1ODUsIm5iZiI6MTY3NjI3MTI4NSwiaWF0IjoxNjc2MjcxNTg1LCJ1c2VyY29kZSI6IjEwMDAwMSIsInJvbGVzIjoicm9sZTEiLCJjdXN0b20xIjoidmFsdWUxIiwidXNlcm5hbWUiOiLlnZDmoIdIT-ezu-e7nyIsImx2dyI6IjMwMjQwMDAwIn0.s9upThmOj_t2ZqC5_s7UIXbIdphQ6b4XE-nqQaUs5RTTA8jr2UtMlYZkV4B1b0J1maReMnENaJ3hud5Tfw7eug")
-	request.Header.Set("Accept", "*/*")
-	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, inputLog
-
-}
+//func UploadNMGPrescriptionForCoordinate(info models.UploadInfo) (string, string) {
+//
+//
+//	inputData := make(map[string]interface{})
+//
+//
+//	presInfos := make([]map[string]interface{}, 0)
+//
+//
+//	for _, item := range info.ChargeList {
+//		inputDataPresInfo := make(map[string]interface{})
+//		inputDataPresInfo["bbx01"] = item.Bbx01
+//		inputDataPresInfo["vaf21"] = item.Vaf21
+//		inputDataPresInfo["vaf22"] = item.Vaf22
+//		inputDataPresInfo["vaf42"] = item.Vaf42
+//		presInfos = append(presInfos, inputDataPresInfo)
+//	}
+//	inputData["vaa01"] = info.Vaa01   // 就诊凭证编号
+//	inputData["vaa07"] = info.Vaa07   // 就诊凭证编号
+//	inputData["acf01"] = info.Acf01   // 就诊凭证编号
+//	inputData["vaa05"] = info.Vaa05   // 就诊凭证编号
+//	inputData["bck01"] = info.Bck01   // 就诊凭证编号
+//	inputData["bce01a"] = info.Bce01a   // 就诊凭证编号
+//	inputData["bck01a"] = info.Bck01a   // 就诊凭证编号
+//	inputData["vafReqList"] = presInfos // 就诊凭证编号
+//	var inputLog string
+//	bytesData, err := json.Marshal(inputData)
+//	inputLog = string(bytesData)
+//	fmt.Println(string(bytesData))
+//	if err != nil {
+//		fmt.Println(err.Error())
+//		return err.Error(), ""
+//	}
+//	reader := bytes.NewReader(bytesData)
+//	var url string
+//	gdyb_url := "http://192.168.100.199:8080/HO/HOClinical/v1/VAF_New"
+//
+//	//gdyb_url := "http://218.104.146.179:9091/esb/listener/sendPretreat"
+//	url = gdyb_url
+//
+//	//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("Authorization", "Bearer eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJIT0RTV1NlcnZlciIsImV4cCI6NzczNjI2NzE1ODUsIm5iZiI6MTY3NjI3MTI4NSwiaWF0IjoxNjc2MjcxNTg1LCJ1c2VyY29kZSI6IjEwMDAwMSIsInJvbGVzIjoicm9sZTEiLCJjdXN0b20xIjoidmFsdWUxIiwidXNlcm5hbWUiOiLlnZDmoIdIT-ezu-e7nyIsImx2dyI6IjMwMjQwMDAwIn0.s9upThmOj_t2ZqC5_s7UIXbIdphQ6b4XE-nqQaUs5RTTA8jr2UtMlYZkV4B1b0J1maReMnENaJ3hud5Tfw7eug")
+//	request.Header.Set("Accept", "*/*")
+//	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, inputLog
+//
+//}
 
 //开医嘱版本2
 func UploadNMGPrescriptionForCoordinatetwo(cmdid string, xml_date string) (string, string) {
@@ -808,9 +808,12 @@ func UploadNMGPrescriptionForCoordinatetwo(cmdid string, xml_date string) (strin
 	values.Set("cmdid", cmdid)
 	values.Set("data", xml_date)
 	dataStr := values.Encode()
+	fmt.Println(xml_date)
+	fmt.Println(dataStr)
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
-	request, err := http.NewRequest("POST", urls, strings.NewReader(dataStr))
+
+	request, err := http.NewRequest("POST", urls, bytes.NewBufferString(string(dataStr)))
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
@@ -890,7 +893,7 @@ func QueryNMGPrescriptionForCoordinate(ACF01 int64, vaf01List []string, cbm01 st
 }
 
 //删除医嘱
-func CancleNMGPrescriptionForCoordinate(ACF01 int64,  cbm01 string,vaf01List []string) (string, string) {
+func CancleNMGPrescriptionForCoordinate(ACF01 int64,  cbm01 string) (string, string) {
 
 	inputData := make(map[string]interface{})
 	//
@@ -1059,12 +1062,19 @@ func Createzuobiao(zuobiao *models.HisZuobiaoAdvice){
 
 }
 
-func Getzuobiao(user_org_id int64,patient_id int64,record_date int64)(zuobiao models.HisZuobiaoAdvice,err error){
-	err = readDb.Model(&models.HisZuobiaoAdvice{}).Where("user_org_id = ? and patient_id = ? and record_date = ?",user_org_id,patient_id,record_date).First(&zuobiao).Error
+func Getzuobiao(user_org_id int64,patient_id int64,start_time int64,end_time int64, ids string,vaa01 string, vaa07 string)(zuobiao models.HisZuobiaoAdvice,err error){
+	err = readDb.Model(&models.HisZuobiaoAdvice{}).Where("user_org_id = ? and patient_id = ? and start_time = ? and end_time = ? and status = 1 and cbm01 = ? and vaa01 = ? and vaa07 = ?",user_org_id,patient_id,start_time,end_time,ids,vaa01,vaa07).Last(&zuobiao).Error
+	return
+}
+
+
+func Getzuobiaobyid(id int64)(zuobiao models.HisZuobiaoAdvice,err error){
+	err = readDb.Model(&models.HisZuobiaoAdvice{}).Where("id = ?",id).Last(&zuobiao).Error
 	return
 }
 
 
+
 //查询诊断
 func QueryNMGDiagnoseForCoordinate(ACF01 int64, vaa01 string, vaa07 string) (string, string) {
 
@@ -1168,6 +1178,7 @@ func QueryNMGChenckForCoordinate(ACF01 int64, vaa01 string, vaa07 string,bfc03s
 
 //血库记账接口
 func NMGSettleForCoordinate(info models.UploadInfo) (string, string) {
+	fmt.Println(info)
 
 	inputData := make(map[string]interface{})
 	inputData["acf01"] = info.Acf01   // 就诊凭证编号
@@ -1178,7 +1189,6 @@ func NMGSettleForCoordinate(info models.UploadInfo) (string, string) {
 	var inputLog string
 	bytesData, err := json.Marshal(inputData)
 	inputLog = string(bytesData)
-	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
@@ -1527,6 +1537,7 @@ func UpdataOrderStatusThreef(number string, user_org_id int64) (err error) {
 
 func UpdataOrderStatustwo(id int64, number string, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "status": 0}).Error
+	//err = writeDb.Model(&models.HisPatient{}).Where("status = 1 AND number = ?", number).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 	return
@@ -1543,3 +1554,9 @@ func GetDrugwayDicByName(name string, org_id int64) (ef models.DrugwayDic, err e
 	err = readDb.Model(&models.DrugwayDic{}).Where("org_id = ? AND name = ?", org_id, name).First(&ef).Error
 	return
 }
+
+
+func GetResultRecord(date string) (record []models.CmResult, err error) {
+	err = nmDataBase.Model(&models.CmResult{}).Where("inspect_date >= ?",date).Find(&record).Error
+	return
+}

service/db.go

@@ -18,7 +18,6 @@ package service
 
 import (
 	"fmt"
-
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/mysql" // mysql
@@ -29,92 +28,44 @@ var writeDb *gorm.DB
 var readUserDb *gorm.DB
 var writeUserDb *gorm.DB
 
-var readMiddleDb *gorm.DB
-var writeMiddleDb *gorm.DB
 
-var readPatientDb *gorm.DB
-var writePatientDb *gorm.DB
 
-var readSgjPatientDb *gorm.DB
-var writeSgjPatientDb *gorm.DB
 
-var readUserDbT *gorm.DB
-var writeUserDbT *gorm.DB
 
 var err error
 
 func ConnectDB() {
-	readHost := beego.AppConfig.String("readmysqlhost")
+	readHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	readPort := beego.AppConfig.String("readmysqlport")
-	readUser := beego.AppConfig.String("readmysqluser")
-	readPass := beego.AppConfig.String("readmysqlpass")
+	readUser := "kuyicloud"
+	readPass := "yHXAcb7dTJyvMiX3vK2iOvTAHeaowy5P"
 	readName := beego.AppConfig.String("readmysqlname")
 
-	writeHost := beego.AppConfig.String("writemysqlhost")
+
+
+	writeHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	writePort := beego.AppConfig.String("writemysqlport")
-	writeUser := beego.AppConfig.String("writemysqluser")
-	writePass := beego.AppConfig.String("writemysqlpass")
+	writeUser := "kuyicloud"
+	writePass := "yHXAcb7dTJyvMiX3vK2iOvTAHeaowy5P"
 	writeName := beego.AppConfig.String("writemysqlname")
 
-	readUserHost := beego.AppConfig.String("readuserhost")
+
+
+	readUserHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	readUserPort := beego.AppConfig.String("readuserport")
-	readUserUser := beego.AppConfig.String("readuseruser")
-	readUserPass := beego.AppConfig.String("readuserpass")
+	readUserUser := "kuyicloud"
+	readUserPass :=  "yHXAcb7dTJyvMiX3vK2iOvTAHeaowy5P"
 	readUserName := beego.AppConfig.String("readusername")
 
-	writeUserHost := beego.AppConfig.String("writeuserhost")
+
+	writeUserHost := "kuyicloud2024lt.mysql.rds.aliyuncs.com"
 	writeUserPort := beego.AppConfig.String("writeuserport")
-	writeUserUser := beego.AppConfig.String("writeuseruser")
-	writeUserPass := beego.AppConfig.String("writeuserpass")
-	writeUserName := beego.AppConfig.String("writeusername")
-
-	readMiddleHost := beego.AppConfig.String("readmiddlehost")
-	readMiddlePort := beego.AppConfig.String("readmiddleport")
-	readMiddleUser := beego.AppConfig.String("readmiddleuser")
-	readMiddlePass := beego.AppConfig.String("readmiddlepass")
-	readMiddleName := beego.AppConfig.String("readmiddlename")
-
-	writeMiddleHost := beego.AppConfig.String("writemiddlehost")
-	writeMiddlePort := beego.AppConfig.String("writemiddleport")
-	writeMiddleUser := beego.AppConfig.String("writemiddleuser")
-	writeMiddlePass := beego.AppConfig.String("writemiddlepass")
-	writeMiddleName := beego.AppConfig.String("writemiddlename")
-
-	readPatientHost := beego.AppConfig.String("readpatienthost")
-	readPatientPort := beego.AppConfig.String("readpatientport")
-	readPatientUser := beego.AppConfig.String("readpatientuser")
-	readPatientPass := beego.AppConfig.String("readpatientpass")
-	readPatientName := beego.AppConfig.String("readpatientname")
-
-	writePatientHost := beego.AppConfig.String("writepatienthost")
-	writePatientPort := beego.AppConfig.String("writepatientport")
-	writePatientUser := beego.AppConfig.String("writepatientuser")
-	writePatientPass := beego.AppConfig.String("writepatientpass")
-	writePatientName := beego.AppConfig.String("writepatientname")
-
-	readSgjPatientHost := beego.AppConfig.String("readsgjpatientmysqlhost")
-	readSgjPatientPort := beego.AppConfig.String("readsgjpatientmysqlport")
-	readSgjPatientUser := beego.AppConfig.String("readsgjpatientmysqluser")
-	readSgjPatientPass := beego.AppConfig.String("readsgjpatientmysqlpass")
-	readSgjPatientName := beego.AppConfig.String("readsgjpatientmysqlname")
-
-	writeSgjPatientHost := beego.AppConfig.String("writesgjpatientmysqlhost")
-	writeSgjPatientPort := beego.AppConfig.String("writesgjpatientmysqlport")
-	writeSgjPatientUser := beego.AppConfig.String("writesgjpatientmysqluser")
-	writeSgjPatientPass := beego.AppConfig.String("writesgjpatientmysqlpass")
-	writeSgjPatientName := beego.AppConfig.String("writesgjpatientmysqlname")
-
-	readUserHostT := beego.AppConfig.String("readuserhostTest")
-	readUserPortT := beego.AppConfig.String("readuserportTest")
-	readUserUserT := beego.AppConfig.String("readuseruserTest")
-	readUserPassT := beego.AppConfig.String("readuserpassTest")
-	readUserNameT := beego.AppConfig.String("readusernameTest")
-
-	writeUserHostT := beego.AppConfig.String("writeuserhostTest")
-	writeUserPortT := beego.AppConfig.String("writeuserportTest")
-	writeUserUserT := beego.AppConfig.String("writeuseruserTest")
-	writeUserPassT := beego.AppConfig.String("writeuserpassTest")
-	writeUserNameT := beego.AppConfig.String("writeusernameTest")
+	writeUserUser :=  "kuyicloud"
+	writeUserPass := "yHXAcb7dTJyvMiX3vK2iOvTAHeaowy5P"
+	writeUserName :=  beego.AppConfig.String("readusername")
+
+
+
 
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
@@ -122,17 +73,6 @@ func ConnectDB() {
 	rudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUser, readUserPass, readUserHost, readUserPort, readUserName)
 	wudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUser, writeUserPass, writeUserHost, writeUserPort, writeUserName)
 
-	rmdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readMiddleUser, readMiddlePass, readMiddleHost, readMiddlePort, readMiddleName)
-	wmdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeMiddleUser, writeMiddlePass, writeMiddleHost, writeMiddlePort, writeMiddleName)
-
-	rpdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readPatientUser, readPatientPass, readPatientHost, readPatientPort, readPatientName)
-	wpdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writePatientUser, writePatientPass, writePatientHost, writePatientPort, writePatientName)
-
-	rspdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readSgjPatientUser, readSgjPatientPass, readSgjPatientHost, readSgjPatientPort, readSgjPatientName)
-	wspdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeSgjPatientUser, writeSgjPatientPass, writeSgjPatientHost, writeSgjPatientPort, writeSgjPatientName)
-
-	rudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUserT, readUserPassT, readUserHostT, readUserPortT, readUserNameT)
-	wudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUserT, writeUserPassT, writeUserHostT, writeUserPortT, writeUserNameT)
 
 	readDb, err = gorm.Open("mysql", rdsn)
 	if err != nil {
@@ -150,21 +90,7 @@ func ConnectDB() {
 	writeDb.DB().SetMaxOpenConns(100)
 	writeDb.LogMode(true)
 
-	readUserDbT, err = gorm.Open("mysql", rudsnT)
-	if err != nil {
-		//beego.Error(err)
-	}
-	readUserDbT.DB().SetMaxIdleConns(10)
-	readUserDbT.DB().SetMaxOpenConns(100)
-	readUserDbT.LogMode(true)
 
-	writeUserDbT, err = gorm.Open("mysql", wudsnT)
-	if err != nil {
-		//beego.Error(err)
-	}
-	writeUserDbT.DB().SetMaxIdleConns(10)
-	writeUserDbT.DB().SetMaxOpenConns(100)
-	writeUserDbT.LogMode(true)
 
 	readUserDb, err = gorm.Open("mysql", rudsn)
 	if err != nil {
@@ -182,53 +108,8 @@ func ConnectDB() {
 	writeUserDb.DB().SetMaxOpenConns(100)
 	writeUserDb.LogMode(true)
 
-	readMiddleDb, err = gorm.Open("mysql", rmdsn)
-	if err != nil {
-		//beego.Error(err)
-	}
-	readMiddleDb.DB().SetMaxIdleConns(10)
-	readMiddleDb.DB().SetMaxOpenConns(100)
-	readMiddleDb.LogMode(true)
-
-	writeMiddleDb, err = gorm.Open("mysql", wmdsn)
-	if err != nil {
-		//beego.Error(err)
-	}
-	writeMiddleDb.DB().SetMaxIdleConns(10)
-	writeMiddleDb.DB().SetMaxOpenConns(100)
-	writeMiddleDb.LogMode(true)
-
-	readPatientDb, err = gorm.Open("mysql", rpdsn)
-	if err != nil {
-		beego.Error(err)
-	}
-	readPatientDb.DB().SetMaxIdleConns(10)
-	readPatientDb.DB().SetMaxOpenConns(100)
-	readPatientDb.LogMode(true)
 
-	writePatientDb, err = gorm.Open("mysql", wpdsn)
-	if err != nil {
-		beego.Error(err)
-	}
-	writePatientDb.DB().SetMaxIdleConns(10)
-	writePatientDb.DB().SetMaxOpenConns(100)
-	writePatientDb.LogMode(true)
-
-	readSgjPatientDb, err = gorm.Open("mysql", rspdsn)
-	if err != nil {
-		beego.Error(err)
-	}
-	readSgjPatientDb.DB().SetMaxIdleConns(10)
-	readSgjPatientDb.DB().SetMaxOpenConns(100)
-	readSgjPatientDb.LogMode(true)
 
-	writeSgjPatientDb, err = gorm.Open("mysql", wspdsn)
-	if err != nil {
-		beego.Error(err)
-	}
-	writeSgjPatientDb.DB().SetMaxIdleConns(10)
-	writeSgjPatientDb.DB().SetMaxOpenConns(100)
-	writeSgjPatientDb.LogMode(true)
 }
 
 //func DisconnectDB() {
@@ -250,25 +131,4 @@ func UserWriteDB() *gorm.DB {
 	return writeUserDb
 }
 
-func MiddleReadDB() *gorm.DB {
-	return readMiddleDb
-}
-func MiddleWriteDB() *gorm.DB {
-	return writeMiddleDb
-}
-
-func PatientReadDB() *gorm.DB {
-	return readPatientDb
-}
 
-func PatientWriteDB() *gorm.DB {
-	return writePatientDb
-}
-
-func SgjPatientReadDB() *gorm.DB {
-	return readSgjPatientDb
-}
-
-func SgjPatientWriteDB() *gorm.DB {
-	return writeSgjPatientDb
-}

service/gxyb_service.go

@@ -0,0 +1,331 @@
+package service
+
+import (
+
+	//"crypto/md5"
+
+	//"strings"
+	//"gdyb/utils"
+
+
+	"time"
+	"fmt"
+	"encoding/json"
+	"github.com/astaxie/beego"
+	"net/http"
+	"strconv"
+	"io/ioutil"
+
+	"bytes"
+	"github.com/go-ole/go-ole"
+	"github.com/go-ole/go-ole/oleutil"
+)
+
+func Gxyb9001(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, admin_user_id int64,setlId string,mdtrtId string,psn_no string,medinsSetlId string){
+
+	ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
+	defer ole.CoUninitialize()
+
+	// Replace with the ProgID or CLSID of your COM object
+	progID := "YinHai.XJ.Actual.Interface.New"
+
+	// Create COM object
+	unknown, err := oleutil.CreateObject(progID)
+	if err != nil {
+		fmt.Println("Unable to create COM object:", err)
+	}
+	defer unknown.Release()
+
+	// Query for the IDispatch interface
+	dispatch, err := unknown.QueryInterface(ole.IID_IDispatch)
+	if err != nil {
+		fmt.Println("Unable to get IDispatch interface:", err)
+	}
+	defer dispatch.Release()
+
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	inputMessage := make(map[string]interface{})
+	inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "P0001" // 交易编码
+	inputData["setlId"] = setlId
+	inputData["mdtrtId"] = mdtrtId
+	inputData["psn_no"] = psn_no
+	inputData["medinsSetlId"] = medinsSetlId
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	jsonData, err := json.Marshal(inputMessage)
+	if err != nil {
+		fmt.Println("转换为JSON失败:", err)
+
+	}
+	//data := fmt.Sprintf(`{"transNo":"%s","transType":"%s","timestamp":"%s","data":{"fixmedinsCode":"%s","psnNo":"%s"}}`, transNo, transType, timestamp, fixmedinsCode, psnNo)
+	result2 := ""
+	// Call COM object's method using the IDispatch interface
+	resulr, err := oleutil.CallMethod(dispatch, "gxyb_call", "P0001", string(jsonData),&result2)
+	fmt.Println(resulr)
+
+
+}
+
+
+func Gxyb5302(psnNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string,admin_user_id int64) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	//timestamp := time.Now().Unix()
+	timestamp := time.Now().UnixNano() / 1e6
+
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	inputMessage := SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+
+	// 生成输入报文
+	//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"] = "5302"    // 交易编码
+	inputData["psn_no"] = psnNo       // 人员编号 （来自1101接口返回）
+	inputData["biz_appy_type"] = "03" // 人员编号 （来自1101接口返回）
+
+	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)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
+	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
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}
+
+
+func Gxyb2207(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, acct_used_flag string, token string,admin_user_id int64) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := make(map[string]interface{})
+
+	if  mdtrtarea_admvs == "450721"  ||  mdtrtarea_admvs == "450127"{
+
+		inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+	} else {
+		inputMessage = SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	}
+	//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"] = "2207" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = token // 就诊凭证编号
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = token  // 就诊凭证编号
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+		}
+	}
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+	if insuplc_admdvs == "421300" {
+		if med_type == "11" {
+			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
+		} else if med_type == "14" {
+			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+		}
+	} else {
+		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"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = ""                     // 发票号
+
+	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
+	inputData["overlmt_selfpay"] = overlmt_selfpay     //
+	inputData["preselfpay_amt"] = preselfpay_amt       //
+	inputData["inscp_scp_amt"] = inscp_scp_amt         //
+
+	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 + "2207"
+
+	var url string
+	if fixmedins_code == "H15049901371" || mdtrtarea_admvs == "450127" ||  mdtrtarea_admvs == "450721" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "2207"
+	}
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2207"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2207"
+
+
+		request, err := http.NewRequest("POST", url, reader)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+
+		request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+		request.Header.Set("x-tif-paasid", gdyb_paasid)
+		request.Header.Set("x-tif-signature", signature)
+		request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+		request.Header.Set("x-tif-nonce", nonce)
+
+		client := http.Client{}
+		resp, err := client.Do(request)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+		respBytes, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			fmt.Println(err.Error())
+			return err.Error(), ""
+		}
+		str := string(respBytes)
+		fmt.Println(str)
+		mjson, _ := json.Marshal(inputMessage)
+		str2 := string(mjson)
+
+		return str, str2
+
+}
+
+func Gxyb2503( org_name string, doctor string, fixmedins_code string,insuplc_admdvs string, mdtrtarea_admvs string, secret_key string,admin_user_id int64) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2503"                  // 交易编码
+	inputData["psn_no"] = "45000000000008100150404986"                     // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = "390"                // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_code"] = "M03900"         // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_name"] = "高血压（高危组）"         // 险种类型（来自1101接口返回）
+	inputData["insu_optins"] = "450721"       // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_no"] = "H45072101171"   // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_name"] = "灵山盛康血液透析中心" // 险种类型（来自1101接口返回）
+	inputData["hosp_ide_date"] = "2024-02-01"         // 险种类型（来自1101接口返回）
+	inputData["diag_dr_codg"] = "D450721000406"           // 开始时间
+	inputData["diag_dr_name"] = "韦秋萍"              // 开始时间
+	inputData["begndate"] = "2024-02-01"              // 医师编码
+	inputData["tel"] = ""                           // 医师编码
+	inputData["addr"] = ""                          // 医师编码
+	inputData["enddate"] = "2026-01-30"                 // 医师编码
+
+	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)
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/2503"
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/2503"
+	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 + "2503"
+
+	var url string
+
+	url = gdyb_url
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	str := string(respBytes)
+	fmt.Println(str)
+	return str
+}

service/hb_service.go

@@ -1133,7 +1133,7 @@ func HeBeiyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 		if med_type == "11" || med_type == "1112" || med_type == "1111" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
-			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
+			inputData["med_type"] = "14" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
@@ -1258,7 +1258,7 @@ func HeBeiyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 		if med_type == "11" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
-			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+			inputData["med_type"] = "14" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
@@ -1383,7 +1383,7 @@ func HeBeiyb2207A(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 		if med_type == "11" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
-			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+			inputData["med_type"] = "14" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号

service/hbyb_service.go

@@ -13,6 +13,9 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"encoding/xml"
+
+
 )
 
 type Charset string
@@ -225,7 +228,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		if med_type == "11" || med_type == "1111" || med_type == "1112" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
-			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+			inputData["med_type"] = "14" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
@@ -522,7 +525,7 @@ func Hbyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		if med_type == "11" || med_type == "1111" || med_type == "1112" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
-			inputData["med_type"] = "140110" // 医疗类别 11 普通门诊  12 门诊挂号
+			inputData["med_type"] = "14" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
@@ -593,7 +596,7 @@ func Hbyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		if med_type == "11" || med_type == "1111" || med_type == "1112" {
 			inputData["med_type"] = "110104" // 医疗类别 11 普通门诊  12 门诊挂号
 		} else if med_type == "14" {
-			inputData["med_type"] = "140101" // 医疗类别 11 普通门诊  12 门诊挂号
+			inputData["med_type"] = "14" // 医疗类别 11 普通门诊  12 门诊挂号
 		}
 	} else {
 		inputData["med_type"] = med_type // 医疗类别 11 普通门诊  12 门诊挂号
@@ -684,11 +687,11 @@ func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "5203" // 交易编码
+	inputMessage["infno"] = "YH03" // 交易编码
 	inputData["psn_no"] = businessParams.PsnNo
 	inputData["setl_id"] = businessParams.SetlId
 	inputData["mdtrt_id"] = businessParams.MdtrtId
-	//inputData["med_type"] = med_type
+	inputData["med_type"] = med_type
 	fmt.Println(med_type)
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -700,7 +703,41 @@ func Hbyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	}
 
 	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2208", string(bytesData), json2)
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "YH03", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	//mjson, _ := json.Marshal(inputMessage)
+	//str2 := string(mjson)
+	fmt.Println(string(out))
+
+	return ConvertToString(string(out), "gbk", "utf-8")
+}
+
+func Hbyb5203aa(baseParams models.BaseParams, businessParams models.BusinessParams) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "5203" // 交易编码
+	inputData["psn_no"] = businessParams.PsnNo
+	inputData["setl_id"] = businessParams.SetlId
+	inputData["mdtrt_id"] = businessParams.MdtrtId
+	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()
+	}
+
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "5203", string(bytesData), json2)
 	out, err := cmd.Output()
 	if err != nil {
 		fmt.Println("error:", err.Error())
@@ -875,6 +912,78 @@ func Hbyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
+type Input struct {
+	MonSetlAppyID   string `xml:"MON_SETL_APPY_ID"`
+	FixmedinsNo     string `xml:"FIXMEDINS_NO"`
+	ClrCnt          string    `xml:"CLR_CNT"`
+	MedfeeSumAmt    string    `xml:"MEDFEE_SUMAMT"`
+	OptinsPaySumAmt string    `xml:"OPTINS_PAY_SUMAMT"`
+	Begndate        string `xml:"BEGNDATE"`
+	Enddate         string `xml:"ENDDATE"`
+	OpterName       string `xml:"OPTER_NAME"`
+}
+
+type Inputs struct {
+	XMLName xml.Name `xml:"INPUTS"`
+	Input   Input    `xml:"INPUT"`
+}
+
+type Data struct {
+	XMLName xml.Name `xml:"DATA"`
+	Inputs  Inputs   `xml:"INPUTS"`
+}
+
+
+func Hbyb1608(baseParams models.BaseParams,cnt string,medfee_sumamt string,start_time string,end_time string,func_t string) string {
+
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	//input := make(map[string]interface{})
+	//inputDatas := []make(map[string]interface{})
+	//inputDatas := make([]map[string]interface{}, 0)
+	data := Data{
+		Inputs: Inputs{
+			Input: Input{
+				MonSetlAppyID:  strconv.FormatInt(timestamp, 10)  ,
+				FixmedinsNo:     baseParams.FixmedinsCode,
+				ClrCnt:          cnt,
+				MedfeeSumAmt:    medfee_sumamt,
+				OptinsPaySumAmt: func_t,
+				Begndate:        start_time,
+				Enddate:         end_time,
+				OpterName:       baseParams.Doctor,
+			},
+		},
+	}
+	// 将结构体变量转换为 XML 字符串
+	xmlData, err := xml.MarshalIndent(data, "", "  ")
+	if err != nil {
+		fmt.Println("转换为XML失败:", err)
+	}
+
+	inputMessage["infno"] = "1608" // 交易编码
+	inputMessage["input"] = string(xmlData) //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1608", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	fmt.Println(string(out))
+	return ConvertToString(string(out), "gbk", "utf-8")
+}
+
+
 func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
@@ -889,6 +998,52 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 	//inputDatas := []make(map[string]interface{})
 	inputDatas := make([]map[string]interface{}, 0)
 
+	inputMessage["infno"] = "3202a" // 交易编码
+	for _, item := range businessParams {
+		inputData := make(map[string]interface{})
+		inputData["insutype"] = ""                        // 险种
+		inputData["clr_type"] = ""                        // 就诊 ID（来自2201接口返回）
+		inputData["setl_optins"] = item.SetlOptins                     // 结算经办机构
+		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
+		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
+		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
+		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
+		inputData["med_type"] = "14"                        //个人账户支付金额
+		inputDatas = append(inputDatas, inputData)
+	}
+	input["clrdata"] = inputDatas
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "3202a", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	fmt.Println(string(out))
+	return ConvertToString(string(out), "gbk", "utf-8")
+
+}
+func Hbyb3202b(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
+
+	fmt.Println(baseParams)
+	fmt.Println(businessParams)
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	//inputDatas := []make(map[string]interface{})
+	inputDatas := make([]map[string]interface{}, 0)
+
 	inputMessage["infno"] = "3202a" // 交易编码
 	for _, item := range businessParams {
 		inputData := make(map[string]interface{})
@@ -899,7 +1054,7 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
 		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
-		inputData["med_type"] = ""                        //个人账户支付金额
+		inputData["med_type"] = "110104"                        //个人账户支付金额
 		inputDatas = append(inputDatas, inputData)
 	}
 	input["clrdata"] = inputDatas
@@ -1731,7 +1886,7 @@ func Hbyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
+
 	//tempTime := time.Unix(timestamp, 0)
 	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
@@ -1745,44 +1900,25 @@ func Hbyb5301(psnNo string, insutype string, org_name string, doctor string, fix
 	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
+
+
 	bytesData, err := json.Marshal(inputMessage)
+	//inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error()
 	}
-	reader := bytes.NewReader(bytesData)
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/5301"
-	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 + "5301"
-	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)
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "5301", string(bytesData), json2)
+	out, err := cmd.Output()
 	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
+		fmt.Println("error:", err.Error())
 	}
-	str := string(respBytes)
-	fmt.Println(str)
-	return str
+	fmt.Println(string(out))
+	return ConvertToString(string(out), "gbk", "utf-8")
+
 }
 
 //
@@ -2420,3 +2556,646 @@ func Hbyb2001(secret_key string, org_name string, doctor_name string, code strin
 
 	return string(out), string(bytesData)
 }
+
+
+// 住院登记
+func Hbyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	//signature := setSignature(timestamp, nonce, secret_key)
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	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"] = "2401"              // 交易编码
+	inputData["psn_no"] = struct2401.PsnNo      // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = struct2401.Insutype // 险种类型（来自1101接口返回）
+	inputData["tel"] = ""
+	inputData["coner_name"] = ""
+	inputData["begntime"] = struct2401.Begntime             // 开始时间
+	inputData["mdtrt_cert_type"] = struct2401.MdtrtCertType // 就诊凭证类型
+	inputData["mdtrt_cert_no"] = struct2401.MdtrtCertNo     // 就诊凭证编号
+	inputData["med_type"] = struct2401.MedType              // 就诊凭证编号
+	inputData["ipt_no"] = struct2401.IptNo                  // 住院/门诊号
+	inputData["medrcdno"] = ""
+	inputData["atddr_no"] = struct2401.AtddrNo
+	inputData["chfpdr_name"] = struct2401.ChfpdrName
+	inputData["adm_diag_dscr"] = struct2401.AdmDiagDscr
+	inputData["adm_dept_codg"] = struct2401.AdmDeptCodg
+	inputData["adm_dept_name"] = struct2401.AdmDeptName
+	inputData["adm_bed"] = struct2401.AdmBed
+	inputData["dscg_maindiag_code"] = struct2401.DscgMaindiagCode
+	inputData["dscg_maindiag_name"] = struct2401.DscgMaindiagName
+	inputData["main_cond_dscr"] = ""
+	inputData["dise_codg"] = struct2401.DiseCodg
+	inputData["dise_name"] = struct2401.DiseName
+	inputData["oprn_oprt_code"] = ""
+	inputData["oprn_oprt_name"] = ""
+	inputData["fpsc_no"] = ""
+	inputData["matn_type"] = ""
+	inputData["birctrl_type"] = ""
+	inputData["latechb_flag"] = ""
+	inputData["geso_val"] = ""
+	inputData["fetts"] = ""
+	inputData["fetus_cnt"] = ""
+	inputData["pret_flag"] = ""
+	inputData["birctrl_matn_date"] = ""
+	inputData["dise_type_code"] = ""
+
+	inputDataArr := make([]map[string]interface{}, 0)
+	for _, item := range struct2401.Diseinfo {
+		inputDataTwo := make(map[string]interface{})
+		inputDataTwo["psn_no"] = item.PsnNo
+		inputDataTwo["diag_type"] = item.DiagType
+		inputDataTwo["maindiag_flag"] = item.MaindiagFlag
+		inputDataTwo["diag_srt_no"] = item.DiagSrtNo
+		inputDataTwo["diag_code"] = item.DiagCode
+		inputDataTwo["diag_name"] = item.DiagName
+		inputDataTwo["adm_cond"] = ""
+		inputDataTwo["diag_dept"] = item.DiagDept
+		inputDataTwo["dise_dor_no"] = item.DiseDorNo
+		inputDataTwo["dise_dor_name"] = item.DiseDorName
+		inputDataTwo["diag_time"] = item.DiagTime
+		inputDataArr = append(inputDataArr, inputDataTwo)
+	}
+	input["mdtrtinfo"] = inputData
+	input["diseinfo"] = inputDataArr
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2401",  string(bytesData), json2)
+	out, err := cmd.Output()
+
+	//decoder := simplifiedchinese.GBK.NewDecoder()
+	//utf8Bytes, _ := decoder.Bytes([]byte(string(out)))
+	//fmt.Println(string(utf8Bytes)) // 输出：中文
+
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+
+	return   ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+}
+
+
+//住院撤销
+func Hbyb2404(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	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"] = "2404"   // 交易编码
+	inputData["mdtrt_id"] = mdtrt_id // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = psn_no     // 人员编号 （来自1101接口返回）
+	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(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2404", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+
+	//return string(out), string(bytesData)
+}
+
+//出院撤销
+func Hb2405(mdtrt_id string, psn_no string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+
+	// 生成输入报文
+	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"] = "2405"   // 交易编码
+	inputData["mdtrt_id"] = mdtrt_id // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = psn_no     // 人员编号 （来自1101接口返回）
+	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(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2405", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+
+	//return string(out), string(bytesData)
+}
+
+// 出院
+func Hb2402(struct2402 Struct2402, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) (string, string) {
+
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	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"] = "2402"               // 交易编码
+	inputData["mdtrt_id"] = struct2402.MdtrtId   // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = struct2402.PsnNo       // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = struct2402.Insutype  // 险种类型（来自1101接口返回）
+	inputData["endtime"] = struct2402.Endtime    // 结束时间
+	inputData["dise_codg"] = struct2402.DiseCode // 就诊凭证类型
+
+	inputData["dise_name"] = struct2402.DiseName // 就诊凭证类型
+	inputData["oprn_oprt_code"] = ""             // 就诊凭证类型
+	inputData["oprn_oprt_name"] = ""             // 就诊凭证类型
+	inputData["fpsc_no"] = ""                    // 就诊凭证类型
+
+	inputData["matn_type"] = ""    // 就诊凭证类型
+	inputData["birctrl_type"] = "" // 就诊凭证类型
+	inputData["latechb_flag"] = "" // 就诊凭证类型
+	inputData["geso_val"] = ""
+	inputData["fetts"] = ""
+	inputData["fetus_cnt"] = ""
+	inputData["pret_flag"] = ""
+	inputData["birctrl_matn_date"] = ""
+	inputData["cop_flag"] = ""
+
+	inputData["dscg_dept_codg"] = struct2402.DscgDeptCodg
+	inputData["dscg_dept_name"] = struct2402.DscgDeptName
+	inputData["dscg_bed"] = "待定"
+	inputData["dscg_way"] = struct2402.DscgWay
+	inputData["die_date"] = ""
+
+	inputDataArr := make([]map[string]interface{}, 0)
+	for _, item := range struct2402.Diseinfo {
+		inputDataTwo := make(map[string]interface{})
+		inputDataTwo["psn_no"] = item.PsnNo
+		inputDataTwo["mdtrt_id"] = item.MdtrtId
+		inputDataTwo["diag_type"] = item.DiagType
+		inputDataTwo["maindiag_flag"] = item.MaindiagFlag
+		inputDataTwo["diag_srt_no"] = item.DiagSrtNo
+		inputDataTwo["diag_code"] = item.DiagCode
+		inputDataTwo["diag_name"] = item.DiagName
+		inputDataTwo["diag_dept"] = item.DiagDept
+		inputDataTwo["dise_dor_no"] = item.DiseDorNo
+		inputDataTwo["dise_dor_name"] = item.DiseDorName
+		inputDataTwo["diag_time"] = item.DiagTime
+		inputDataArr = append(inputDataArr, inputDataTwo)
+	}
+
+	input["dscginfo"] = inputData
+	input["diseinfo"] = inputDataArr
+
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2402", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+
+	//return string(out), string(bytesData)
+}
+
+
+//  住院费用明细信息上传
+func Hb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, doctor_name string, doctor_number string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormat := tempTime.Format("20060102150405")
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//chrgBchno := rand.Intn(100000) + 10000
+
+	var customs []*models.NewCustom
+
+	customs = hisPrescription
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+	inputMessage["infno"] = "2301" // 交易编码
+
+	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+	for _, item := range customs {
+		org_id, _ := beego.AppConfig.Int64("org_id")
+		doctor_info, _ := GetAdminUserInfoByID(org_id, item.DoctorId)
+
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["feedetl_sn"] = item.FeedetlSn
+		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+		feedetailInfo["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+		feedetailInfo["med_type"] = med_type
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
+		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
+		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
+		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
+		feedetailInfo["cnt"] = item.Cut                              // 数量
+		feedetailInfo["pric"] = item.Price                           // 单价
+		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
+		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
+		feedetailInfo["bilg_dr_codg"] = doctor_info.DoctorNumber     // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = doctor_info.UserName
+		feedetailInfo["acord_dept_codg"] = dept_code               // 受单科室编码
+		feedetailInfo["acord_dept_name"] = dept                    // 受单科室名称
+		feedetailInfo["orders_dr_code"] = doctor_info.DoctorNumber // 受单医生编码
+		feedetailInfo["orders_dr_name"] = doctor_info.UserName     // 受单医生姓名
+		feedetailInfo["chrg_bchno"] = chrg_bchno                   // 收费批次号
+		feedetailInfo["dise_codg"] = ""                            // 病种编码
+		feedetailInfo["rxno"] = ""                                 // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"                        // 外购处方标志
+		feedetailInfo["sin_dos_dscr"] = ""                         // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""                       // 使用频次描述
+		feedetailInfo["prd_days"] = "0"                            // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""                        // 用药途径描述
+		// 开单医师姓名
+
+		if item.HospApprFlag != -1 {
+			if item.HospApprFlag == 1 {
+				feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
+			} else if item.HospApprFlag == 2 {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			} else if item.HospApprFlag == 3 {
+				feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+			} else {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			}
+		} else {
+			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+		}
+
+		//feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		feedetailInfo["etip_flag"] = ""        // 外检标志
+		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
+		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
+		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	input["feedetail"] = feedetail
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println("----------")
+	fmt.Println(string(bytesData))
+	fmt.Println("----------")
+	requestLog := string(bytesData)
+
+	if err != nil {
+		fmt.Println(err.Error())
+		return "", ""
+	}
+	reader := bytes.NewReader(bytesData)
+
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+	url := gdyb_url + "2301"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return "", ""
+	}
+
+	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 "", ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return "", ""
+	}
+	return string(respBytes), requestLog
+
+}
+func Hb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, opertor string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormat := tempTime.Format("20060102150405")
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//chrgBchno := rand.Intn(100000) + 10000
+
+	var customs []*models.NewCustom
+
+	customs = hisPrescription
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, opertor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+	inputMessage["infno"] = "2301" // 交易编码
+
+	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+	for _, item := range customs {
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["feedetl_sn"] = item.FeedetlSn
+		feedetailInfo["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+		feedetailInfo["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+		feedetailInfo["med_type"] = med_type
+
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
+		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
+		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
+		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
+		feedetailInfo["cnt"] = item.Cut                              // 数量
+		feedetailInfo["pric"] = item.Price                           // 单价
+		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
+		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
+		feedetailInfo["bilg_dr_codg"] = doctor_id                    // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = doctor
+		feedetailInfo["acord_dept_codg"] = dept_code // 受单科室编码
+		feedetailInfo["acord_dept_name"] = dept      // 受单科室名称
+		feedetailInfo["orders_dr_code"] = doctor_id  // 受单医生编码
+		feedetailInfo["orders_dr_name"] = doctor     // 受单医生姓名
+		feedetailInfo["chrg_bchno"] = chrg_bchno     // 收费批次号
+		feedetailInfo["dise_codg"] = ""              // 病种编码
+		feedetailInfo["rxno"] = ""                   // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"          // 外购处方标志
+		feedetailInfo["sin_dos_dscr"] = ""           // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""         // 使用频次描述
+		feedetailInfo["prd_days"] = "0"              // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""          // 用药途径描述
+		// 开单医师姓名
+
+		if item.HospApprFlag != -1 {
+			if item.HospApprFlag == 1 {
+				feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
+			} else if item.HospApprFlag == 2 {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			} else if item.HospApprFlag == 3 {
+				feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+			} else {
+				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+			}
+		} else {
+			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+		}
+
+		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		feedetailInfo["etip_flag"] = ""        // 外检标志
+		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
+		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
+		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	input["feedetail"] = feedetail
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2301", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	fmt.Println(string(out))
+	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+
+	//return string(out), string(bytesData)
+
+}
+//  住院费用明细信息撤销
+func Hb2302(psnNo string, mdtrtId string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, number string, refund_type int64) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	//inputData := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+
+	inputMessage["infno"] = "2302" // 交易编码
+	if refund_type == 1 {
+		inputData["feedetl_sn"] = number //
+
+	} else {
+		inputData["feedetl_sn"] = "0000" //
+	}
+
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID
+	inputData["psn_no"] = psnNo     // 人员编号
+	feedetail = append(feedetail,inputData)
+	input["data"] = feedetail
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2302", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+
+	//return string(out), string(bytesData)
+}
+func Hb2303(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, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	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"] = "2303" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		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["mdtrt_cert_sn"] = ""
+	inputData["mid_setl_flag"] = mid_setl_flag // 中途退费标志
+	inputData["medfee_sumamt"] = total         // 医疗费总额
+	inputData["psn_setlway"] = "02"            // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId            // 就诊 ID（来自2201接口返回）
+	inputData["acct_used_flag"] = "1"          // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype           // 险种类型
+	inputData["invono"] = ""                   // 发票号
+	inputData["dise_codg"] = "M07803"          // 发票号
+
+	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(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2303", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+
+	return string(out), string(bytesData)
+}
+//  住院结算
+func Hb2304(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, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, fapiao_number string, acct_used_flag string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	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"] = "2304" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else if id_card_type == 4 {
+
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	inputData["mdtrt_cert_sn"] = ""
+	inputData["mid_setl_flag"] = mid_setl_flag   // 中途退费标志
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+	inputData["invono"] = fapiao_number          // 发票号
+
+	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(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2304", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+
+	//return string(out), string(bytesData)
+}
+
+//  住院结算撤销
+func Hb2305(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) (string, string) {
+	// 生成签名
+	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"] = "2305" // 交易编码
+
+	inputData["psn_no"] = psnNo     // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_id"] = mdtrtId // 就诊 ID（来自2201接口返回）
+	inputData["setl_id"] = setlId   // 结算 ID
+
+	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(), ""
+	}
+	var json2 string
+	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2305", string(bytesData), json2)
+	out, err := cmd.Output()
+	if err != nil {
+		fmt.Println("error:", err.Error())
+	}
+	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+
+	//return string(out), string(bytesData)
+}

service/his_service.go

@@ -618,6 +618,7 @@ type HisOrder struct {
 	PrivatePrice            float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
 	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify                  int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	MedType                  int64   `gorm:"column:med_type" json:"med_type" form:"med_type"`
 	IsPre                   int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	SzChargeInfo            string  `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
 	SzProjectInfo           string  `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
@@ -626,6 +627,7 @@ type HisOrder struct {
 	OrgSetlNumber           string  `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
 	PayWays                 string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
 	OthDesc                 string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
+	SetlDetail              string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
@@ -1009,16 +1011,22 @@ func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype str
 	}
 	if len(clr_type) > 0 {
 		if mdtrtareaAdmvs == "150499" {
-			if clr_type == "11" {
+			if clr_type == "11"  {
 				db = db.Where("clr_type = ?", clr_type)
 			}
 
 		} else {
-			db = db.Where("clr_type = ?", clr_type)
 
+			db = db.Where("clr_type = ?", clr_type)
 		}
 	} else {
-		db = db.Where("clr_type <> ?", "9903")
+		if len(clr_type) == 0{
+			db = db.Where("clr_type = ?", "")
+
+		}else{
+			db = db.Where("clr_type = ?", "9903")
+
+		}
 
 	}
 	err = db.Find(&orders).Error
@@ -1053,6 +1061,22 @@ func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64) (orders
 	return
 }
 
+
+func GetOrderByTime11222(start_time int64, end_time int64, org_id int64) (orders []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ?", org_id, end_time, start_time)
+	err = db.Find(&orders).Error
+	return
+}
+
+func GetOrderByTimeFourfor11(start_time int64, end_time int64, org_id int64) (orders []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? and med_type = 11", org_id, end_time, start_time)
+	err = db.Find(&orders).Error
+	return
+}
+
+
 func GetOrderByTimeThree(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 UNIX_TIMESTAMP(setl_time) <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
 	return
@@ -1078,13 +1102,13 @@ func GetPatientByID(orgID int64, patientID int64) (*models.Patients, error) {
 
 func FindDiagnoseById(id int64) (models.HisXtDiagnoseConfig, error) {
 	dealer := models.HisXtDiagnoseConfig{}
-	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ?", id).First(&dealer).Error
+	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? and status = 1", id).First(&dealer).Error
 	return dealer, err
 }
 
 func FindDiagnoseByIdtwo(id string) (models.HisXtDiagnoseConfig, error) {
 	dealer := models.HisXtDiagnoseConfig{}
-	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ?", id).First(&dealer).Error
+	err := readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ? and status = 1", id).First(&dealer).Error
 	return dealer, err
 }
 
@@ -1152,7 +1176,7 @@ func GetPatientByNumber(number string, user_org_id int64) (patient Patients, err
 }
 
 func GetPatientByIDCard(id_card_no string, user_org_id int64) (patient Patients, err error) {
-	err = readDb.Model(&Patients{}).Where("id_card_no = ? AND user_org_id = ?", id_card_no, user_org_id).First(&patient).Error
+	err = readDb.Model(&Patients{}).Where("(health_care_no = ? or id_card_no = ?) AND user_org_id = ?", id_card_no, id_card_no, user_org_id).First(&patient).Error
 	return
 }
 
@@ -1344,6 +1368,12 @@ func UpdateHisPrescriptionHisIDTwo(his_patient_id int64, patient_id int64, recor
 	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0 AND order_status <> 2", record_time, start_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
 	return
 }
+func UpdateHisPrescriptionHisID1111(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
+	//XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	//XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
+	return
+}
+
 
 func GetHisPatientInfoList(org_id int64, patient_id int64, record_date int64) (info []*models.HisPatient, err 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).Find(&info).Error
@@ -1366,7 +1396,7 @@ func CreateUploadRecord(result *models.HisFundSettleListResult) (err error) {
 }
 
 func GetUploadRecord(order_id int64) (result models.HisFundSettleListResult, err error) {
-	err = readDb.Model(&models.HisFundSettleListResult{}).Where("order_id = ? AND status = 1", order_id).First(result).Error
+	err = readDb.Model(&models.HisFundSettleListResult{}).Where("order_id = ? AND status = 1", order_id).First(&result).Error
 	return
 }
 func UpdateRecord(result *models.HisFundSettleListResult) (err error) {
@@ -1512,19 +1542,18 @@ func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
 	fmt.Println(err)
 	return
 }
-
 func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> ''  AND setl_time >= '2023-06-01 00:00:00' AND setl_time <= '2023-06-30 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> ''  AND setl_time >= '2024-04-01 00:00:00' AND setl_time <= '2024-04-30 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
-func GetOrderError10138(org_id int64) (order []*models.HisOrderError, err error) {
-	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = 10139000", org_id).Find(&order).Error
+func GetOrderError10138() (order []*models.HisOrderError, err error) {
+	err = readDb.Model(&models.HisOrderError{}).Where("status = 1 AND stage = 10138500").Find(&order).Error
 	return
 }
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2023-06-01 00:00:00'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-01-01 00:00:00' AND setl_time <= '2024-03-31 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1658,3 +1687,29 @@ func GetNewHisPrescriptionTenone(org_id int64,number string) (prescription []*mo
 	return
 }
 
+func GetHisOrderByIDThree(start_time string) (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10265  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= ?",start_time).Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}
+
+
+
+func UpDatePrescriptionNumber111(user_org_id int64, start_time int64, end_time int64, number string,patient_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND record_date >= ? and record_date <= ? and patient_id = ? and order_status = 1", user_org_id, start_time,end_time,patient_id).Updates(map[string]interface{}{"batch_number": number, "mtime": time.Now().Unix()}).Error
+	return
+}
+func UpDatePrescriptionNumber222(user_org_id int64,id int64, number string,patient_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND id = ? and patient_id = ?", user_org_id, id,patient_id).Updates(map[string]interface{}{"batch_number": number, "mtime": time.Now().Unix()}).Error
+	return
+}
+
+
+
+
+
+func GetAllHisOrderTwo10485() (his []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10485  AND status = 1  AND  order_status = 2 AND setl_id <> '' AND  setl_time >= '2024-01-01 00:00:00' ").Order("setl_time asc").Find(&his).Error
+	fmt.Println(err)
+	return
+}

service/jsyb_service.go

@@ -294,7 +294,7 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 
 	}
 
-	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
+	inputData["ipt_otp_no"] = "11223333" // 住院/门诊号
 	inputData["atddr_no"] = doctor_id    // 医师编码
 	inputData["dr_name"] = doctor_name   // 医师姓名
 	inputData["dept_code"] = dept_code   // 科室编码
@@ -1040,11 +1040,11 @@ func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	inputMessage["infver"] = "1.0.0"                                                            // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
 	if fixmedins_code == "H32090403023" {
-		inputMessage["opter"] = "晁海燕"      // 经办人
-		inputMessage["opter_name"] = "晁海燕" // 经办人姓名
+		inputMessage["opter"] = doctor      // 经办人
+		inputMessage["opter_name"] = doctor // 经办人姓名
 	} else {
-		inputMessage["opter"] = "孙欣欣"      // 经办人
-		inputMessage["opter_name"] = "孙欣欣" // 经办人姓名
+		inputMessage["opter"] = doctor      // 经办人
+		inputMessage["opter_name"] = doctor // 经办人姓名
 	}
 	inputMessage["inf_time"] = timeFormatOne        // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code // 定点医药机构编号
@@ -2582,3 +2582,38 @@ func Jxyb3277(stmt_mon string, org_name string, doctor string, fixmedins_code st
 	request_url = request_url + "3277"
 	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "3277"), string(bytesData)
 }
+
+
+func Jsyb1318(code string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, cainfo string) (string, string) {
+	// 生成签名
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1318" // 交易编码
+	inputData["query_date"] =  ""
+	inputData["hilist_code"] =  code
+	inputData["hilist_lmtpric_type"] =  ""
+	inputData["overlmt_dspo_way"] =  ""
+	inputData["insu_admdvs"] =  ""
+	inputData["begndate"] =  ""
+	inputData["enddate"] =  ""
+	inputData["vali_flag"] =  ""
+	inputData["rid"] =  ""
+	inputData["tabname"] =  ""
+	inputData["poolarea_no"] =  ""
+	inputData["updt_time"] =  "2024-03-11"
+	inputData["page_num"] =  "1"
+	inputData["page_size"] =  "100"
+	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(), ""
+	}
+	request_url = request_url + "1318"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), string(bytesData)
+}

service/jx_service.go

@@ -14,10 +14,10 @@ import (
 )
 
 // 人员基本信息
-func Jxyb1101(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 string, request_url string, access_key string, cainfo string) (string, string) {
+func Jxyb1101(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 string, request_url string, access_key string, name string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, "")
 
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
@@ -34,8 +34,17 @@ func Jxyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 			inputData["card_sn"] = card_sn      // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
 			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 
-		} else {
+
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["card_sn"] = ""      // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = card_sn // 就诊凭证编号
+
+		}else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
@@ -43,9 +52,8 @@ func Jxyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 		}
 	}
 
-	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	inputData["begntime"] = ""          // 开始时间
-	inputData["psn_name"] = ""          // 人员姓名
+	inputData["psn_name"] = name          // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -173,7 +181,7 @@ func Jxyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 }
 
 // 门诊挂号
-func Jxyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string, verify_number string, cainfo string, card_sn string) (string, string) {
+func Jxyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string, verify_number string, cainfo string, card_sn string,psn_cert_type string,certno string,psn_type string,psn_name string) (string, string) {
 	fmt.Println(opera)
 
 	// 生成签名
@@ -208,6 +216,15 @@ func Jxyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 
 	}
 
+
+
+	inputData["card_sn"] = card_sn          // 发票号
+	inputData["psn_cert_type"] = psn_cert_type          // 发票号
+	inputData["certno"] = certno          // 发票号
+	inputData["psn_type"] = psn_type          // 发票号
+	inputData["psn_name"] = psn_name          // 发票号
+
+
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
 	inputData["atddr_no"] = doctor_id    // 医师编码
 	inputData["dr_name"] = doctor_name   // 医师姓名
@@ -383,7 +400,7 @@ func Jxyb2203A(psnNo string, mdtrtId string, doctor string, department string, o
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-	request_url = request_url + "2203A"
+	request_url = request_url + "2203"
 	//fmt.Println(HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)))
 
 	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2203"), requestLog
@@ -401,8 +418,7 @@ func Jxyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	var customs []*Custom
 	for _, item := range hisPrescription {
-		tm := time.Unix(item.PreTime, 0)
-
+		tm := time.Now()
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
@@ -690,7 +706,7 @@ func Jxyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊预结算
-func Jxyb2206Two(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, request_url string, access_key string, verify_number string, cainfo string, card_sn string) (string, string) {
+func Jxyb2206Two(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, request_url string, access_key string, verify_number string, cainfo string, card_sn string,psn_cert_type string,certno string,psn_type string,psn_name string) (string, string) {
 
 	// 生成签名
 	timestamp := time.Now().Unix() //		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
@@ -739,6 +755,14 @@ func Jxyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 	inputData["invono"] = ""            // 发票号
 	inputData["exp_content"] = ""       // 人员编号 （来自1101接口返回）
 
+
+	inputData["card_sn"] = card_sn          // 发票号
+	inputData["psn_cert_type"] = psn_cert_type          // 发票号
+	inputData["certno"] = certno          // 发票号
+	inputData["psn_type"] = psn_type          // 发票号
+	inputData["psn_name"] = psn_name          // 发票号
+
+
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -760,7 +784,7 @@ func Jxyb2206Two(psnNo string, mdtrtId string, chrgBchno string, certNo string,
 }
 
 //  门诊结算
-func Jxyb2207(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, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string) (string, string) {
+func Jxyb2207(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, acct_used_flag string, request_url string, access_key string, verify_number string, cainfo string,card_sn string,psn_cert_type string,certno string,psn_type string,psn_name string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -809,6 +833,17 @@ func Jxyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["preselfpay_amt"] = preselfpay_amt       //
 	inputData["inscp_scp_amt"] = inscp_scp_amt         //
 
+
+
+	inputData["card_sn"] = card_sn          // 发票号
+	inputData["psn_cert_type"] = psn_cert_type          // 发票号
+	inputData["certno"] = certno          // 发票号
+	inputData["psn_type"] = psn_type          // 发票号
+	inputData["psn_name"] = psn_name          // 发票号
+
+
+
+
 	inputData2 := make(map[string]interface{})
 	inputData2["trum_flag"] = ""
 	inputData2["rel_ttp_flag"] = ""
@@ -1158,6 +1193,14 @@ func Jxyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedi
 	inputData["insuplc_admdvs"] = insuplc_admdvs
 	inputData["mdtrtarea_admvs"] = mdtrtarea_admvs
 
+	inputData["card_sn"] = struct2401.Cardsn
+	inputData["psn_cert_type"] = struct2401.PsnCertType
+	inputData["certno"] = struct2401.Certno
+	inputData["psn_type"] = struct2401.PsnType
+	inputData["psn_name"] = struct2401.PsnName
+
+
+
 	inputDataArr := make([]map[string]interface{}, 0)
 	for _, item := range struct2401.Diseinfo {
 		inputDataTwo := make(map[string]interface{})
@@ -1508,7 +1551,7 @@ func Jxyb2302(psnNo string, mdtrtId string, refund_type int64, number string, se
 
 }
 
-func Jxyb2303(psnNo string, mdtrtId string, certNo string, insutype string, total string, certificates int64, id_card_type int64, mid_setl_flag string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
+func Jxyb2303(psnNo string, mdtrtId string, certNo string, insutype string, total string, certificates int64, id_card_type int64, mid_setl_flag string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string,card_sn string,psn_type int64,psn_cert_type string,certno string,psn_name string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1541,6 +1584,16 @@ func Jxyb2303(psnNo string, mdtrtId string, certNo string, insutype string, tota
 	inputData["invono"] = ""                   // 发票号
 	inputData["dise_codg"] = "M07803"          // 发票号
 
+	inputData["card_sn"] = card_sn          // 发票号
+	inputData["psn_cert_type"] = psn_cert_type          // 发票号
+	inputData["certno"] = certno          // 发票号
+	inputData["psn_type"] = psn_type          // 发票号
+	inputData["psn_name"] = psn_name          // 发票号
+
+
+
+
+
 	inputData["insuplc_admdvs"] = insuplc_admdvs   // 发票号
 	inputData["mdtrtarea_admvs"] = mdtrtarea_admvs // 发票号
 
@@ -1559,7 +1612,7 @@ func Jxyb2303(psnNo string, mdtrtId string, certNo string, insutype string, tota
 
 }
 
-func Jxyb2304(psnNo string, mdtrtId string, certNo string, insutype string, total string, certificates int64, id_card_type int64, mid_setl_flag string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string, fapiao_number string, acct_used_flag string) (string, string) {
+func Jxyb2304(psnNo string, mdtrtId string, certNo string, insutype string, total string, certificates int64, id_card_type int64, mid_setl_flag string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string, fapiao_number string, acct_used_flag string,card_sn string,psn_type string,psn_cert_type string,certno string,psn_name string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1598,6 +1651,13 @@ func Jxyb2304(psnNo string, mdtrtId string, certNo string, insutype string, tota
 	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype             // 险种类型
 
+	inputData["card_sn"] = card_sn          // 发票号
+	inputData["psn_cert_type"] = psn_cert_type          // 发票号
+	inputData["certno"] = certno          // 发票号
+	inputData["psn_type"] = psn_type          // 发票号
+	inputData["psn_name"] = psn_name          // 发票号
+
+
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -1613,6 +1673,69 @@ func Jxyb2304(psnNo string, mdtrtId string, certNo string, insutype string, tota
 	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2304"), requestLog
 
 }
+func Jxyb2304a(psnNo string, mdtrtId string, certNo string, insutype string, total string, certificates int64, id_card_type int64, mid_setl_flag string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string, fapiao_number string, acct_used_flag string,card_sn string,psn_type int64,psn_cert_type string,certno string,psn_name string) (string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	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"] = "2304" // 交易编码
+	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
+	if certificates == 3 {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		} else if id_card_type == 4 {
+
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+		}
+	}
+	inputData["insuplc_admdvs"] = insuplc_admdvs
+	inputData["mdtrtarea_admvs"] = mdtrtarea_admvs
+
+	inputData["mdtrt_cert_sn"] = ""
+	inputData["mid_setl_flag"] = mid_setl_flag   // 中途退费标志
+	inputData["medfee_sumamt"] = total           // 医疗费总额
+	inputData["psn_setlway"] = "01"              // 个人结算方式 01 按项目结 02 按定额结算
+	inputData["mdtrt_id"] = mdtrtId              // 就诊 ID（来自2201接口返回）
+	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype             // 险种类型
+
+	inputData["card_sn"] = card_sn          // 发票号
+	inputData["psn_cert_type"] = psn_cert_type          // 发票号
+	inputData["certno"] = certno          // 发票号
+	inputData["psn_type"] = psn_type          // 发票号
+	inputData["psn_name"] = psn_name          // 发票号
+
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog := string(bytesData)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request_url = request_url + "2304"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2304"), requestLog
+
+}
+
+
 func Jxyb2305(psnNo string, mdtrtId string, setlId string, secret_key string, org_name string, fixmedins_code string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, cainfo string, access_key string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
@@ -1715,14 +1838,10 @@ func SetJXInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	inputMessage["signtype"] = "SM3"                                                            // 签名类型
 	inputMessage["infver"] = "V1.0"                                                             // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
-	if fixmedins_code == "H32090403023" {
 
-		inputMessage["opter"] = "晁海燕"      // 经办人
-		inputMessage["opter_name"] = "晁海燕" // 经办人姓名
-	} else {
-		inputMessage["opter"] = doctor      // 经办人
-		inputMessage["opter_name"] = doctor // 经办人姓名
-	}
+	inputMessage["opter"] = doctor      // 经办人
+	inputMessage["opter_name"] = doctor // 经办人姓名
+
 	inputMessage["inf_time"] = timeFormatOne        // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code // 定点医药机构编号
 	inputMessage["fixmedins_name"] = org_name
@@ -1796,17 +1915,17 @@ func Jxyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2503"), string(bytesData)
 }
 
-func Jxyb3201(fixmedins_setl_cnt int64, acct_pay float64, fund_pay_sumamt float64, medfee_sumamt float64, stmt_begndate string, stmt_enddate string, setl_optins string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string, cainfo string) (string, string) {
+func Jxyb3201(fixmedins_setl_cnt int64,  stmt_begndate string, stmt_enddate string, clr_type string, insutype string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, request_url string, access_key string, secret_key string,medfee_sumamt string,fund_pay_sumamt string,acct_pay string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, "360399", "360399", "")
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3201"                       // 交易编码
 	inputData["insutype"] = insutype                     // 险种
 	inputData["clr_type"] = clr_type                     // 就诊 ID（来自2201接口返回）
-	inputData["setl_optins"] = setl_optins               // 结算经办机构
+	inputData["setl_optins"] = "360302"               // 结算经办机构
 	inputData["stmt_begndate"] = stmt_begndate           // 对帐开始时间
 	inputData["stmt_enddate"] = stmt_enddate             //对帐结束时间
 	inputData["medfee_sumamt"] = medfee_sumamt           //医疗费总额
@@ -2365,13 +2484,15 @@ func Jxyb4102(psn_no string, setl_id string, params models.PublicParams, stas_ty
 	// 生成输入报文
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
+	inputData2 := make(map[string]interface{})
+
 	inputMessage["infno"] = "4102" // 交易编码
 
 	inputData["setl_id"] = setl_id     // 结算 ID  必填
 	inputData["psn_no"] = psn_no       // 结算 ID  必填
 	inputData["stas_type"] = stas_type // 结算 ID  必填
-
-	input["data"] = inputData
+	inputData2["stastinfo"]  = inputData
+	input["data"] = inputData2
 	inputMessage["input"] = input //交易输入
 	bytesData, _ := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
@@ -2402,6 +2523,33 @@ func Jxyb4103(psn_no string, setl_id string, params models.PublicParams) (string
 
 }
 
+
+func Jxyb4105( params models.PublicParams) (string, string) {
+	var meds []string
+	meds = append(meds,"21")
+
+	timestamp := time.Now().Unix()
+	inputMessage := SetJXInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
+	// 生成输入报文
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "4105" // 交易编码
+
+	inputData["fixmedins_code"] = params.FixmedinsCode // 结算 ID  必填
+	inputData["medtype_list"] = meds // 结算 ID  必填
+	inputData["stt_begntime"] = "2023-11-01"// 结算 ID  必填
+	inputData["stt_endtime"] = "2023-11-31"// 结算 ID  必填
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, _ := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+
+	params.RequestUrl = params.RequestUrl + "4105"
+	return JXHttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp, string(bytesData), "4105"), string(bytesData)
+
+}
+
 func Jxyb3501(struct3501 models.Struct3501) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文

service/nm_service.go

@@ -364,7 +364,7 @@ func Nmyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	var customs []*Custom
 	for _, item := range hisPrescription {
-		tm := time.Unix(item.PreTime, 0)
+		tm := time.Now()
 
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {

service/zh_his_service.go

@@ -15,15 +15,27 @@ import (
 )
 
 // 人员基本信息
-func ZHGdyb1101(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, name string) (string, string, string) {
+func ZHGdyb1101(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, name string,admin_user_id int64) (string, string, string) {
 	//生成签名
 	var requestLog string
 	var resultLog string
+	//nonce := GetRandomString(32)
+	//timestamp := time.Now().UnixNano() / 1e6
+	//signature := setSignature(timestamp, nonce, secret_key)
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
+	inputMessage := make(map[string]interface{})
+
 	//生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	if   mdtrtarea_admvs == "450721"  ||  mdtrtarea_admvs == "450127"{
+
+		inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+	} else {
+		inputMessage = SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	}
+
+	//inputMessage := SetInputMessagenosign(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "1101" // 交易编码
@@ -75,6 +87,119 @@ func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code st
 	if mdtrtarea_admvs == "150499" {
 		url = gdyb_url
 	}
+	if mdtrtarea_admvs == "450721" || mdtrtarea_admvs == "450127" {
+		url = gdyb_url
+	}
+
+	//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)
+	resultLog = str
+	return str, requestLog, resultLog
+}
+
+func ZHGdyb1101d(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, name string,admin_user_id int64,token string) (string, string, string) {
+	//生成签名
+	var requestLog string
+	var resultLog string
+	//nonce := GetRandomString(32)
+	//timestamp := time.Now().UnixNano() / 1e6
+	//signature := setSignature(timestamp, nonce, secret_key)
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	inputMessage := make(map[string]interface{})
+
+	//生成输入报文
+	if   mdtrtarea_admvs == "450721"  ||  mdtrtarea_admvs == "450127"{
+
+		inputMessage = SetInputMessage1111(nonce, timestamp, org_name, admin_user_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs,doctor)
+	} else {
+		inputMessage = SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	}
+
+	//inputMessage := SetInputMessagenosign(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"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = token // 就诊凭证编号
+
+
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = token // 就诊凭证编号
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
+		}
+	}
+
+	inputData["begntime"] = ""          // 开始时间
+	inputData["psn_name"] = name        // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	requestLog = 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"
+	if mdtrtarea_admvs == "150499" {
+		url = gdyb_url
+	}
+	if mdtrtarea_admvs == "450721" || mdtrtarea_admvs == "450127" {
+		url = gdyb_url
+	}
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
 	request, err := http.NewRequest("POST", url, reader)
@@ -105,6 +230,9 @@ func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code st
 	resultLog = str
 	return str, requestLog, resultLog
 }
+
+
+
 func ZHGdyb1101C(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, name string) (string, string, string) {
 	//生成签名
 	var requestLog string
@@ -304,6 +432,11 @@ type Struct2401 struct {
 	Begntime         string
 	DiseCodg         string
 	DiseName         string
+	Cardsn string
+	PsnCertType string
+	Certno string
+	PsnType int64
+	PsnName string
 }
 
 // 住院登记
@@ -1225,6 +1358,7 @@ func ZHGdyb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, i
 
 	return str, str2
 }
+
 func Gdyb26011(psnNo string, omsgid string, oinfno string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1746,7 +1880,7 @@ func ZHyb4104(baseParams models.BaseParams, businessParams models.BusinessParams
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4104" // 交易编码
-	inputData["setl_ym"] = "202309"
+	inputData["setl_ym"] = "202306"
 	inputData["page_num"] = "1"
 	inputData["page_size"] = "100"
 	input["data"] = inputData