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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10106
+org_id = 10138
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,14 +53,14 @@ call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-# gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+# gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
+gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
 # gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
 # gdyb_paasid = "sg03_prd"
-gdyb_paasid = "jm_sc_yjyy"
+# gdyb_paasid = "jm_sc_yjyy"
 # gdyb_paasid="zh_prd_yrojyy"
-# gdyb_paasid = "sz_prd_yjyy"
+gdyb_paasid = "sz_prd_yjyy"
 # gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/js/jsyb_controller.go

@@ -608,6 +608,24 @@ func (c *JSybController) Get3201() {
 	})
 }
 
+type ELeData struct {
+	Data struct {
+		Extra       string `json:"extra"`
+		IDNo        string `json:"idNo"`
+		IDType      string `json:"idType"`
+		EcToken     string `json:"ecToken"`
+		InsuOrg     string `json:"insuOrg"`
+		UserName    string `json:"userName"`
+		EcIndexNo   string `json:"ecIndexNo"`
+		Gender      string `json:"gender"`
+		Birthday    string `json:"birthday"`
+		Nationality string `json:"nationality"`
+		Email       string `json:"email"`
+	} `json:"data"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
 func (c *JSybController) ReadCard() {
 	fixmedins_code := c.GetString("fixmedins_code")
 	secret_key := c.GetString("secret_key")
@@ -618,42 +636,85 @@ func (c *JSybController) ReadCard() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	url := c.GetString("url")
 	cainfo := c.GetString("cainfo")
+	id_card_type, _ := c.GetInt64("id_card_type")
+	operator_id := c.GetString("operator_id")
+	operator := c.GetString("operator")
 
 	//result, request := service.Jsyb9001(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, url, cainfo, ak)
 	//fmt.Println(request)
 	//fmt.Println(result)
 
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
-	pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
-	pBusiCardInfo = Remove0000(pBusiCardInfo)
-	pCardInfo = Remove0000(pCardInfo)
-	fmt.Println(":", ConvertToString(pCardInfo, "gbk", "utf-8"))
-
-	fmt.Println(pBusiCardInfo)
-	fmt.Println(pCardInfo)
-	bas := strings.Split(pCardInfo, "|")
-	basNumber := bas[2]
-	id_card_no := bas[1]
-	card_sn := bas[3]
-
-	if len(pCardInfo) > 0 && len(pBusiCardInfo) > 0 {
-		result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, 1, card_sn, "1", url, ak, pBusiCardInfo, id_card_no, cainfo)
-		var dat map[string]interface{}
-		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-			fmt.Println(dat)
+
+	switch id_card_type {
+	case 1:
+		pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
+		pBusiCardInfo = Remove0000(pBusiCardInfo)
+		pCardInfo = Remove0000(pCardInfo)
+		fmt.Println(":", ConvertToString(pCardInfo, "gbk", "utf-8"))
+
+		fmt.Println(pBusiCardInfo)
+		fmt.Println(pCardInfo)
+		bas := strings.Split(pCardInfo, "|")
+		basNumber := bas[2]
+		id_card_no := bas[1]
+		card_sn := bas[3]
+
+		if len(pCardInfo) > 0 && len(pBusiCardInfo) > 0 {
+			result, _ := service.Jsyb1101A(basNumber, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, id_card_type, card_sn, "1", url, ak, pBusiCardInfo, id_card_no, cainfo)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      pCardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"result":         dat,
+				"type":           "1",
+			})
 		} else {
-			fmt.Println(err)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
 		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"status":         "0",
-			"card_info":      pCardInfo,
-			"busi_card_info": pBusiCardInfo,
-			"result":         dat,
-		})
-	} else {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"status": "-1",
-		})
+		break
+	case 3: //电子凭证
+		pCardInfo, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
+		fmt.Println(pCardInfo)
+		fmt.Println(pBusiCardInfo)
+		var ele ELeData
+		err := json.Unmarshal([]byte(pBusiCardInfo), &ele)
+		if err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		token := ele.Data.EcToken
+		if len(token) > 0 {
+			result, _ := service.Jsyb1101B(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo)
+			var dat map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat); err == nil {
+				fmt.Println(dat)
+			} else {
+				fmt.Println(err)
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         "0",
+				"card_info":      pCardInfo,
+				"busi_card_info": pBusiCardInfo,
+				"token":          token,
+				"result":         dat,
+				"type":           "2",
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": "-1",
+			})
+
+		}
+		break
 
 	}
 
@@ -718,6 +779,42 @@ func (c *JSybController) GetBasBaseInfo() (string, string) {
 	return DeleteExtraSpace(string(pCardInfo)), DeleteExtraSpace(string(pBusiCardInfo))
 }
 
+func (c *JSybController) GetELeInfo(code string, operator_id string, operator_name string) (string, string) {
+	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
+	readCard := DllDef.MustFindProc("EcQuery")
+	fmt.Println(readCard)
+	fmt.Println("!!!!!")
+	//pCardInfo := make([]byte, 8192)
+	pBusiCardInfo := make([]byte, 8192)
+
+	data := 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"] = "血透室"
+
+	data["data"] = inputData
+	data["transType"] = "ec.query"
+	data["orgId"] = code
+
+	bytesData, _ := json.Marshal(data)
+
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&bytesData[0])), (uintptr)(unsafe.Pointer(&pBusiCardInfo[0])))
+	fmt.Println(ret2)
+	fmt.Println(DeleteExtraSpace(string(bytesData)))
+	fmt.Println(DeleteExtraSpace(string(pBusiCardInfo)))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(bytesData)), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(DeleteExtraSpace(string(pBusiCardInfo)), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return "", ""
+	}
+	return DeleteExtraSpace(string(bytesData)), DeleteExtraSpace(string(pBusiCardInfo))
+}
+
 func IntPtr(n int) uintptr {
 	return uintptr(n)
 }

controllers/sg/his_api_controller.go

@@ -395,11 +395,11 @@ func (c *HisApiController) ReadCard() {
 			var api string
 			if miConfig.MdtrtareaAdmvs == "320921" {
 				api = "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "operator_id=" + strconv.FormatInt(admin_user_id, 10) + "operator=" + roles.UserName
 
 			} else {
 				api = "http://192.168.5.251:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
-					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10)
 			}
 
 			resp, requestErr := http.Get(api)
@@ -422,32 +422,59 @@ func (c *HisApiController) ReadCard() {
 			}
 			var status string
 			status = respJSON["data"].(map[string]interface{})["status"].(string)
+			card_type := respJSON["data"].(map[string]interface{})["type"].(string)
+
+			var token string
+			var res ResultTwo           //1101结果
+			var res10265 ResultTwo10265 //1101结果
+			var card_info string        //卡信息
+			var busi_card_info string
+
+			card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
+			busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
 
 			if status == "0" { //读卡成功
-				var card_info string //卡信息
-				var busi_card_info string
-				var res ResultTwo           //1101结果
-				var res10265 ResultTwo10265 //1101结果
+				if card_type == "1" {
 
-				card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
-				busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
+					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+					result, _ := json.Marshal(respJSON)
 
-				fmt.Println(card_info)
-				fmt.Println(busi_card_info)
+					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res.ErrMsg = res10265.ErrMsg
+					infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+					res.Infcode = infocode
+					res.Output = res10265.Output
+					res.InfRefmsgid = res10265.InfRefmsgid
 
-				respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
-				result, _ := json.Marshal(respJSON)
+				} else {
+					//var card_info string //卡信息
+					//var busi_card_info string
+
+					token = respJSON["data"].(map[string]interface{})["token"].(string)
+					//busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
+
+					//fmt.Println(card_info)
+					//fmt.Println(busi_card_info)
+
+					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+					result, _ := json.Marshal(respJSON)
+
+					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res.ErrMsg = res10265.ErrMsg
+					infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+					res.Infcode = infocode
+					res.Output = res10265.Output
+					res.InfRefmsgid = res10265.InfRefmsgid
 
-				if err := json.Unmarshal([]byte(result), &res10265); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
 				}
-				res.ErrMsg = res10265.ErrMsg
-				infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
-				res.Infcode = infocode
-				res.Output = res10265.Output
-				res.InfRefmsgid = res10265.InfRefmsgid
 
 				if res.Infcode == 0 {
 					patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
@@ -460,34 +487,61 @@ func (c *HisApiController) ReadCard() {
 
 					} else {
 
-						bas := strings.Split(card_info, "|")
-						basNumber := bas[2]
-
-						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,
-							CardInfo:     card_info,
-							VerifyNumber: busi_card_info,
+						if card_type == "1" {
+							bas := strings.Split(card_info, "|")
+							basNumber := bas[2]
+							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,
+								CardInfo:     card_info,
+								VerifyNumber: busi_card_info,
+							}
+							service.CreateHisPsn(psn)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"patient": patient,
+								"number":  basNumber,
+							})
+						} else {
+							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,
+								CardInfo:     card_info,
+								VerifyNumber: token,
+							}
+							service.CreateHisPsn(psn)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"patient": patient,
+								"number":  token,
+							})
 						}
-						service.CreateHisPsn(psn)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"patient": patient,
-							"number":  basNumber,
-						})
 					}
 				} else {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
@@ -7934,6 +7988,7 @@ func (c *HisApiController) GetCheckAccount() {
 					PsnPay:    acct_pay,
 					Creator:   admin_user_id,
 					Ctime:     time.Now().Unix(),
+					ClrType:   clr_type,
 				}
 				err := service.CreateMedicalInsuranceCostCompareRecord(micc)
 				if err == nil {
@@ -8296,7 +8351,7 @@ func (c *HisApiController) GetSettleAccounts() {
 	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
 	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
 	orderInfos = append(orderInfos, orderInfos_two...)
-	//his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+	his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 
 	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 
@@ -8516,6 +8571,8 @@ func (c *HisApiController) GetSettleAccounts() {
 			res.Infcode = infocode
 
 		} else {
+			//result2 := service.Gdyb1101()
+
 			result2 := service.Gdyb5204(baseParams, businessParams)
 			saveLog(result2, "", "5204", "查询")
 			result := service.Gdyb5203(baseParams, businessParams)
@@ -8638,7 +8695,9 @@ func (c *HisApiController) GetSettleAccounts() {
 				"org_name":                                    miConfig.OrgName,
 				"org_code":                                    miConfig.Code,
 				"order_number":                                order.Number,
-				//"his":                                         his_hospital,
+				"his_hospital":                                his_hospital,
+				"his":                                         his,
+
 				//"check_order_info":                            cus_slice,
 			})
 		}

models/his_models.go

@@ -1048,6 +1048,7 @@ type MedicalInsuranceCostCompare struct {
 	PsnPay    float64 `gorm:"column:psn_pay" json:"psn_pay" form:"psn_pay"`
 	Creator   int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ClrType   string  `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
 }
 
 func (MedicalInsuranceCostCompare) TableName() string {

service/gdyb_service.go

@@ -786,6 +786,7 @@ type Custom struct {
 	ProvinceDrugMedListCodg string
 	ProvinceGoodMedListCodg string
 	IsUser                  int64
+	FeeOcurTime             string
 }
 
 type RequestResult struct {
@@ -848,7 +849,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	for _, item := range hisPrescription {
 		role, _ := GetAdminUserInfoByID(item.UserOrgId, new_doctor_id)
-
+		tm := time.Unix(item.PreTime, 0)
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 && subItem.BaseDrugLib.IsUser != 1 {
@@ -864,6 +865,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						HospApprFlag:     subItem.HospApprFlag,
 						DoctorNumber:     role.DoctorNumber,
 						DoctorName:       role.UserName,
+						FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 					}
 
 					customs = append(customs, cus)
@@ -887,6 +889,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							DoctorNumber:     role.DoctorNumber,
 							DoctorName:       role.UserName,
 							HospApprFlag:     -1,
+							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 						}
 						customs = append(customs, cus)
 					}
@@ -904,6 +907,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							HospApprFlag:     -1,
 							DoctorNumber:     role.DoctorNumber,
 							DoctorName:       role.UserName,
+							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 						}
 						customs = append(customs, cus)
 					}
