更新

conf/app.conf

@@ -51,9 +51,12 @@ sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 
-org_id = 9919
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_paasid = "sg02_prd"
+org_id = 10485
+#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+#gdyb_paasid = "sg02_prd"
+
+gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
+gdyb_paasid = test_hosp
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/js/jsyb_controller.go

@@ -10,8 +10,11 @@ import (
 	"gdyb/utils"
 	"github.com/astaxie/beego"
 	"github.com/axgle/mahonia"
+	"github.com/gorilla/websocket"
 	"golang.org/x/text/encoding/simplifiedchinese"
 	"io/ioutil"
+	"log"
+	"net/url"
 	"os"
 	"regexp"
 	"strconv"
@@ -119,7 +122,7 @@ func (c *JSybController) Get3261() {
 	url := c.GetString("url")
 	ak := c.GetString("ak")
 	cainfo := c.GetString("cainfo")
-	setl_mon := c.GetString("setl_mon")
+	setl_mon := c.GetString("month")
 	result, request := service.Jxyb3261(setl_mon, mdtrtarea_admvs, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, ak, secret_key, cainfo)
 	saveJsLog(result, request, "3261", "3261", org_name)
 	var dat2 map[string]interface{}
@@ -1777,11 +1780,9 @@ func (c *JSybController) ReadCard() {
 	case "4": //电子凭证
 		fmt.Println(operator_id)
 		fmt.Println(operator)
-		pCardInfo, pBusiCardInfo := c.GetELeCertInfo(fixmedins_code, operator_id, operator)
-		fmt.Println(pCardInfo)
+		_, pBusiCardInfo := c.GetELeCertInfoTwo(fixmedins_code, operator_id, operator)
 		fmt.Println(pBusiCardInfo)
 		pBusiCardInfo = Remove0000(pBusiCardInfo)
-		pCardInfo = Remove0000(pCardInfo)
 		var ele ELeCertData
 		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
 		if err != nil {
@@ -1806,7 +1807,7 @@ func (c *JSybController) ReadCard() {
 			}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"status":         "0",
-				"card_info":      pCardInfo,
+				"card_info":      "",
 				"busi_card_info": pBusiCardInfo,
 				"token":          token,
 				"result":         dat,
@@ -1951,6 +1952,54 @@ func (c *JSybController) GetELeCertInfo(code string, operator_id string, operato
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030)
 }
 
+func (c *JSybController) GetELeCertInfoTwo(code string, operator_id string, operator_name 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["businessType"] = "01101"
+	inputData["operatorId"] = operator_id
+	inputData["operatorName"] = operator_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透室"
+	inputData["deviceType"] = ""
+	input["data"] = inputData
+	input["orgId"] = code
+	input["transType"] = "ec.query"
+	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 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

@@ -53,13 +53,17 @@ func NmybRegistRouters() {
 
 	beego.Router("/nmyb/2201", &NmController{}, "get:Post2201")
 	beego.Router("/nmyb/2202", &NmController{}, "get:Post2202")
-	beego.Router("/nmyb/2203", &NmController{}, "get:Post2203")
-	beego.Router("/nmyb/2204", &NmController{}, "get:Post2204")
+	beego.Router("/nmyb/2203", &NmController{}, "post:Post2203")
+	beego.Router("/nmyb/2203C", &NmController{}, "post:Post2203C")
+
+	beego.Router("/nmyb/2204", &NmController{}, "post:Post2204")
 	beego.Router("/nmyb/2205", &NmController{}, "get:Post2205")
 	beego.Router("/nmyb/2206", &NmController{}, "get:Post2206")
 	beego.Router("/nmyb/2207", &NmController{}, "get:Post2207")
 	beego.Router("/nmyb/2208", &NmController{}, "get:Post2208")
 
+	beego.Router("/nmyb/2503", &NmController{}, "get:Post2503")
+
 }
 
 func (c *NmController) Post2201() {
@@ -67,7 +71,6 @@ func (c *NmController) Post2201() {
 	insutype := c.GetString("insutype")
 	certNo := c.GetString("cert_no")
 	org_name := c.GetString("org_name")
-	doctor := c.GetString("doctor")
 	ipt_otp_no := c.GetString("ipt_otp_no")
 	dept := c.GetString("dept")
 	verify_number := c.GetString("verify_number")
@@ -80,7 +83,9 @@ func (c *NmController) Post2201() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	doctor_name := c.GetString("doctor_name")
 	cainfo := c.GetString("cainfo")
-	result, request_log := service.Nmyb2201(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, doctor_name, url, verify_number, cainfo)
+	opter := c.GetString("opter")
+
+	result, request_log := service.Nmyb2201(psnNo, insutype, certNo, org_name, opter, ipt_otp_no, dept, fixmedins_code, dept_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, doctor_name, verify_number, cainfo)
 	saveJsLog(result, request_log, "2201", "挂号", org_name)
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
@@ -180,18 +185,73 @@ func (c *NmController) Post2203() {
 
 	}
 
-	var dat3 int64
-	if err := json.Unmarshal([]byte(strconv.FormatInt(timeStamp, 10)), &dat3); err == nil {
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre":         dat,
+		"request_log": dat2,
+	})
+}
+func (c *NmController) Post2203C() {
+
+	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)
+	cainfo := respJSON["cainfo"].(string)
+	//is_vaild := respJSON["is_vaild"].(string)
+
+	//cainfo := c.GetString("cainfo")
+
+	result, request_log := service.Nmyb2203C(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, cainfo)
+	saveJsLog(result, request_log, "2203", "上传就诊信息", 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,
-		"time_stamp":  dat3,
 	})
 }
+
 func (c *NmController) Post2204() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -403,6 +463,37 @@ func (c *NmController) Post2208() {
 		"request_log": dat2,
 	})
 }
