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

controllers/sg/his_api_controller.go

@@ -87,6 +87,8 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/3501", &HisApiController{}, "post:Post3501")
 
+	beego.Router("/api/readele", &HisApiController{}, "get:ReadEleToken")
+
 }
 
 type Result3101 struct {
@@ -122,6 +124,108 @@ type Result3101 struct {
 	} `json:"output"`
 }
 
+func (c *HisApiController) ReadEleToken() {
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	his, _ := service.GetNewHisPatientInfoFour(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+
+	if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
+		tokens := ReadEleCard(admin_user_id, c.GetAdminUserInfo().CurrentOrgId, c)
+		if len(tokens) > 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "读取成功，请在5分钟内进行结算操作",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         "读取失败",
+			})
+		}
+
+	} else if miConfig.MdtrtareaAdmvs == "440305" {
+		if initFlag == 0 {
+			c.TestGetBasBaseInit()
+		}
+		token := c.GetEleBaseInfo()
+		token = Remove0000(token)
+		if len(token) > 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "读取成功，请在5分钟内进行结算操作",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         "读取失败",
+			})
+		}
+
+	} else if miConfig.MdtrtareaAdmvs == "350500" {
+		_, outPutInfo, errMsg := service.ReadEleCardForSettle(miConfig.Code, roles.UserName, roles.AdminUserId)
+		if len(errMsg) == 0 {
+			type ELeData struct {
+				Data struct {
+					IdNo        string `json:"idNo"`
+					IdType      string `json:"idType"`
+					UserName    string `json:"userName"`
+					EcToken     string `json:"ecToken"`
+					InsuOrg     string `json:"insuOrg"`
+					Gender      string `json:"gender"`
+					Birthday    string `json:"birthday"`
+					Nationality string `json:"nationality"`
+					Email       string `json:"email"`
+					Extra       string `json:"extra"`
+				} `json:"data"`
+				Code    int    `json:"code"`
+				Message string `json:"message"`
+			}
+
+			var ele ELeData
+			err := json.Unmarshal([]byte(outPutInfo), &ele)
+			if err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+			}
+			token := ele.Data.EcToken
+
+			if len(token) > 0 {
+				psn := &models.HisPsn{
+					PsnNo:        his.PsnNo,
+					Age:          0,
+					PatientId:    his.PatientId,
+					Certno:       his.Certno,
+					Brdy:         his.Brdy,
+					Gend:         his.Gend,
+					Naty:         his.Naty,
+					PsnCertType:  his.PsnCertType,
+					PsnName:      his.PsnName,
+					Idetinfo:     his.Idetinfo,
+					Insuinfo:     his.Iinfo,
+					UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+					CardInfo:     outPutInfo,
+					VerifyNumber: token,
+				}
+				service.CreateHisPsn(psn)
+
+			}
+
+			if len(token) > 0 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "读取成功，请在5分钟内进行结算操作",
+				})
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         "读取失败",
+				})
+			}
+
+		}
+	}
+
+}
 func (c *HisApiController) Get9001() {
 	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
@@ -7243,13 +7347,17 @@ func (c *HisApiController) GetUploadInfo() {
 							}
 
 						} else if miConfig.MdtrtareaAdmvs == "350500" {
-							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 							var cert_no string
-							if his.IdCardType == 1 {
+							if his.IdCardType == 4 {
+								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+								cert_no = psn_info.VerifyNumber
+								result2, src_resquest, _ = service.FJyb2207ForToken(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+
+							} else if his.IdCardType == 1 {
+								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
 								cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+								result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 							}
-							fmt.Println(cert_no)
-							result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 
 							//result2, src_resquest = service.Gdyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, acct_used_flag)
 							var dat map[string]interface{}
@@ -7718,8 +7826,10 @@ func (c *HisApiController) GetUploadInfo() {
 				var cert_no string
 				if his.IdCardType == 1 {
 					cert_no = strings.Split(psn_info.CardInfo, "|")[0]
+				} else {
+					cert_no = psn_info.VerifyNumber
+
 				}
-				fmt.Println(cert_no)
 
 				result2, src_resquest, _ = service.FJyb2207(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, tempOrder.FulamtOwnpayAmt, tempOrder.OverlmtSelfPay, tempOrder.PreselfpayAmt, tempOrder.InscpScpAmt, his.IdType, acct_used_flag, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 				var dat map[string]interface{}
@@ -8580,15 +8690,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		if miConfig.MdtrtareaAdmvs == "320921" {
 			req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
 		} else {
-			tokens := ReadEleCard(admin_user_id, c.GetAdminUserInfo().CurrentOrgId, c)
-			if len(tokens) > 0 {
-				req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"failed_code": -10,
-					"msg":         "token无效",
-				})
-			}
+			req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
 		}
 
 		resp, _ := client.Do(req)
@@ -8651,6 +8753,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 		if miConfig.MdtrtareaAdmvs == "440781" { //
 			result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 		} else {
+
 			if miConfig.Code == "H15049901371" {
 				//赤峰地区国家医保医疗类别
 				//职工透析：医疗类别选特殊情况门诊990502
@@ -8672,8 +8775,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 				result, requestLog = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, med_type, doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
 			} else {
 				result, requestLog = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.DoctorNumber, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.ContentCode, sickConfig.ClassName, roles.UserName, config, begin_time)
-
 			}
+
 			saveLog(result, requestLog, "2203", "上传就诊信息")
 			var respJSON2 map[string]interface{}
 			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
@@ -8703,9 +8806,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 				}
 			}
 		}
-
 	}
