更新

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 {

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()

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

@@ -6827,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

@@ -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

@@ -500,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)
@@ -535,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)