@@ -947,7 +951,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["dise_codg"] = diag_code                       // 病种编码
 		feedetailInfo["rxno"] = ""                                   // 处方号
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
-		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额

service/hbyb_service.go

@@ -273,7 +273,10 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	var customs []*Custom
 
 	for _, item := range hisPrescription {
+		tm := time.Unix(item.PreTime, 0)
+
 		if item.Type == 1 { //药品
+
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				if len(subItem.BaseDrugLib.MedicalInsuranceNumber) > 0 {
 					//var randNum int
@@ -285,6 +288,7 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 						HospApprFlag:     subItem.BaseDrugLib.HospApprFlag,
+						FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 					}
 
 					customs = append(customs, cus)
@@ -307,6 +311,7 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.HisProject.MedicalCode,
 							HospApprFlag:     -1,
+							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 						}
 						customs = append(customs, cus)
 					}
@@ -322,6 +327,7 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 							MedListCodg:      subItem.GoodInfo.MedicalInsuranceNumber,
 							HospApprFlag:     -1,
+							FeeOcurTime:      tm.Format("2006-01-02 15:04:05"),
 						}
 						customs = append(customs, cus)
 					}
@@ -362,7 +368,7 @@ func Hbyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["dise_codg"] = ""                              // 病种编码
 		feedetailInfo["rxno"] = ""                                   // 处方号
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
-		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额