-
 	if res2.Infcode != 0 {
 		adminUser := c.GetAdminUserInfo()
 		errlog := &models.HisOrderError{
@@ -9279,8 +9380,16 @@ func (c *HisApiController) GetPreUploadInfo() {
 						}
 
 					} else if miConfig.MdtrtareaAdmvs == "350500" {
+						psn_info, _ := service.GetPsnByPatientIdTwo(his.PatientId, recordDateTime)
+						var result string
+						var request_log string
+						if his.IdCardType == 4 && len(psn_info.VerifyNumber) > 0 {
+							result, request_log, _ = service.FJyb2206ForToken(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+
+						} else {
+							result, request_log, _ = service.FJyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
+						}
 
-						result, request_log, _ := service.FJyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey)
 						var dat map[string]interface{}
 						if err := json.Unmarshal([]byte(result), &dat); err == nil {
 							fmt.Println(dat)
@@ -9318,7 +9427,13 @@ func (c *HisApiController) GetPreUploadInfo() {
 							}
 							result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, med_type, his.IdCardType, 0, 0, 0, 0, his.IdType)
 						} else {
-							result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
+							if his.IdCardType == 4 {
+								result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, psn_info.VerifyNumber, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+							} else {
+								result, request_log = service.Gdyb2206(his.PsnNo, his.Number, chrg_bchno, cert_no, insutype, allTotal, miConfig.OrgName, roles.UserName, miConfig.Code, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(reg_type, 10), his.IdCardType, 0, 0, 0, 0, his.IdType)
+							}
+
 						}
 
 						var dat map[string]interface{}

models/his_models.go

@@ -1328,6 +1328,8 @@ type HisPsn struct {
 	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	CardInfo     string  `gorm:"column:card_info" json:"card_info" form:"card_info"`
 	VerifyNumber string  `gorm:"column:verify_number" json:"verify_number" form:"verify_number"`
+	Stage        string  `gorm:"column:stage" json:"stage" form:"stage"`
+	RecordDate   int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 }
 
 func (HisPsn) TableName() string {

service/fj_service.go

@@ -584,6 +584,79 @@ func FJyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 	return output, requestLog, err_msg
 }
 
+func FJyb2206ForToken(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, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
+
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetFjInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, app_id, app_secret, sign_key, enc_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"] = "2206" // 交易编码
+	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 // 就诊凭证编号
+		}
+	}
+	if med_type == "1111" || med_type == "1112" {
+
+		med_type = "11"
+	}
+
+	if insuplc_admdvs == "421300" {
+		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 门诊挂号
+		}
+	} 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"] = "0"   // 个人账户使用标志 0否 1是
+	inputData["insutype"] = insutype    // 险种类型
+	inputData["invono"] = ""            // 发票号
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var requestLog string
+
+	bytesData, err := json.Marshal(inputMessage)
+
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), "", ""
+	}
+
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
+
+	return output, requestLog, err_msg
+}
+
 //  门诊结算
 func FJyb2207(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, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
@@ -604,6 +677,81 @@ func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		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 // 就诊凭证编号
+		}
+	}
+	if med_type == "1111" || med_type == "1112" {
+		med_type = "11"
+	}
+
+	if insuplc_admdvs == "421300" {
+		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 门诊挂号
+		}
+	} 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(), "", ""
+	}
+
+	var requestLog string
+	requestLog = string(bytesData)
+
+	enc := mahonia.NewEncoder("gbk")
+	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
+	return output, requestLog, err_msg
+}
+
+func FJyb2207ForToken(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, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetFjInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, url, app_id, app_secret, sign_key, enc_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"] = "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"] = 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 // 就诊凭证编号
@@ -2565,3 +2713,38 @@ func ReadEleCard(code string) (string, string, string) {
 	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pErrMsg))), GB18030)
 
 }
+
+func ReadEleCardForSettle(code string, user_name string, id int64) (string, string, string) {
+	DllDef := syscall.MustLoadDLL("chs_fjs_standard.dll")
+	readCard := DllDef.MustFindProc("ec_decode")
+
+	pCardInfo := make([]byte, 8192)
+	pBusiCardInfo := make([]byte, 8192)
+	pErrMsg := make([]byte, 8192)
+
+	data := make(map[string]interface{})
+
+	inputData := make(map[string]interface{})
+	inputData["orgId"] = code
+	inputData["businessType"] = "01301"
+	inputData["operatorId"] = id
+	inputData["operatorName"] = user_name
+	inputData["officeId"] = "001"
+	inputData["officeName"] = "血透科"
+	data["data"] = inputData
+	data["transType"] = "ec.query"
+	data["orgId"] = code
+	bytesData, _ := json.Marshal(data)
+	pCardInfo = bytesData
+	pCardInfo = []byte(ConvertByte2String(pCardInfo, GB18030))
+
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&pCardInfo[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])), (uintptr)(unsafe.Pointer(&pErrMsg[0])))
+	fmt.Println(ret2)
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", "", ""
+	}
+	return ConvertByte2String([]byte(DeleteExtraSpace(string(bytesData))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pBusiCardInfo))), GB18030), ConvertByte2String([]byte(DeleteExtraSpace(string(pErrMsg))), GB18030)
+
+}

service/gdyb_service.go

@@ -1192,6 +1192,9 @@ func Gdyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		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 // 就诊凭证编号

service/his_service.go

@@ -1411,6 +1411,11 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 	return
 }
 
+func GetPsnByPatientIdTwo(patient_id int64, record_date int64) (psn models.HisPsn, err error) {
+	err = readDb.Model(&models.HisPsn{}).Where("patient_id = ? AND record_date = ? AND stage = 1", patient_id, record_date).Last(&psn).Error
+	return
+}
+
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-05-01 00:00:00' AND setl_time <= '2022-06-01 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
 	return