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

controllers/js/jsyb_controller.go

@@ -1478,6 +1478,7 @@ func (c *JSybController) PostFour() {
 	}
 	fmt.Println(respJSON["psn_no"].(string))
 	fmt.Println(respJSON["mdtrt_id"].(string))
+	fmt.Println(respJSON["new_doctor_name"].(string))
 
 	psnNo := respJSON["psn_no"].(string)
 	mdtrtId := respJSON["mdtrt_id"].(string)
@@ -1492,6 +1493,8 @@ func (c *JSybController) PostFour() {
 	sick_name := respJSON["sick_name"].(string)
 	dept := respJSON["dept"].(string)
 
+	new_doctor_name := respJSON["new_doctor_name"].(string)
+
 	insuplc_admdvs := respJSON["insuplc_admdvs"].(string)
 	mdtrtarea_admvs := respJSON["mdtrtarea_admvs"].(string)
 	secret_key := respJSON["secret_key"].(string)
@@ -1503,7 +1506,7 @@ func (c *JSybController) PostFour() {
 
 	//cainfo := c.GetString("cainfo")
 
-	result, request_log, timeStamp := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak, begin_time, cainfo)
+	result, request_log, timeStamp := service.Jsyb2203(psnNo, mdtrtId, doctor, department, org_name, med_type, doctor_id, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name, dept, config, url, ak, begin_time, cainfo,new_doctor_name)
 	saveJsLog(result, request_log, "2203", "上传就诊信息", org_name)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
@@ -2176,41 +2179,83 @@ func (c *JSybController) Readcardchargeother() {
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
 	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 mdtrtarea_admvs == "320830"{
+			pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
+			pBusiCardInfo = Remove0000(pBusiCardInfo)
+
+			pCardInfo = Remove0000(pCardInfo)
+			fmt.Println(":", ConvertToString(pCardInfo, "gbk", "utf-8"))
+
+			fmt.Println(pCardInfo)
+			bas := strings.Split(pCardInfo, "|")
+			basNumber := bas[2]
+			id_card_no := bas[1]
+			card_sn := bas[3]
+
+			id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
+
+			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_int, 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 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"status": "-1",
+				})
 
-		id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
+			}
 
-		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_int, 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{
+			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]
+
+			id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
+
+			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_int, 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,
-				"type":           "1",
-			})
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"status": "-1",
-			})
+
 
 		}
+
 		break
 	case "3": //电子社保卡
 		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
@@ -2314,41 +2359,84 @@ func (c *JSybController) ReadCard() {
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
 	switch id_card_type {
 	case "1":
-		pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()
-		pBusiCardInfo = Remove0000(pBusiCardInfo)
-		pCardInfo = Remove0000(pCardInfo)
-		fmt.Println(":", ConvertToString(pCardInfo, "gbk", "utf-8"))
+		if mdtrtarea_admvs == "320830"{
+			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]
+
+			id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
+			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_int, 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 {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"status": "-1",
+				})
 
-		fmt.Println(pBusiCardInfo)
-		fmt.Println(pCardInfo)
-		bas := strings.Split(pCardInfo, "|")
-		basNumber := bas[2]
-		id_card_no := bas[1]
-		card_sn := bas[3]
+			}
 
-		id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
 
-		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_int, 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{
+			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]
+
+			id_card_type_int, _ := strconv.ParseInt(id_card_type, 10, 64)
+
+			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_int, 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,
-				"type":           "1",
-			})
-		} else {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"status": "-1",
-			})
+
 
 		}
+
 		break
 	case "3": //电子社保卡
 		_, pBusiCardInfo := c.GetELeInfo(fixmedins_code, operator_id, operator)
@@ -2486,14 +2574,21 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	//miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	str := make([]byte, 2048)
 	inputData := make(map[string]interface{})
-	inputData["IP"] = "10.58.65.240"
+
+	if code == "H32083002114"{
+		inputData["IP"] = "10.58.73.212"
+		inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
+
+	}else{
+		inputData["IP"] = "10.58.65.240"
+		inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
+	}
 	inputData["PORT"] = "8086"
 	inputData["TIMEOUT"] = "180"
 	inputData["LOG_PATH"] = "C:\\log\\"
 
 	//inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
 