+func (c *NmController) Post2503() {
+	psnNo := c.GetString("psn_no")
+	insutype := c.GetString("insutype")
+	opera := c.GetString("opera")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+	doctor_id := c.GetString("doctor_id")
+	secret_key := c.GetString("secret_key")
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	sick_name := c.GetString("sick_name")
+	sick_code := c.GetString("sick_code")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	check_time := c.GetString("check_time")
+	hospital_name := c.GetString("hospital_name")
+	hospital_code := c.GetString("hospital_code")
+
+	result := service.Nmyb2503(psnNo, insutype, org_name, opera, doctor, fixmedins_code, doctor_id, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_name, sick_code, start_time, end_time, check_time, hospital_code, hospital_name)
+
+	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 *NmController) GetNewELeInfo() {
 	token := c.GetString("token")
@@ -1460,7 +1551,7 @@ func (c *NmController) GetELeInfo(code string, operator_id string, operator_name
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputData["orgId"] = code
-	inputData["businessType"] = "01103"
+	inputData["businessType"] = "01101"
 	inputData["operatorId"] = operator_id
 	inputData["operatorName"] = operator_name
 	inputData["officeId"] = "001"

controllers/zh/zh_his_api_controller.go

@@ -566,7 +566,80 @@ func ZHHisManagerApiRegistRouters() {
 
 	beego.Router("/api/cardstatus", &ZHHisApiController{}, "get:GetCardStatus")
 
+	//beego.Router("/api/2403", &ZHHisApiController{}, "get:Get2403")
+	beego.Router("/api/5201", &ZHHisApiController{}, "get:Get5201")
+
+}
+func (c *ZHHisApiController) Get5201() {
+
 }
+
+//func (c *ZHHisApiController) Get2403(){
+//	id, _ := c.GetInt64("order_id")
+//	order,_ := service.GetHisOrderByID(id)
+//	hosp,_ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+//
+//
+//	med_type := "21"
+//	id_card_type := hosp.IdCardType
+//
+//
+//
+//	diagnosis_ids_arr := strings.Split(hosp.Diagnosis, "-")
+//	adminInfo := c.GetAdminUserInfo()
+//	var patient service.Patients
+//	if id == 0 {
+//		patient, _ = service.GetPatientByIDCard(order.Certno, adminInfo.CurrentOrgId)
+//	} else {
+//		patient, _ = service.GetPatientByIDTwo(adminInfo.CurrentOrgId, id)
+//	}
+//	diagnosisConfig, _ := service.FindDiagnoseByIds(diagnosis_ids_arr)
+//
+//	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, hosp.Doctor)
+//	//deviceNumber, _ := service.GetDeviceNumberByID(adm_bed, adminInfo.CurrentOrgId)
+//	departmentInfo, _ := service.GetDepartMentDetail(hosp.Departments)
+//
+//
+//
+//
+//	var struct2401 service.Struct2401
+//	struct2401.Insutype = "390"
+//	psn_info, _ := service.GetPsnByPatientId(patient.ID)
+//	if id_card_type == 1 {
+//		struct2401.MdtrtCertType = "03"
+//		bas := strings.Split(psn_info.CardInfo, "|")
+//		cardNumber := bas[2]
+//		struct2401.MdtrtCertNo = cardNumber
+//		struct2401.PsnNo = order.PsnNo
+//	} else if id_card_type == 4 {
+//		struct2401.MdtrtCertType = "01"
+//		struct2401.MdtrtCertNo = psn_info.VerifyNumber
+//		struct2401.PsnNo = psn_info.PsnNo
+//	} else {
+//		struct2401.MdtrtCertType = "02"
+//		struct2401.MdtrtCertNo = hosp.Certno
+//		struct2401.PsnNo = hosp.PsnNo
+//	}
+//
+//	struct2401.IptNo = "2023061415103410808113442"
+//	struct2401.AtddrNo = doctorInfo.DoctorNumber
+//	struct2401.ChfpdrName = doctorInfo.UserName
+//	struct2401.AdmDiagDscr = diagnosisConfig[0].ClassName
+//	struct2401.AdmDeptCodg = strconv.FormatInt(int64(departmentInfo.ID), 10)
+//	struct2401.AdmDeptName = departmentInfo.Name
+//	struct2401.AdmBed = ""
+//	struct2401.AdmBed = "待定"
+//
+//	struct2401.DscgMaindiagName = diagnosisConfig[0].ClassName
+//	struct2401.DscgMaindiagCode = diagnosisConfig[0].CountryCode
+//	struct2401.Begntime = "2023"
+//	struct2401.DiseCodg = sickConfig.CountryCode
+//	struct2401.DiseName = sickConfig.ClassName
+//
+//
+//
+//
+//}
 func (c *ZHHisApiController) GetCardStatus() {
 	//patient_id, _ := c.GetInt64("patient_id")
 	//record_date, _ := c.GetInt64("record_date")
@@ -1417,6 +1490,28 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 		if len(insutypes) == 0 {
 			insutype = "310"
 		}
+
+		Iinfos, _ := json.Marshal(res.Output.Iinfo)
+		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+		infoStr := string(Iinfos)
+		idetinfoStr := string(Idetinfos)
+		psn := &models.HisPsn{
+			PsnNo:        res.Output.Baseinfo.PsnNo,
+			Age:          res.Output.Baseinfo.Age,
+			PatientId:    patient.ID,
+			Certno:       res.Output.Baseinfo.Certno,
+			Brdy:         res.Output.Baseinfo.Brdy,
+			Gend:         res.Output.Baseinfo.Gend,
+			Naty:         res.Output.Baseinfo.Naty,
+			PsnCertType:  res.Output.Baseinfo.PsnCertType,
+			PsnName:      res.Output.Baseinfo.PsnName,
+			Idetinfo:     idetinfoStr,
+			Insuinfo:     infoStr,
+			UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+			VerifyNumber: "",
+		}
+		service.CreateHisPsn(psn)
+
 		if res.Infcode != 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"failed_code": -10,
@@ -1815,6 +1910,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		} else if miConfig.MdtrtareaAdmvs == "360399" {
 
 			result, request_log = service.Jxyb2401(struct2401, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.Url, "", miConfig.AccessKey)
+
 			saveLog(result, request_log, "2401", "入院登记")
 
 		} else {

enums/error_code.go

@@ -262,6 +262,8 @@ const ( // ErrorCode
 
 	ErrorCodeHisPatientNoRegException = 4000000
 	ErrorCodeCreateOrderExceptionT    = 200680000
+
+	ErrorPsnNoEmpty = 310000
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -504,6 +506,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
 
 	ErrorCodeCreateOrderExceptionT: "记账失败",
+
+	ErrorPsnNoEmpty: "人员编码不能为空",
 }
 
 type SGJError struct {

models/his_models.go

@@ -1349,6 +1349,7 @@ type HisPsn struct {
 	Stage         string  `gorm:"column:stage" json:"stage" form:"stage"`
 	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"`
 }
 
 func (HisPsn) TableName() string {

models/zb_his_models.go

@@ -9,4 +9,5 @@ type Reg struct {
 	RegFee      string
 	TreatFee    string
 	OperatorId  string
+	IdCardNo    string
 }

routers/router.go

@@ -32,6 +32,6 @@ func init() {
 	zh.ZHHisManagerApiRegistRouters()
 	js.JSybRegistRouters()
 	nm.NmybRegistRouters()
-	coordinate.CoordinateRegistRouters()
+	coordinate.CoordinateRcegistRouters()
 
 }

service/coordinate_service.go

@@ -11,21 +11,296 @@ import (
 	"time"
 )
 
-func UpdateHisPatientStatusTwo(his *models.VMHisPatient) {
+func SavePatientMessageInfo() (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["patType"] = "1"                  // 就诊凭证编号
+	inputData["patIdNo"] = "440510199211080038" // 开始时间
+	inputData["patName"] = "测试患者4 "             // 人员姓名
+
+	inputData["patMobile"] = "13535547902" // 人员姓名
+	inputData["patSex"] = "M"              // 人员姓名
+	inputData["patMarriage"] = "1"         // 人员姓名
+	inputData["birthday"] = "1992-10-23"   // 人员姓名
+	inputData["patAddress"] = "11111"      // 人员姓名
+	inputData["thirdPartyID"] = "6936"     // 人员姓名
+	inputData["patAge"] = "30"             // 人员姓名
+	//input["req"] = inputData
+
+	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://218.104.146.179:9091/esb/listener/savePatientMessageInfo"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("GET", 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("code", "Xmrjyy")
+
+	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 SaveReg(reg models.Reg) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["deptId"] = reg.DeptId
+	inputData["clinicUnitId"] = ""
+	inputData["healthCardNo"] = ""
+	fmt.Println(reg.PatientId)
+	inputData["patientId"] = reg.PatientId
+	inputData["patientName"] = reg.PatientName
+	inputData["idCardNo"] = reg.IdCardNo
+	inputData["phone"] = ""
+	inputData["doctorId"] = ""
+	inputData["doctorLevelCode"] = ""
+	inputData["regDate"] = reg.RegDate
+
+	inputData["shiftCode"] = ""
+	inputData["startTime"] = ""
+	inputData["endTime"] = ""
+
+	inputData["scheduleId"] = ""
+	inputData["periodId"] = ""
+
+	inputData["svObjectId"] = ""
+	inputData["diseaseId"] = ""
+	inputData["regFee"] = reg.RegFee
+
+	inputData["treatFee"] = reg.TreatFee
+	inputData["operatorId"] = reg.OperatorId
+	inputData["remark"] = "血透"
+
+	inputData["orderType"] = "0"
+	inputData["clinicCode"] = ""
+	inputData["infoSeq"] = ""
+
+	//input["Request"] = inputData
+
+	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://218.104.146.179:9091/esb/listener/saveReg"
+	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("code", "Xmrjyy")
+
+	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 GetWaitPayDetail() (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["clinicSeq"] = "30445"              // 就诊凭证编号
+	inputData["prescriptionId"] = ""              // 开始时间
+	inputData["patientId"] = "701822660170096645" // 人员姓名
+
+	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://218.104.146.179:9091/esb/listener/getWaitPayDetail"
+	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("code", "Xmrjyy")
+
+	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 OpKeepAccounts(number string, cus []*models.NewCustomTwo) (string, string) {
+
+	inputData := make(map[string]interface{})
+	feedetail := make([]map[string]interface{}, 0)
+	for _, item := range cus {
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["itemCode"] = item.MedListCodg
+		feedetailInfo["num"] = item.Cut
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	inputData["item"] = feedetail
+	inputData["clinicSeq"] = number // 就诊凭证编号
+	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://218.104.146.179:9091/esb/listener/opKeepAccounts"
+	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("code", "Xmrjyy")
+
+	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 OpCancelKeepAccounts(setl_id string, op_name string, op_code string) (string, string) {
+	inputData := make(map[string]interface{})
+	inputData["docId"] = setl_id
+	inputData["operCode"] = "111"
+	inputData["operName"] = "2222"
+	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://218.104.146.179:9091/esb/listener/opCancelKeepAccounts"
+	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("code", "Xmrjyy")
+	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 UpdateHisPatientStatusten(his *models.VMHisPatient) {
 	writeDb.Save(&his)
 }
 
-func GetUnSettleHisPrescriptionFiveTen(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("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "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")
-		}).
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
+	}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 and order_status <> 5  AND p_type = ?", org_id, record_date, patient_id, p_type).
 		Find(&prescription).Error
 	return
@@ -121,7 +396,7 @@ func UploadPrescriptionForCoordinate(info models.UploadInfo) (string, string) {
 	for _, item := range info.PresInfo {
 		inputDataPresInfo := make(map[string]interface{})
 		inputDataPresInfo["cbm06"] = item.Cbm06
-		inputDataPresInfo["cbm07"] = item.Cbm07
+		inputDataPresInfo["cbm07"] = item.Cbm06
 		inputDataPresInfo["cbmid"] = item.Cbmid
 		presDetails := make([]map[string]interface{}, 0)
 
@@ -291,7 +566,7 @@ func UploadPrescriptionForCoordinateHospital(info models.UploadInfo) (string, st
 	}
 	reader := bytes.NewReader(bytesData)
 	var url string
-	gdyb_url := "http://218.104.146.179:90911/esb/listener/saveOrdInfoIp"
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/saveOrdInfoIp"
 	url = gdyb_url
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -326,151 +601,45 @@ func UpDatePrescriptionNumberForCoordinate(user_org_id int64, ids []int64, numbe
 	return
 }
 
-func GetDrugInfo(bbx01 string) (string, string) {
-
-	//input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputData["bbx01"] = bbx01 // 就诊凭证编号
-	inputData["name"] = ""     // 就诊凭证编号
-
-	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://218.104.146.179:9091/esb/listener/getGrug"
-	url = gdyb_url
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
-	request, err := http.NewRequest("GET", 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("code", "Xmrjyy")
-
-	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 GetGoodInfo(bbx01 string) (string, string) {
-
-	//input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
-	inputData["bbx01"] = bbx01 // 就诊凭证编号
-	inputData["name"] = ""     // 就诊凭证编号
-
-	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://218.104.146.179:9091/esb/listener/getMaterial"
-	url = gdyb_url
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
-	request, err := http.NewRequest("GET", 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("code", "Xmrjyy")
-
-	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 FindPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date int64, p_type int64) (info models.HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).First(&info).Error
 	return
 
 }
 
-func FindLastPatientPrescriptionInfoTwoTen(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ?", org_id, record_date, patient_id).Order("record_date desc").First(&info).Error
+func GetExecutionFrequencyByName(name string, org_id int64) (ef models.ExecutionFrequencyDic, err error) {
+	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("org_id = ? AND name = ?", org_id, name).First(&ef).Error
 	return
 }
-
-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("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("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
-		}).
-		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
-		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ? AND order_status <> 3  AND order_status <> 2  ", org_id)
-	}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3 and order_status <> 5  AND p_type = ?", org_id, record_date, patient_id, p_type).
-		Find(&prescription).Error
-	return
+func UpdataHisPateintTwo(his *models.VMHisPatient) {
+	writeDb.Save(&his)
 }
 
-func UpdataHisPateintTwoTen(his *models.VMHisPatient) {
+func UpdataHisPateintThree(his *models.HisPatient) {
 	writeDb.Save(&his)
 }
 
-func UpDateHisPrescriptionInfoNumberTen(user_org_id int64, id int64, number string, record_time int64, his_patient_id int64) (err error) {
+func UpDateHisPrescriptionInfoNumbertwo(user_org_id int64, id int64, number string, record_time int64, his_patient_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND his_patient_id = ? AND record_date = ?", user_org_id, his_patient_id, record_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 3, "mtime": time.Now().Unix()}).Error
 
 	return
 }
 
-func UpdataOrderStatusThreeTen(number string, user_org_id int64) (err error) {
+func UpdataOrderStatusThreef(number string, user_org_id int64) (err 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": 5, "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": 5, "mtime": time.Now().Unix()}).Error
 	return
 }
 
-func GetExecutionFrequencyByName(name string, org_id int64) (ef models.ExecutionFrequencyDic, err error) {
-	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("(org_id = ? OR org_id = 0) AND name = ?", org_id, name).First(&ef).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.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
 }
 
-func GetWayInfoByName(name string, org_id int64) (ef models.HisProject, err error) {
-	err = readDb.Model(&models.HisProject{}).Where("user_org_id = ? AND project_name = ? AND status= 1 AND cost_classify = 100", org_id, name).First(&ef).Error
-	return
+func GetHisPatientByIdThree(id int64) (models.HisPatient, error) {
+	patient := models.HisPatient{}
+	err := XTReadDB().Model(&patient).Where("id = ? and status = 1", id).First(&patient).Error
+	return patient, err
 }

service/gdyb_service.go

@@ -3698,6 +3698,7 @@ func setSignature(timestamp int64, nonce string, secret_key string) string {
 	fmt.Println(nonce)
 	fmt.Println(secret_key)
 	fmt.Println(strconv.FormatInt(timestamp, 10))
+	fmt.Println(time.Now().UnixNano() / 1e6)
 
 	str := strconv.FormatInt(timestamp, 10) + secret_key + nonce + strconv.FormatInt(timestamp, 10)
 	hash := sha256.New()
@@ -4960,20 +4961,20 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 			}
 
 		}
-		for _, item := range result3260.Output.Data[start-1 : stop] {
-			if item.MdtrtId == "out20230418732788" {
-				feedetailInfo := make(map[string]interface{})
-				feedetailInfo["certno"] = item.Certno
-				feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
-				feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
-				feedetailInfo["setl_sn"] = item.SetlSn                    // 收费批次号
-				feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
-				feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
-				feedetailInfo["cnfm_flag"] = "0"                          // 处方号
-				feedetail = append(feedetail, feedetailInfo)
-			}
-
-		}
+		//for _, item := range result3260.Output.Data[start-1 : stop] {
+		//	if item.MdtrtId == "out20230418732788" {
+		//		feedetailInfo := make(map[string]interface{})
+		//		feedetailInfo["certno"] = item.Certno
+		//		feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+		//		feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+		//		feedetailInfo["setl_sn"] = item.SetlSn                    // 收费批次号
+		//		feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+		//		feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+		//		feedetailInfo["cnfm_flag"] = "0"                          // 处方号
+		//		feedetail = append(feedetail, feedetailInfo)
+		//	}
+		//
+		//}
 		//for _, item := range result3260.Output.Data[start-1 : stop] {
 		//	if item.SetlSn == "420100G9000712542625" {
 		//		feedetailInfo := make(map[string]interface{})
@@ -4989,7 +4990,7 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 		//
 		//}
 
-		inputData["totalrow"] = 180 // 人员姓名
+		inputData["totalrow"] = 174 // 人员姓名
 
 		// 创建一个新的 Excel 文件
 		//f := excelize.NewFile()
@@ -5081,7 +5082,7 @@ func Gdyb3262(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	inputMessage["infno"] = "3262" // 交易编码
 
 	inputData["trt_year"] = year  // 就诊凭证编号
-	inputData["trt_month"] = "06" // 开始时间
+	inputData["trt_month"] = "07" // 开始时间
 	inputData["otransid"] = "0"   // 开始时间
 
 	input["data"] = inputData

service/his_service.go

@@ -1485,7 +1485,7 @@ func GetAllHisOrderTwo(org_id int64) (his []*models.HisOrder, err error) {
 }
 
 func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-06-01 00:00:00' AND setl_time <= '2023-06-30 23:59:00'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2023-07-01 00:00:00' AND setl_time <= '2023-07-31 23:59:00'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1592,13 +1592,18 @@ func GetHisPrescriptionForMedType(org_id int64, patient_id int64, record_date in
 	return
 }
 
-func GetOrderByTimeTen(start_time string, end_time string, org_id int64) (orders []models.FixMonRecDetailFileIn, err error) {
-	err = readDb.Raw("SELECT CONCAT(insutype, '99', med_type, '555555') AS fund_key, insutype, '99' as `psn_type` , `med_type`, COUNT(DISTINCT `certno`) AS psn_cnt, count(*) as psn_time, sum(medfee_sumamt) as sumamt, sum(inscp_scp_amt) as amt, sum(fund_pay_sumamt) as fund FROM his_order where user_org_id = ? and status = 1 and order_status = 2 and setl_time >= ? and setl_time <= ? GROUP BY fund_key", org_id, start_time+" 00:00:00", end_time+" 23:00:00").Scan(&orders).Error
+func GetOrderByTimeTen(start_time string, end_time string, org_id int64) (orders []*models.FixMonRecDetailFileIn, err error) {
+	err = readDb.Raw("select CASE WHEN p.`insuplc_admdvs` LIKE '%3209%' THEN CONCAT(his_order.insutype, '99', his_order.med_type, '555555')  ELSE CONCAT(his_order.insutype, '99', his_order.med_type, '888888') END AS fund_key, his_order.insutype, '99' as `psn_type` , his_order.`med_type`, COUNT(DISTINCT his_order.`certno`) AS psn_cnt, count(*) as psn_time, sum(his_order.medfee_sumamt) as sumamt, sum(his_order.inscp_scp_amt) as amt, sum(his_order.fund_pay_sumamt) + sum(his_order.acct_pay)  as fund FROM his_order join his_patient p on p.number =  his_order.mdtrt_id where his_order.user_org_id = ? and his_order.status = 1 and his_order.order_status = 2 and his_order.setl_time >= ? and his_order.setl_time <= ? and his_order.setl_id <> '' GROUP BY fund_key", org_id, start_time+" 00:00:00", end_time+" 23:00:00").Scan(&orders).Error
+	return
+}
+
+func GetOrderByTimeTentwo(start_time string, end_time string, org_id int64) (orders []*models.FixMonRecDetailFileIn, err error) {
+	err = readDb.Raw("select CASE WHEN p.`insuplc_admdvs` LIKE '%3209%' THEN CONCAT(his_order.insutype, '99', his_order.med_type, '555555')  ELSE CONCAT(his_order.insutype, '99', his_order.med_type, '888888') END AS fund_key, his_order.insutype, '99' as `psn_type` , his_order.`med_type`, COUNT(DISTINCT his_order.`certno`) AS psn_cnt, count(*) as psn_time, sum(his_order.medfee_sumamt) as sumamt, sum(his_order.inscp_scp_amt) as amt, sum(his_order.fund_pay_sumamt) + sum(his_order.acct_pay)  as fund FROM his_order join his_patient p on p.number =  his_order.mdtrt_id where his_order.user_org_id = ? and his_order.status = 0 and his_order.order_status = 3 and his_order.setl_time >= ? and his_order.setl_time <= ? and his_order.setl_id <> '' GROUP BY fund_key", org_id, start_time+" 00:00:00", end_time+" 23:00:00").Scan(&orders).Error
 	return
 }
 
 func GetOrderDetailByTimeTen(start_time string, end_time string, org_id int64, fund_key string) (fund []models.FundDetail, err error) {
-	err = readDb.Raw("SELECT CONCAT(insutype, '99', med_type, '555555') as fund_key,  `setl_detail`  FROM his_order where user_org_id = ? and status = 1 and order_status = 2 and setl_time >= ? and setl_time <= ?  and CONCAT(insutype, '99', med_type, '555555')  = ?", org_id, start_time+" 00:00:00", end_time+" 23:59:00", fund_key).Scan(&fund).Error
+	err = readDb.Raw("SELECT CASE WHEN p.`insuplc_admdvs` LIKE '%3209%' THEN CONCAT(his_order.insutype, '99', his_order.med_type, '555555')  ELSE CONCAT(his_order.insutype, '99', his_order.med_type, '888888') end AS fund_key, his_order.`setl_detail`  FROM his_order  join his_patient p on p.number =  his_order.mdtrt_id   where his_order.user_org_id = ? and his_order.status = 1 and his_order.order_status = 2 and his_order.setl_time >= ? and his_order.setl_time <= ?  and CONCAT(his_order.insutype, '99', his_order.med_type, '555555')  = ?", org_id, start_time+" 00:00:00", end_time+" 23:59:00", fund_key).Scan(&fund).Error
 	return
 }
 

service/jsyb_service.go

@@ -2079,8 +2079,8 @@ func Jxyb3262(setl_mon, org_name string, doctor string, fixmedins_code string, i
 		fixMonRecDetailFileIn["insutype"] = item.Insutype
 		fixMonRecDetailFileIn["psn_type"] = item.PsnType
 		fixMonRecDetailFileIn["med_type"] = item.MedType
-		fixMonRecDetailFileIn["fix_blng_admdvs"] = mdtrtarea_admvs
-		fixMonRecDetailFileIn["insu_admdvs"] = insuplc_admdvs
+		fixMonRecDetailFileIn["fix_blng_admdvs"] = item.FixBlngAdmdvs
+		fixMonRecDetailFileIn["insu_admdvs"] = item.InsuAdmdvs
 		fixMonRecDetailFileIn["psn_time"] = item.PsnTime
 		fixMonRecDetailFileIn["psn_cnt"] = item.PsnCnt
 		fixMonRecDetailFileIn["medfee_sumamt"] = item.MedfeeSumAmt
@@ -2094,8 +2094,6 @@ func Jxyb3262(setl_mon, org_name string, doctor string, fixmedins_code string, i
 		fund["fund_key"] = item.FundKey
 		fund["fix_blng_admdvs"] = item.FixBlngAdmdvs
 		fund["insu_admdvs"] = item.InsuAdmdvs
-		fund["fix_blng_admdvs"] = item.FixBlngAdmdvs
-		fund["insu_admdvs"] = item.InsuAdmdvs
 		fund["fund_code"] = item.FundCode
 		fund["fund_name"] = item.FundName
 		fund["fund_amt"] = item.FundAmt

service/jx_service.go

@@ -1012,6 +1012,53 @@ func Jxyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 
 	return JXHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData), "5203"), string(bytesData)
 }
+func Jxyb5202(baseParams models.BaseParams, businessParams models.BusinessParams) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "5202" // 交易编码
+	inputData["psn_no"] = businessParams.PsnNo
+	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(), ""
+	}
+	baseParams.RequestUrl = baseParams.RequestUrl + "5202"
+	//fmt.Println(JXHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData)))
+
+	return JXHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData), "5202"), string(bytesData)
+}
+func Jxyb5201(baseParams models.BaseParams, businessParams models.BusinessParams) (string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "5201" // 交易编码
+	inputData["psn_no"] = businessParams.PsnNo
+	inputData["begntime"] = "2023-06-01"
+	inputData["endtime"] = "2023-07-30"
+	inputData["med_type"] = "21"
+	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(), ""
+	}
+	baseParams.RequestUrl = baseParams.RequestUrl + "5201"
+	//fmt.Println(JXHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData)))
+
+	return JXHttpRequest(baseParams.RequestUrl, baseParams.AccessKey, baseParams.SecretKey, timestamp, string(bytesData), "5201"), string(bytesData)
+}
 
 func JxybZY1101(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, request_url string, access_key string, pBusiCardInfo string, id_card_no string, cainfo string) (string, string) {
 	timestamp := time.Now().Unix()
@@ -1142,6 +1189,89 @@ func Jxyb2401(struct2401 Struct2401, secret_key string, org_name string, fixmedi
 	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2401"), requestLog
 
 }
+
+func Jxyb2403(struct2401 Struct2401, 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()
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+
+	// 生成输入报文
+	inputMessage := SetJXInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	//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"] = "2403"           // 交易编码
+	inputData["mdtrt_id"] = struct2401.PsnNo // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = struct2401.PsnNo   // 人员编号 （来自1101接口返回）
+	inputData["coner_name"] = struct2401
+	inputData["tel"] = ""
+	inputData["begntime"] = struct2401.Begntime             // 开始时间
+	inputData["endtime"] = struct2401.Begntime              // 开始时间
+	inputData["mdtrt_cert_type"] = struct2401.MdtrtCertType // 就诊凭证类型
+	inputData["med_type"] = struct2401.MedType              // 就诊凭证编号
+	inputData["ipt_opt_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"] = ""
+	inputData["expContent"] = ""
+
+	inputDataArr := make([]map[string]interface{}, 0)
+	for _, item := range struct2401.Diseinfo {
+		inputDataTwo := make(map[string]interface{})
+		inputDataTwo["mdtrt_id"] = item.PsnNo
+
+		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["adminfo"] = inputData
+	input["diseinfo"] = inputDataArr
+	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 + "2403"
+	return JXHttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData), "2403"), requestLog
+
+}
+
 func Jxyb2404(mdtrt_id string, psn_no 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()
@@ -2075,83 +2205,83 @@ func Jxyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	inputData["setl_id"] = struct4101.SetlId   // 结算 ID  必填
 	inputData["psn_no"] = struct4101.PsnNo     // 结算 ID  必填
 
-	inputData["fixmedins_name"] = params.FixmedinsName        // 定点医药机构名称  必填
-	inputData["fixmedins_code"] = params.FixmedinsCode        // 定点医药机构编码  必填
-	inputData["hi_setl_lv"] = ""                              // 医保结算等级
-	inputData["hi_no"] = struct4101.PsnNo                     // 医保编号
-	inputData["medcasno"] = struct4101.PsnNo                  // 病案号  必填
-	inputData["dcla_time"] = year + "-" + month + "-" + day   // 申报时间  必填
-	inputData["psn_name"] = struct4101.PsnName                // 人员姓名  必填
-	inputData["gend"] = struct4101.Gend                       // 性别  必填
-	inputData["brdy"] = struct4101.Brdy                       // 出生日期  必填
-	inputData["age"] = struct4101.Age                         // 年龄  必填
-	inputData["ntly"] = struct4101.Ntly                       // 国籍  必填
-	inputData["nwb_age"] = ""                                 // 年龄  必填
-	inputData["naty"] = struct4101.Naty                       // 民族  必填
-	inputData["patn_cert_type"] = struct4101.PatnCertType     // 患者证件类别  必填
-	inputData["certno"] = struct4101.Certno                   // 证件号码  必填
-	inputData["prfs"] = struct4101.Prfs                       // 职业  必填
-	inputData["curr_addr"] = ""                               // 现住址  必填
-	inputData["emp_name"] = ""                                // 单位名称  必填
-	inputData["emp_addr"] = ""                                // 单位地址  必填
-	inputData["emp_tel"] = ""                                 // 单位电话  必填
-	inputData["poscode"] = ""                                 // 邮编  必填
-	inputData["coner_name"] = struct4101.ConerName            // 联系人姓名  必填
-	inputData["patn_rlts"] = struct4101.PatnRlts              // 与患者关系  必填
-	inputData["coner_addr"] = struct4101.ConerAddr            // 联系人地址  必填
-	inputData["coner_tel"] = struct4101.ConerTel              // 联系人电话  必填
-	inputData["hi_type"] = struct4101.HiType                  // 医保类型  必填
-	inputData["insuplc"] = struct4101.Insuplc                 // 参保地  必填
-	inputData["sp_psn_type"] = ""                             // 特殊人员类型  必填
-	inputData["nwb_adm_type"] = ""                            // 新生儿入院类型  必填
-	inputData["nwb_bir_wt"] = ""                              // 新生儿出生体重  必填
-	inputData["nwb_adm_wt"] = ""                              // 新生儿入院体重  必填
-	inputData["opsp_diag_caty"] = ""                          // 门诊慢特病诊断  必填
-	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
-	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
-	inputData["adm_way"] = ""                                 // 入院途径  必填
-	inputData["trt_type"] = ""                                // 治疗类别  必填
-	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
-	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
-	inputData["refldept_dept"] = ""                           // 转科科别  必填
-	inputData["dscg_time"] = struct4101.AdmEndTime            // 出院时间  必填
-	inputData["dscg_caty"] = struct4101.AdmCaty               // 出院科别  必填
-	inputData["act_ipt_days"] = ""                            // 实际住院天数  必填
-	inputData["otp_wm_dise"] = ""                             // 门（急） 诊西医诊断  必填
-	inputData["wm_dise_code"] = ""                            // 门（急） 诊中医诊断  必填
-	inputData["otp_tcm_dise"] = ""                            // 西医诊断疾病代码  必填
-	inputData["tcm_dise_code"] = ""                           // 中医诊断代码  必填
-	inputData["oprn_oprt_code_cnt"] = ""                      // 手术操作代码计数  必填
-	inputData["vent_used_dura"] = ""                          // 呼吸机使用时长  必填
-	inputData["pwcry_bfadm_coma_dura"] = ""                   // 颅脑损伤患者入院前昏迷时长  必填
-	inputData["pwcry_afadm_coma_dura"] = ""                   // 颅脑损伤患者入院后昏迷时长  必填
-	inputData["bld_cat"] = ""                                 // 输血品种  必填
-	inputData["bld_amt"] = ""                                 // 输血量  必填
-	inputData["bld_unt"] = ""                                 // 输血计量单位  必填
-	inputData["spga_nurscare_days"] = ""                      // 特级护理天数  必填
-	inputData["lv1_nurscare_days"] = ""                       // 一级护理天数  必填
-	inputData["scd_nurscare_days"] = ""                       // 二级护理天数  必填
-	inputData["lv3_nurscare_days"] = ""                       // 三级护理天数  必填
-	inputData["acp_medins_name"] = ""                         // 拟接收机构名称  必填
-	inputData["acp_optins_code"] = ""                         // 拟接收机构代码  必填
-	inputData["bill_code"] = struct4101.BillCode              // 票据代码  必填
-	inputData["bill_no"] = struct4101.BillNo                  // 票据号码  必填
-	inputData["biz_sn"] = struct4101.BizSn                    // 业务流水号  必填
-	inputData["days_rinp_flag_31"] = ""                       // 出院 31 天内再住院计划标志  必填
-	inputData["days_rinp_pup_31"] = ""                        // 出院 31 天内再住院目的  必填
-	inputData["chfpdr_name"] = ""                             // 主诊医师姓名  必填
-	inputData["chfpdr_code"] = ""                             // 主诊医师代码  必填
-	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
-	inputData["setl_end_date"] = struct4101.SetlEndDate       // 结算结束日期  必填
-	inputData["psn_selfpay"] = struct4101.PsnSelfPay          // 个人自付  必填
-	inputData["psn_ownpay"] = struct4101.PsnOwnPay            // 个人自费  必填
-	inputData["acct_pay"] = struct4101.AcctPay                // 个人账户支出  必填
-	inputData["hi_paymtd"] = struct4101.HiPaymtd              // 医保支付方式  必填
-	inputData["hsorg"] = struct4101.Hsorg                     // 医保机构  必填
-	inputData["hsorg_opter"] = struct4101.HsorgOpter          // 医保机构经办人  必填
-	inputData["medins_fill_dept"] = struct4101.MedinsFillDept // 医疗机构填报部门  必填
-	inputData["medins_fill_psn"] = struct4101.MedinsFillPsn   // 医疗机构填报人  必填
-	inputData["psn_cashpay"] = struct4101.PsnCashpay          // 医疗机构填报人  必填
+	inputData["fixmedins_name"] = params.FixmedinsName      // 定点医药机构名称  必填
+	inputData["fixmedins_code"] = params.FixmedinsCode      // 定点医药机构编码  必填
+	inputData["hi_setl_lv"] = ""                            // 医保结算等级
+	inputData["hi_no"] = struct4101.PsnNo                   // 医保编号
+	inputData["medcasno"] = struct4101.PsnNo                // 病案号  必填
+	inputData["dcla_time"] = year + "-" + month + "-" + day // 申报时间  必填
+	inputData["psn_name"] = struct4101.PsnName              // 人员姓名  必填
+	inputData["gend"] = struct4101.Gend                     // 性别  必填
+	inputData["brdy"] = struct4101.Brdy                     // 出生日期  必填
+	inputData["age"] = struct4101.Age                       // 年龄  必填
+	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
+	inputData["nwb_age"] = ""                               // 年龄  必填
+	inputData["naty"] = struct4101.Naty                     // 民族  必填
+	inputData["patn_cert_type"] = struct4101.PatnCertType   // 患者证件类别  必填
+	inputData["certno"] = struct4101.Certno                 // 证件号码  必填
+	inputData["prfs"] = struct4101.Prfs                     // 职业  必填
+	inputData["curr_addr"] = ""                             // 现住址  必填
+	inputData["emp_name"] = ""                              // 单位名称  必填
+	inputData["emp_addr"] = ""                              // 单位地址  必填
+	inputData["emp_tel"] = ""                               // 单位电话  必填
+	inputData["poscode"] = ""                               // 邮编  必填
+	inputData["coner_name"] = struct4101.ConerName          // 联系人姓名  必填
+	inputData["patn_rlts"] = struct4101.PatnRlts            // 与患者关系  必填
+	inputData["coner_addr"] = struct4101.ConerAddr          // 联系人地址  必填
+	inputData["coner_tel"] = struct4101.ConerTel            // 联系人电话  必填
+	inputData["hi_type"] = struct4101.HiType                // 医保类型  必填
+	inputData["insuplc"] = struct4101.Insuplc               // 参保地  必填
+	inputData["sp_psn_type"] = ""                           // 特殊人员类型  必填
+	inputData["nwb_adm_type"] = ""                          // 新生儿入院类型  必填
+	inputData["nwb_bir_wt"] = ""                            // 新生儿出生体重  必填
+	inputData["nwb_adm_wt"] = ""                            // 新生儿入院体重  必填
+	inputData["opsp_diag_caty"] = ""                        // 门诊慢特病诊断  必填
+	inputData["opsp_mdtrt_date"] = ""                       // 门诊慢特病就诊日期  必填
+	inputData["ipt_med_type"] = struct4101.IptMedType       // 住院医疗类型  必填
+	inputData["adm_way"] = ""                               // 入院途径  必填
+	inputData["trt_type"] = ""                              // 治疗类别  必填
+	inputData["adm_time"] = struct4101.AdmTime              // 入院时间  必填
+	inputData["adm_caty"] = struct4101.AdmCaty              // 入院科别  必填
+	inputData["refldept_dept"] = ""                         // 转科科别  必填
+	inputData["dscg_time"] = struct4101.AdmEndTime          // 出院时间  必填
+	inputData["dscg_caty"] = struct4101.AdmCaty             // 出院科别  必填
+	inputData["act_ipt_days"] = ""                          // 实际住院天数  必填
+	inputData["otp_wm_dise"] = ""                           // 门（急） 诊西医诊断  必填
+	inputData["wm_dise_code"] = ""                          // 门（急） 诊中医诊断  必填
+	inputData["otp_tcm_dise"] = ""                          // 西医诊断疾病代码  必填
+	inputData["tcm_dise_code"] = ""                         // 中医诊断代码  必填
+	inputData["oprn_oprt_code_cnt"] = ""                    // 手术操作代码计数  必填
+	inputData["vent_used_dura"] = ""                        // 呼吸机使用时长  必填
+	inputData["pwcry_bfadm_coma_dura"] = ""                 // 颅脑损伤患者入院前昏迷时长  必填
+	inputData["pwcry_afadm_coma_dura"] = ""                 // 颅脑损伤患者入院后昏迷时长  必填
+	inputData["bld_cat"] = ""                               // 输血品种  必填
+	inputData["bld_amt"] = ""                               // 输血量  必填
+	inputData["bld_unt"] = ""                               // 输血计量单位  必填
+	inputData["spga_nurscare_days"] = ""                    // 特级护理天数  必填
+	inputData["lv1_nurscare_days"] = ""                     // 一级护理天数  必填
+	inputData["scd_nurscare_days"] = ""                     // 二级护理天数  必填
+	inputData["lv3_nurscare_days"] = ""                     // 三级护理天数  必填
+	inputData["acp_medins_name"] = ""                       // 拟接收机构名称  必填
+	inputData["acp_optins_code"] = ""                       // 拟接收机构代码  必填
+	inputData["bill_code"] = struct4101.BillCode            // 票据代码  必填
+	inputData["bill_no"] = struct4101.BillNo                // 票据号码  必填
+	inputData["biz_sn"] = struct4101.BizSn                  // 业务流水号  必填
+	inputData["days_rinp_flag_31"] = ""                     // 出院 31 天内再住院计划标志  必填
+	inputData["days_rinp_pup_31"] = ""                      // 出院 31 天内再住院目的  必填
+	inputData["chfpdr_name"] = ""                           // 主诊医师姓名  必填
+	inputData["chfpdr_code"] = ""                           // 主诊医师代码  必填
+	inputData["setl_begn_date"] = struct4101.SetlBegnDate   // 结算开始日期  必填
+	inputData["setl_end_date"] = struct4101.SetlEndDate     // 结算结束日期  必填
+	inputData["psn_selfpay"] = struct4101.PsnSelfPay        // 个人自付  必填
+	inputData["psn_ownpay"] = struct4101.PsnOwnPay          // 个人自费  必填
+	inputData["acct_pay"] = struct4101.AcctPay              // 个人账户支出  必填
+	inputData["hi_paymtd"] = struct4101.HiPaymtd            // 医保支付方式  必填
+	inputData["hsorg"] = params.FixmedinsName               // 医保机构  必填
+	inputData["hsorg_opter"] = struct4101.HsorgOpter        // 医保机构经办人  必填
+	inputData["medins_fill_dept"] = params.FixmedinsName    // 医疗机构填报部门  必填
+	inputData["medins_fill_psn"] = struct4101.MedinsFillPsn // 医疗机构填报人  必填
+	inputData["psn_cashpay"] = struct4101.PsnCashpay        // 医疗机构填报人  必填
 
 	payinfo := make([]map[string]interface{}, 0) // 基金支付信息
 	for _, item := range struct4101.CustomStruct {

service/nm_service.go

@@ -5,14 +5,16 @@ import (
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
+	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 )
 
 // 门诊挂号
-func Nmyb2201(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, verify_number string, cainfo string) (string, string) {
+func Nmyb2201(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, verify_number string, cainfo string) (string, string) {
 	// 生成签名
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -20,9 +22,9 @@ func Nmyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	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, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	//inputMessage := SetInputMessage(timestamp, org_name, opera, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2201"        // 交易编码
@@ -31,8 +33,8 @@ func Nmyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	inputData["begntime"] = timeFormatOne // 开始时间
 
 	if id_card_type == 1 {
-		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 	} else if id_card_type == 3 {
 		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -40,8 +42,8 @@ func Nmyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 	} else {
-		inputData["mdtrt_cert_type"] = "02"        // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 
 	}
 
@@ -68,9 +70,8 @@ func Nmyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 
 	gdyb_url := beego.AppConfig.String("gdyb_url")
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-	request_url = gdyb_url
 
-	request, err := http.NewRequest("POST", request_url, reader)
+	request, err := http.NewRequest("POST", gdyb_url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
@@ -108,7 +109,9 @@ func Nmyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+
+	//inputMessage := SetInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2202"       // 交易编码
@@ -255,10 +258,104 @@ func Nmyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	fmt.Println(str)
 	return str, requestLog
 
+}
+func Nmyb2203C(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig, begin_time string, cainfo 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")
+	// 生成输入报文
+
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	diseinfo := make([]map[string]interface{}, 0)
+
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+
+	inputMessage["infno"] = "2203A"     // 交易编码
+	inputData["mdtrt_id"] = mdtrtId     // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo         // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type    // 医疗类别 16门诊特殊病
+	inputData["begntime"] = begin_time  // 开始时间
+	inputData["main_cond_dscr"] = ""    // 主要病情描述
+	inputData["dise_codg"] = sick_code  // 病种编码
+	inputData["dise_name"] = sick_name  // 病种名称
+	inputData["birctrl_type"] = ""      // 计划生育手术类别
+	inputData["birctrl_matn_date"] = "" // 计划生育手术或生育日期
+
+	for index, item := range config {
+		diseinfo_sun := make(map[string]interface{})
+		diseinfo_sun["diag_type"] = "1"              // 诊断类别
+		diseinfo_sun["diag_srt_no"] = index          // 诊断排序号
+		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码
+		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
+		diseinfo_sun["diag_dept"] = department       // 诊断科室
+		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
+		diseinfo_sun["dise_dor_name"] = doctor       // 诊断医生姓名
+		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
+		diseinfo_sun["vali_flag"] = "0"              // 有效标志
+		diseinfo = append(diseinfo, diseinfo_sun)
+	}
+	//inputData["exp_content"] = "" // 人员编号 （来自1101接口返回）
+	inputData["exp_content"] = "" //
+
+	input["diseinfo"] = diseinfo
+	input["mdtrtinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+	var requestLog string
+	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")
+
+	request, err := http.NewRequest("POST", gdyb_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, requestLog
+
 }
 
 // 门诊费用明细信息上传
 func Nmyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, 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, balance_accounts_type string, diag_code string, request_url string, access_key string, new_doctor_name string, time_stamp_2203 string, cainfo string) (string, string) {
+
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成签名
@@ -394,23 +491,12 @@ func Nmyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
 
-		if fixmedins_code == "H32092103007" {
-			feedetailInfo["bilg_dr_codg"] = "D320923012139"   // 开单医生编码
-			feedetailInfo["bilg_dr_name"] = "王曙光"             // 开单医师姓名
-			feedetailInfo["acord_dept_codg"] = ""             // 受单科室编码
-			feedetailInfo["acord_dept_name"] = ""             // 受单科室名称
-			feedetailInfo["orders_dr_code"] = "D320923012139" // 受单医生编码
-			feedetailInfo["orders_dr_name"] = "王曙光"           // 受单医生姓名
-
-		} else {
-			feedetailInfo["bilg_dr_codg"] = "D371621008686"   // 开单医生编码
-			feedetailInfo["bilg_dr_name"] = "王云刚"             // 开单医师姓名
-			feedetailInfo["acord_dept_codg"] = ""             // 受单科室编码
-			feedetailInfo["acord_dept_name"] = ""             // 受单科室名称
-			feedetailInfo["orders_dr_code"] = "D371621008686" // 受单医生编码
-			feedetailInfo["orders_dr_name"] = "王云刚"           // 受单医生姓名
-
-		}
+		feedetailInfo["bilg_dr_codg"] = doctor_id         // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = new_doctor_name   // 开单医师姓名
+		feedetailInfo["acord_dept_codg"] = dept_code      // 受单科室编码
+		feedetailInfo["acord_dept_name"] = dept           // 受单科室名称
+		feedetailInfo["orders_dr_code"] = doctor_id       // 受单医生编码
+		feedetailInfo["orders_dr_name"] = new_doctor_name // 受单医生姓名
 
 		if balance_accounts_type == "8" {
 			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
@@ -553,7 +639,10 @@ func Nmyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 
 // 门诊预结算
 func Nmyb2206(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, mdtrt_grp_type string) (string, string) {
+	if !strings.Contains(insuplc_admdvs, "150") {
 
+		chrgBchno = "0000"
+	}
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -571,8 +660,8 @@ func Nmyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
-			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else if id_card_type == 3 {
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -580,8 +669,8 @@ func Nmyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else {
-			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		}
 	}
 	if insuplc_admdvs == "421300" {
@@ -654,6 +743,10 @@ func Nmyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 
 // 门诊结算
 func Nmyb2207(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, mdtrt_grp_type string) (string, string) {
+	if !strings.Contains(insuplc_admdvs, "150") {
+
+		chrgBchno = "0000"
+	}
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -665,12 +758,12 @@ func Nmyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["psn_no"] = psnNo    // 人员编号 （来自1101接口返回）
 
 	if certificates == 3 {
-		inputData["mdtrt_cert_type"] = "99"                       // 就诊凭证类型
-		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		inputData["mdtrt_cert_type"] = "99"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
-			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "03"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else if id_card_type == 3 {
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -678,7 +771,8 @@ func Nmyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else {
-
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 		}
 	}
 	if med_type == "1111" || med_type == "1112" {
@@ -699,7 +793,7 @@ func Nmyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	inputData["chrg_bchno"] = chrgBchno          // 收费批次号(来自2204生成的)
 	inputData["acct_used_flag"] = acct_used_flag // 个人账户使用标志 0否 1是
 	inputData["insutype"] = insutype             // 险种类型
-	inputData["invono"] = ""                     // 发票号
+	inputData["invono"] = "12345"                // 发票号
 
 	inputData["fulamt_ownpay_amt"] = fulamt_ownpay_amt //
 	inputData["overlmt_selfpay"] = overlmt_selfpay     //
@@ -816,3 +910,88 @@ func Nmyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 	str2 := string(mjson)
 	return str, str2
 }
+
+func Nmyb2503(psnNo string, insutype string, org_name string, op string, doctor string, fixmedins_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_name string, sick_code string, start_time string, end_time string, check_time string, hospital_code string, hospital_name 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")
+
+	//timeFormatTwo := tempTime.Format("2006-01-02")
+
+	//t := time.Now()
+	//last := time.Date(t.Year(), time.December, 31, 0, 0, 0, 0, time.UTC)
+	//tm := time.Unix(last.Unix(), 0)
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, op, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "2503"                  // 交易编码
+	inputData["psn_no"] = psnNo                     // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype                // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_code"] = sick_code         // 险种类型（来自1101接口返回）
+	inputData["opsp_dise_name"] = sick_name         // 险种类型（来自1101接口返回）
+	inputData["insu_optins"] = insuplc_admdvs       // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_no"] = hospital_code   // 险种类型（来自1101接口返回）
+	inputData["ide_fixmedins_name"] = hospital_name // 险种类型（来自1101接口返回）
+	inputData["hosp_ide_date"] = check_time         // 险种类型（来自1101接口返回）
+	inputData["diag_dr_codg"] = doctor_id           // 开始时间
+	inputData["diag_dr_name"] = doctor              // 开始时间
+	inputData["begndate"] = start_time              // 医师编码
+	inputData["tel"] = ""                           // 医师编码
+	inputData["addr"] = ""                          // 医师编码
+	inputData["enddate"] = end_time                 // 医师编码
+
+	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
+	if fixmedins_code == "H15049901371" {
+		url = gdyb_url
+	} else {
+		url = gdyb_url + "2503"
+	}
+
+	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
+}