service/jsyb_service.go

@@ -109,6 +109,38 @@ func Jsyb1101A(certNo string, org_name string, doctor string, fixmedins_code str
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
 }
 
+func Jsyb1101B(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, request_url string, access_key string, Token string, cainfo string) (string, string) {
+	timestamp := time.Now().Unix()
+	//生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "1101" // 交易编码
+
+	inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+	inputData["card_sn"] = ""           // 卡识别码
+	inputData["certno"] = ""            // 证件号码
+	inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
+	inputData["begntime"] = ""         // 开始时间
+	inputData["psn_name"] = ""         // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	var inputLog string
+	bytesData, _ := json.Marshal(inputMessage)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url + "1101"
+	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), inputLog
+}
+
 // 门诊挂号
 func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, opera string, ipt_otp_no string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, doctor_name string, request_url string, access_key string, verify_number string, cainfo string) (string, string) {
 	fmt.Println(opera)
@@ -130,9 +162,13 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+	} else if id_card_type == 4 {
+		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 	} else {
 		inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+
 	}
 
 	inputData["ipt_otp_no"] = ipt_otp_no // 住院/门诊号
@@ -319,10 +355,11 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	timestamp2 := time.Now().Unix()
 
-	tempTime := time.Unix(timestamp2, 0)
-	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//tempTime := time.Unix(timestamp2, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	var customs []*Custom
 	for _, item := range hisPrescription {
+		tm := time.Unix(item.PreTime, 0)
 
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
@@ -340,6 +377,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						DoctorName:              new_doctor_name,
 						ProvinceDrugMedListCodg: "",
 						ProvinceGoodMedListCodg: "",
+						FeeOcurTime:             tm.Format("2006-01-02 15:04:05"),
 					}
 
 					if subItem.BaseDrugLib.DrugClassify == "2" {
@@ -369,6 +407,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							HospApprFlag:            -1,
 							ProvinceDrugMedListCodg: "",
 							ProvinceGoodMedListCodg: "",
+							FeeOcurTime:             tm.Format("2006-01-02 15:04:05"),
 						}
 						customs = append(customs, cus)
 					}
@@ -388,6 +427,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							DoctorName:              new_doctor_name,
 							ProvinceDrugMedListCodg: "",
 							ProvinceGoodMedListCodg: subItem.GoodInfo.ProvincesCode,
+							FeeOcurTime:             tm.Format("2006-01-02 15:04:05"),
 						}
 						customs = append(customs, cus)
 					}
@@ -432,7 +472,7 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["dise_codg"] = diag_code                       // 病种编码
 		feedetailInfo["rxno"] = ""                                   // 处方号
 		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
-		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
+		feedetailInfo["fee_ocur_time"] = item.FeeOcurTime            // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
@@ -547,6 +587,9 @@ func Jsyb2206(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"] = verify_number // 就诊凭证编号
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
@@ -607,6 +650,9 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else {
 			inputData["mdtrt_cert_type"] = "02"                       // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号