-	inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
 	inputData["CARD_PASSTYPE"] = "1"
 	inputData["API_NAME"] = "hssServives"
 	inputData["API_VERSION"] = "1.0.0"
@@ -2521,6 +2616,73 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	//initFlag = 1
 	return
 }
+func (c *JSybController) GetjsBasBaseInfo() string {
+	DllDef := syscall.MustLoadDLL("SSCardDriver.dll")
+	readCard := DllDef.MustFindProc("iReadCardBas")
+	if readCard == nil {
+		fmt.Println("readcard is nil")
+		readCard = DllDef.MustFindProc("iReadCardBas")
+	}
+
+	//str := make([]byte, 1024)
+	str1 := make([]byte, 1024)
+	ret2, _, _ := readCard.Call(uintptr(3), (uintptr)(unsafe.Pointer(&str1[0])))
+
+	//file, err := os.Open("C:\\Users\\Administrator\\Desktop\\11\\Power-Card\\SSCardDriver\\api.log")
+	//if err != nil {
+	//	fmt.Println("Error opening file:", err)
+	//}
+	//defer file.Close()
+	//
+	//var lastProgram Program
+	//scanner := bufio.NewScanner(file)
+	//inProgram := false
+	//
+	//for scanner.Scan() {
+	//	line := scanner.Text()
+	//	if strings.Contains(line, "<program>") {
+	//		inProgram = true
+	//		programXML := "<program>"
+	//		for scanner.Scan() {
+	//			line = scanner.Text()
+	//			programXML += line
+	//			if strings.Contains(line, "</program>") {
+	//				programXML += "</program>"
+	//				break
+	//			}
+	//		}
+	//		if err := xml.Unmarshal([]byte(programXML), &lastProgram); err == nil {
+	//			// 解析成功，更新最后的 Program
+	//		}
+	//		inProgram = false
+	//	}
+	//}
+	//
+	//	fmt.Println("Error reading file:", inProgram)
+	//
+	//if err := scanner.Err(); err != nil {
+	//	fmt.Println("Error reading file:", err)
+
+	//}
+
+	// 输出最后一次的 Program
+	//fmt.Printf("最后一次的 <program>:\n")
+	//fmt.Printf("<program>\n")
+	//fmt.Printf("  <function_id>%s</function_id>\n", lastProgram.FunctionID)
+	//fmt.Printf("  <cardinfo>%s</cardinfo>\n", lastProgram.CardInfo)
+	//fmt.Printf("  <user>%s</user>\n", lastProgram.User)
+	//fmt.Printf("</program>\n")
+
+	fmt.Println(string(str1))
+	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+
+	if ret2 != 0 {
+		return ""
+	}
+
+	return string(str1)
+}
+
 func (c *JSybController) GetBasBaseInfo() (string, string) {
 	DllDef := syscall.MustLoadDLL("HeaSecReadInfo.dll")
 	readCard := DllDef.MustFindProc("ReadCardBas")

main.go

@@ -58,13 +58,13 @@ type ResultEmpty10265 struct {
 func init() {
 	//service.ConnectNMMSDB()
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//////CreateLog(miConfig)
-	//////UploadLog(miConfig)31
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)31
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 }
 func main() {
 	//service.AutoCreateStock()
@@ -707,7 +707,7 @@ type ResultSeventeen struct {
 //
 func GetblBatchSettleList() {
 	org_id, _ := beego.AppConfig.Int64("org_id")
-	org_id = 10028
+	org_id = 10610
 	var orders []*models.HisOrder
 	//var orders []*models.HisOrderError
 	orders, _ = service.GetAllHisOrder10138()
@@ -723,13 +723,13 @@ func GetblBatchSettleList() {
 			miConfig, _ := service.FindMedicalInsuranceInfo(order.UserOrgId)
 			var configTwo []*models.HisXtDiagnoseConfig
 			diagnosis_idstwo := strings.Split(his.Diagnosis, ",")
-			curRoles, _ := service.GetAdminUserInfoByID(org_id, 5320)
+			curRoles, _ := service.GetAdminUserInfoByID(org_id, 2185)
 			for _, item := range diagnosis_idstwo {
 				id, _ := strconv.ParseInt(item, 10, 64)
 				diagnosisConfig, _ := service.FindDiagnoseById(id)
 				configTwo = append(configTwo, &diagnosisConfig)
 			}
-			patient, _ := service.GetPatientByIDTwo(10028, order.PatientId)
+			patient, _ := service.GetPatientByIDTwo(10610, order.PatientId)
 
 			sickConfig, _ := service.FindSickById(his.SickType)
 			//if order.MedType == "1111" || order.MedType == "1112" {

models/models_3501.go

@@ -751,12 +751,12 @@ type Struct3512 struct {
 	Enddate        string `json:"enddate" validate:"required"`        // 结束日期
 	MedListCodg    string `json:"med_list_codg,omitempty"`            // 医疗目录编码
 	DrugTracCodg   string `json:"drug_trac_codg,omitempty"`           // 药品追溯码
-
+	InsuplcAdmdvs  string
+	MdtrtareaAdmvs string
 	OrgName        string
 	Opter          string
 	SecretKey      string
-	InsuplcAdmdvs  string
-	MdtrtareaAdmvs string
+
 	RequestUrl     string
 	AccessKey      string
 	Cainfo         string
@@ -773,17 +773,17 @@ type Result3512 struct {
 	InfRefmsgid string      `json:"inf_refmsgid"`
 	Infcode     int64       `json:"infcode"`
 	Output      []struct {
-		FixmedinsCode  string `json:"fixmedins_code,omitempty"`      // 定点医药机构编号
-		MedinsListCodg string `json:"medins_list_codg,omitempty"`    // 医药机构目录编码
-		FixmedinsBchno string `json:"fixmedins_bchno,omitempty"`     // 定点医药机构批次流水号
-		MedListCodg    string `json:"med_list_codg,omitempty"`       // 医疗目录编码
-		MedinsListName string `json:"medins_list_name,omitempty"`    // 医药机构目录名称
-		DrugTracCodg   string `json:"drug_trac_codg,omitempty"`      // 药品追溯码
-		ValiFlag       string `json:"vali_flag" validate:"required"` // 有效标志
-		OpterId        string `json:"opter_id,omitempty"`            // 经办人ID
-		CrterName      string `json:"crter_name,omitempty"`          // 创建人姓名
-		CrterId        string `json:"crter_id,omitempty"`            // 创建人ID
-		OptinsNo       string `json:"optins_no,omitempty"`           // 经办机构编号
+		FixmedinsCode  string
+		MedinsListCodg string
+		FixmedinsBchno string
+		MedListCodg    string
+		MedinsListName string
+		DrugTracCodg   string
+		ValiFlag       string
+		OpterId        string
+		CrterName      string
+		CrterId        string
+		OptinsNo       string
 
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`

service/fj_service.go

@@ -3106,19 +3106,18 @@ func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
 	nonce := GetRandomString(32)
 	//inputMessage := SetInputMessage(nonce, timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs)
 
-	inputMessage := SetFjInputMessage(nonce, timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Url, struct3505.AppId, struct3505.AppSecret, struct3505.SignKey, struct3505.Enckey)
+	inputMessage := SetFjInputMessage(nonce, timestamp, struct3505.OrgName, struct3505.Opter, struct3505.Code, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Url, struct3505.AppId, struct3505.AppSecret, struct3505.SignKey, struct3505.Enckey)
 
 	// 生成输入报文
 	//inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	druginputData := make(map[string]interface{})
 	//druginputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "3505"                                  // 交易编码
 	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3505.FixmedinsHilistName         // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
 
 	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
@@ -3159,11 +3158,16 @@ func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
 	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3505.Memo
 	inputData["mdtrt_setl_type"] = struct3505.MdtrtSetlType                            // 人员编号 （来自1101接口返回）
-	// 人员编号 （来自1101接口返回）
-	//druginputData["drug_trac_codg"] = ""
-	//druginputData2["drugtracinfo"] = druginputData
-	inputData["drug_trac_info"] = druginputData
-
+	feedetail := make([]map[string]interface{}, 0)
+	codes := strings.Split(struct3505.DrugTracCodg, ",")
+	for _, item := range codes {
+		if len(item) > 0 {
+			druginputData := make(map[string]interface{})
+			druginputData["drug_trac_codg"] =  removeNonDigits(item)
+			feedetail = append(feedetail, druginputData)
+		}
+	}
+	inputData["drug_trac_info"] = feedetail
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 

service/gdyb_service.go

@@ -3449,6 +3449,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	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          // 医疗机构填报人  必填
@@ -4067,6 +4068,8 @@ func Gdyb4101For10138(struct4101 Struct4101, secret_key string, org_name string,
 	inputData["pwcry_afadm_coma_dura"] = "" // 颅脑损伤患者入院后昏迷时长  必填
 
 	inputData["spga_nurscare_days"] = "" // 特级护理天数  必填
+	inputData["hsorg"] = struct4101.Hsorg                     // 医保机构  必填
+	inputData["hsorg_opter"] = struct4101.HsorgOpter          // 医保机构经办人  必填
 
 	inputData["lv1_nurscare_days"] = ""          // 一级护理天数  必填
 	inputData["scd_nurscare_days"] = ""          // 二级护理天数  必填
@@ -4084,7 +4087,7 @@ func Gdyb4101For10138(struct4101 Struct4101, secret_key string, org_name string,
 	//inputData["chfpdr_code"] = struct4101.DoctorCode          // 主诊医师代码  必填
 	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
 	inputData["setl_end_date"] = struct4101.SetlEndDate       // 结算结束日期  必填
-	inputData["medins_fill_dept"] = struct4101.MedinsFillDept // 医疗机构填报部门  必填
+	inputData["medins_fill_dept"] = org_name // 医疗机构填报部门  必填
 	inputData["medins_fill_psn"] = struct4101.MedinsFillPsn   // 医疗机构填报人  必填
 
 	//payinfo := make([]map[string]interface{}, 0) // 基金支付信息
@@ -6824,8 +6827,13 @@ func Gdyb3502(struct3502 models.Struct3502, secret_key string) (string, string)
 	codes := strings.Split(struct3502.DrugTracCodg, ",")
 	for _, item := range codes {
 		if len(item) > 0 {
+			//druginputData := make(map[string]interface{})
+			//druginputData["drug_trac_codg"] = item
+			//feedetail = append(feedetail, druginputData)
+
+
 			druginputData := make(map[string]interface{})
-			druginputData["drug_trac_codg"] = item
+			druginputData["drug_trac_codg"] =  removeNonDigits(item)
 			feedetail = append(feedetail, druginputData)
 		}
 	}

service/his_service.go

@@ -1570,7 +1570,7 @@ func GetAllHisOrder10106(org_id int64) (his []*models.HisOrder, err error) {
 	return
 }
 func GetAllHisOrder10138() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10028  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2024-11-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10610  AND status = 1  AND  order_status = 2 AND  setl_id <> '' AND setl_time >= '2024-12-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1581,7 +1581,7 @@ func GetOrderError10138() (order []*models.HisOrderError, err error) {
 
 func GetAllHisOrder10278() (his []*models.HisOrder, err error) {
 
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-11-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10278  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-12-01 00:00:00'  and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1801,7 +1801,7 @@ func GetNewDrugFlowInforTen(system_time int64, org_id int64) (flows []*models.Dr
 }
 
 func GetNewDrugFlowInforTenone(start_system_time int64, end_system_time int64, org_id int64) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info info on info.patient_id = xt_drug_flow.patient_id and info.drug_id = xt_drug_flow.drug_id and info.record_date = xt_drug_flow.system_time").Where("xt_drug_flow.user_org_id = ? and xt_drug_flow.status = 1 and xt_drug_flow.consumable_type = 3 and xt_drug_flow.is_sale = 0 and xt_drug_flow.system_time >= ? and xt_drug_flow.system_time <= ?", org_id, start_system_time, end_system_time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info info on info.patient_id = xt_drug_flow.patient_id and info.drug_id = xt_drug_flow.drug_id and info.record_date = xt_drug_flow.system_time and info.is_upload <> 1").Where("xt_drug_flow.user_org_id = ? and xt_drug_flow.status = 1 and xt_drug_flow.consumable_type = 3 and xt_drug_flow.is_sale = 0 and xt_drug_flow.system_time >= ? and xt_drug_flow.system_time <= ?", org_id, start_system_time, end_system_time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 and drug_code <> ''").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
@@ -2187,3 +2187,10 @@ func FindHisAdviceDocAdvice(id int64) (advice []*models.HisDoctorAdviceInfo, err
 	err = db.Find(&advice).Error
 	return advice, err
 }
+
+
+func FinddelHisAdviceDocAdvice(id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+	db := XTReadDB().Model(&advice).Where("status= 1 and id = ? and is_upload = 1", id)
+	err = db.Find(&advice).Error
+	return advice, err
+}

service/jsyb_service.go

@@ -1,16 +1,21 @@
 package service
 
 import (
+	"bytes"
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/base64"
+	"net/url"
 	//"bytes"
 	"encoding/json"
 	"fmt"
 	"gdyb/models"
 	"gdyb/utils/csbhttp"
-	//"io/ioutil"
+	"io/ioutil"
 	"net"
 	"strings"
 	"regexp"
-	//"net/http"
+	"net/http"
 	"strconv"
 	"time"
 )
@@ -199,6 +204,140 @@ 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 generateSignature(param string, secretKey string) (string, error) {
+	// 创建 HMAC-SHA1 哈希对象
+	hmacSha1 := hmac.New(sha1.New, []byte(secretKey))
+
+	// 更新数据
+	_, err := hmacSha1.Write([]byte(param))
+	if err != nil {
+		return "", err
+	}
+
+	// 计算哈希值
+	signature := hmacSha1.Sum(nil)
+
+	// 将结果转换为 Base64 编码
+	return base64.StdEncoding.EncodeToString(signature), nil
+}
+
+func Jsyb1101ooo(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates string, request_url string, access_key string, pBusiCardInfo string, id_card_no 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" // 交易编码
+
+	if certificates == "3" {
+		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
+		inputData["certno"] = certNo        // 证件号码
+		inputData["psn_cert_type"] = "99"   // 人员证件类型
+
+	} else {
+		if id_card_type == 1 {
+			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
+			inputData["card_sn"] = card_sn      // 卡识别码
+			inputData["certno"] = id_card_no    // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+
+		} else {
+			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = certNo        // 证件号码
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
+		}
+	}
+
+	inputData["mdtrt_cert_no"] = certNo  // 就诊凭证编号
+	inputData["begntime"] = ""                                // 开始时间
+	inputData["psn_name"] = ""                                // 人员姓名
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	//var inputLog string
+	bytesData, _ := json.Marshal(inputMessage)
+	reader := bytes.NewReader(bytesData)
+
+	//inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	request_url = request_url
+	fmt.Println(request_url)
+
+	request, err := http.NewRequest("POST", request_url, reader)
+
+	// 参数
+	_api_access_key := access_key
+	_api_name := "hssServives"
+	timestampInMilliseconds  := time.Now().Unix()
+
+	timestamp = timestampInMilliseconds
+	_api_timestamp := timestamp
+	_api_version := "1.0.0"
+	secretKey := secret_key
+
+	str := fmt.Sprintf("%d", _api_timestamp)
+
+	// 拼接参数
+	param := "_api_access_key=" + url.QueryEscape(_api_access_key) +
+		"&_api_name=" + url.QueryEscape(_api_name) +
+		"&_api_timestamp=" + url.QueryEscape(str) +
+		"&_api_version=" + url.QueryEscape(_api_version)
+	secret_key = strings.Replace(secret_key, "+", "%2B", -1)
+	fmt.Println("h8Z+d10iYI4B+kry0wgYSt5bFBs=")
+	secret_key  = "h8Z+d10iYI4B+kry0wgYSt5bFBs="
+	// 生成签名
+	signature, _ := generateSignature(param, secretKey)
+
+	fmt.Println("ak:")
+	fmt.Println(_api_access_key)
+	fmt.Println("sk:")
+	fmt.Println(secret_key)
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("_api_timestamp", str)
+	request.Header.Set("_api_name", _api_name)
+	request.Header.Set("_api_version",_api_version)
+	request.Header.Set("_api_access_key", _api_access_key)
+	request.Header.Set("_api_signature", signature)
+
+	fmt.Println(request)
+	fmt.Println(param)
+
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+
+	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(), ""
+	}
+	str2 := string(respBytes)
+	fmt.Println(str2)
+	return str2, string(bytesData)
+
+
+
+
+
+
+	//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, id_card_no string) (string, string) {
 	timestamp := time.Now().Unix()
 	//生成输入报文
@@ -282,8 +421,15 @@ func Jsyb2201(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 // 就诊凭证编号
+		if mdtrtarea_admvs == "320830"{
+			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number  // 就诊凭证编号
+		}else{
+			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+
+		}
+
 	} else if id_card_type == 3 {
 		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -354,8 +500,9 @@ func Jsyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 	return HttpRequest(request_url, access_key, secret_key, timestamp, string(bytesData)), requestLog
 }
 
+
 // 门诊就诊信息上传
-func Jsyb2203(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, request_url string, access_key string, begin_time string, cainfo string) (string, string, int64) {
+func Jsyb2203(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, request_url string, access_key string, begin_time string, cainfo string,doc_name string) (string, string, int64) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -389,7 +536,7 @@ func Jsyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		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["dise_dor_name"] = doc_name       // 诊断医生姓名
 		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
 		diseinfo_sun["vali_flag"] = "1"              // 有效标志
 		diseinfo = append(diseinfo, diseinfo_sun)
@@ -674,7 +821,6 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, request_url string, access_key string, cainfo string) (string, string) {
 
 	timestamp := time.Now().Unix()
-
 	// 生成输入报文
 	inputMessage := SetJSInputMessage(timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, cainfo)
 	input := make(map[string]interface{})
@@ -682,7 +828,7 @@ func Jsyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	inputMessage["infno"] = "2205" // 交易编码
 
 	inputData["mdtrt_id"] = mdtrtId  // 就诊 ID（来自2201接口返回）
-	inputData["chrg_bchno"] = "0000" // 收费批次号(来自2204生成的)
+	inputData["chrg_bchno"] = chrgBchno // 收费批次号(来自2204生成的)
 
 	inputData["psn_no"] = psnNo   // 人员编号 （来自1101接口返回）
 	inputData["exp_content"] = "" // 人员编号 （来自1101接口返回）
@@ -792,8 +938,17 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
 	} else {
 		if id_card_type == 1 {
-			inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+			if mdtrtarea_admvs == "320830"{
+
+				inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+				inputData["mdtrt_cert_no"] =  certNo + "|" + verify_number  // 就诊凭证编号
+
+			}else{
+				inputData["mdtrt_cert_type"] = "03"                       // 就诊凭证类型
+				inputData["mdtrt_cert_no"] = certNo + "|" + verify_number // 就诊凭证编号
+
+			}
+
 		} else if id_card_type == 3 {
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -976,7 +1131,8 @@ func HttpRequest(url string, ak string, sk string, timestamp int64, json string)
 	//设置 调用的服务名和版本
 	csbHP.SetApi("hssServives")
 	csbHP.SetVersion("1.0.0")
-
+	timestampInMilliseconds := time.Now().UnixNano() / 1e6
+	timestamp = timestampInMilliseconds
 	//添加附加的http请求头 (可以定义多条)
 	//key := "_api_access_key=" + ak + "&_api_name=" + "hssServives" + "&_api_timestamp=" + strconv.FormatInt(timestamp, 10) + "&_api_version=" + "1.0.0"
 	csbHP.AddHeader("_api_timestamp", strconv.FormatInt(timestamp, 10))
@@ -1041,9 +1197,12 @@ func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	if fixmedins_code == "H32090403023" {
 		inputMessage["opter"] = "葛美琴"      // 经办人
 		inputMessage["opter_name"] = "葛美琴" // 经办人姓名
-	} else {
+	} else if  fixmedins_code == "H32092103007"{
 		inputMessage["opter"] = "孙欣欣"      // 经办人
 		inputMessage["opter_name"] = "孙欣欣" // 经办人姓名
+	} else {
+		inputMessage["opter"] =   doctor    // 经办人
+		inputMessage["opter_name"] = doctor // 经办人姓名
 	}
 	inputMessage["inf_time"] = timeFormatOne        // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code // 定点医药机构编号