更新

common/crypto.go

@@ -0,0 +1,41 @@
+package common
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+)
+
+const (
+	// HMAC签名算法
+	HMAC_SHA256 = "HMAC-SHA256"
+)
+
+// HMAC_Sha256 加密
+func HMAC_Sha256(data string, secret string) []byte {
+	h := hmac.New(sha256.New, []byte(secret))
+	h.Write([]byte(data))
+	return h.Sum(nil)
+}
+
+// RSASHA256 加密
+// func RSASHA256(data string, Key string) (string, error) {
+// 	h := sha256.New()
+// 	h.Write([]byte(data))
+// 	hashed := h.Sum(nil)
+// 	block, _ := pem.Decode([]byte(Key))
+// 	if block == nil {
+// 		return "", errors.New("private key error")
+// 	}
+
+// 	privateKey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+// 	if err != nil {
+// 		return "", err
+// 	}
+
+// 	signature, err := rsa.SignPKCS1v15(cryptorand.Reader, privateKey, crypto.SHA256, hashed)
+// 	if err != nil {
+// 		return "", err
+// 	}
+
+// 	return base64.StdEncoding.EncodeToString(signature), nil
+// }

common/json.go

@@ -0,0 +1,29 @@
+package common
+
+import (
+	"encoding/json"
+	"gdyb/utils"
+
+)
+
+func GetPostDataWithMap(post map[string]interface{}) (string, error) {
+	//json := jsoniter.Config{
+	//	MarshalFloatWith6Digits: true,
+	//	EscapeHTML:              false,
+	//	SortMapKeys:             true, //本身高灯平台仅要求对最外层json key进行asci码升序排序，但map是无序且随机的，所以签名和post数据均排序以保持一致
+	//	UseNumber:               true,
+	//	DisallowUnknownFields:   false,
+	//	CaseSensitive:           true,
+	//}.Froze()
+
+	s, err := json.Marshal(&post)
+	utils.ErrorLog("解析失败：%v", post)
+	utils.ErrorLog("解析失败：%v", err)
+	utils.ErrorLog("解析失败：%v",string(s))
+
+	if err != nil {
+		return "", err
+	}
+
+	return string(s), nil
+}

common/rand.go

@@ -0,0 +1,27 @@
+package common
+
+import (
+	"fmt"
+	"math/rand"
+	"strings"
+	"time"
+)
+
+const (
+	numLen = 10 //随机序列长度
+)
+
+var (
+	numeric = [numLen]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9} //随机序列
+)
+
+func GetRand(width int) string {
+	r := len(numeric)
+	rand.Seed(time.Now().UnixNano())
+
+	var sb strings.Builder
+	for i := 0; i < width; i++ {
+		fmt.Fprintf(&sb, "%d", numeric[rand.Intn(r)])
+	}
+	return sb.String()
+}

controllers/coordinate/coordinate_controller.go

@@ -3124,6 +3124,88 @@ func (c *CoordinateController) NMGSettleAccount() {
 		var recordStartTime int64
 		var recordEndTime int64
 
+		var dias []string
+		start_time_str := c.GetString("start_time")
+		end_time_str := c.GetString("end_time")
+		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordStartTime = theStartTime.Unix()
+		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordEndTime = theEndTime.Unix()
+		if settle_accounts_type == 1{
+			patientPrescription, _ := service.FindPatientPrescriptionInfoTwo(org_id, patient.ID, recordDateTime, 2)
+			if patientPrescription.ID == 0 {
+				patientPrescription, _ = service.FindLastPatientPrescriptionInfo(org_id, patient.ID, recordDateTime)
+			}
+			diass := strings.Split(patientPrescription.Diagnosis,",")
+			for _, subdiaitem := range  diass{
+				if subdiaitem != "716"{
+					dias = append(dias,subdiaitem)
+				}
+
+			}
+
+
+		}else {
+			var recordStartTime2 int64
+			var recordEndTime2 int64
+
+			start_time_str2 := c.GetString("start_time")
+			end_time_str2 := c.GetString("end_time")
+			theStartTime2, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str2+" 00:00:00", loc)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			recordStartTime2 = theStartTime2.Unix()
+			theEndTime2, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str2+" 00:00:00", loc)
+			if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			recordEndTime2 = theEndTime2.Unix()
+			patientPrescription, _ := service.FindPatientPrescriptionInfoThree(org_id, patient.ID, recordStartTime2, recordEndTime2, 2)
+			for _, spinfo := range patientPrescription {
+				fmt.Println(spinfo.Diagnosis)
+
+				diass := strings.Split(spinfo.Diagnosis,",")
+				fmt.Println(diass)
+				for _, dia := range diass {
+					fmt.Println(dia)
+
+					if dia != "716" {
+						dias = append(dias,dia)
+					}
+				}
+
+			}
+		}
+
+		newArr := make([]string, 0)
+		for i := 0; i < len(dias); i++ {
+			repeat := false
+			for j := i + 1; j < len(dias); j++ {
+				if dias[i] == dias[j] {
+					repeat = true
+					break
+				}
+			}
+			if !repeat {
+				newArr = append(newArr, dias[i])
+			}
+		}
+
+
+
+
+
 		var prescriptions []models.HisPrescription
 		if settle_accounts_type == 1 { //日结
 			prescriptions, _ = service.GetUnSettleHisPrescriptionFiveone(p_id)
@@ -3855,13 +3937,13 @@ func (c *CoordinateController) NMGSettleAccount() {
 								}
 								if subitem.HisProject.CostClassify == 3 {
 									var ie_cbm1 models.IEtwo
-									if subitem.TeamId > 0{
-										//ie_cbm1.BBX01 = subitem.HisProject.
-										team := service.GetBbx01ByTeamID(subitem.TeamId)
-										ie_cbm1.BBX01 = team.Bbx01
-									}else{
-										ie_cbm1.BBX01 = subitem.HisProject.ZuobiaoId
-									}
+									//if subitem.TeamId > 0{
+									//	//ie_cbm1.BBX01 = subitem.HisProject.
+									//	team := service.GetBbx01ByTeamID(subitem.TeamId)
+									//	ie_cbm1.BBX01 = team.Bbx01
+									//}else{
+									ie_cbm1.BBX01 = subitem.HisProject.ZuobiaoId
+									//}
 									ie_cbm1.CBMID = strconv.FormatInt(int64(item.ID), 10)
 									ie_cbm1.VAF04 = strconv.FormatInt(int64(li.Acf01), 10)
 									ie_cbm1.VAA01 = strconv.FormatInt(int64(li.Vaa01), 10)
@@ -4094,12 +4176,78 @@ func (c *CoordinateController) NMGSettleAccount() {
 							ie_cbm1.VAO26 = ""
 							ie_cbm1.IAD04 = ""
 							ie_cbm1.IAD01 = ""
+							ie_cbm1.VAO25 = "1"
+							ie_cbm1.VAO35 = ""
+							vAO1.Ie = append(vAO1.Ie, ie_cbm1)
+						}
+					}
+				}
+
+
+
+				for index, item := range big_ps[start-1 : stop] {
+					//sick, _ := service.FindSickById(sick_type)
+					//item.VMHisPrescriptionInfo.Diagnosis = "716"
+					//dias := strings.Split(item.VMHisPrescriptionInfo.Diagnosis, ",")
+					//service.get
+
+					//诊断
+					for _, subitem := range newArr {
+						diagnosisConfig, _ := service.FindDiagnoseByIdtwo(subitem)
+						if index == 0 {
+							var ie_cbm1 models.IEthree
+							ie_cbm1.CBMID = strconv.FormatInt(int64(item.ID), 10)
+							//ie_cbm1.CBMID = strconv.FormatInt(int64(index+1), 10)
+							ie_cbm1.VAA01 = strconv.FormatInt(int64(li.Vaa01), 10)
+							ie_cbm1.VAA07 = strconv.FormatInt(int64(li.Vaa07), 10)
+							ie_cbm1.ACF01 = strconv.FormatInt(int64(li.Acf01), 10)
+							ie_cbm1.VAO06 = strconv.FormatInt(int64(index+1), 10)
+							ie_cbm1.VAO07 = "1"
+							ie_cbm1.VAO10 = "0"
+							ie_cbm1.VAO11 = "1"
+							ie_cbm1.BAK01A =""
+							ie_cbm1.CAM01 = diagnosisConfig.ContentCode
+							ie_cbm1.VAO15 = diagnosisConfig.ClassName
+							ie_cbm1.VAO18 = "0"
+							ie_cbm1.VAO22 = "1"
+							ie_cbm1.IAA01 = ""
+							ie_cbm1.IAD03 = ""
+							ie_cbm1.BAK01B = ""
+							ie_cbm1.VAO26 = ""
+							ie_cbm1.IAD04 = ""
+							ie_cbm1.IAD01 = ""
+							ie_cbm1.VAO25 = "2"
+							ie_cbm1.VAO35 = ""
+							vAO1.Ie = append(vAO1.Ie, ie_cbm1)
+
+						} else {
+							var ie_cbm1 models.IEthree
+							ie_cbm1.CBMID = strconv.FormatInt(int64(item.ID), 10)
+							ie_cbm1.VAA01 = strconv.FormatInt(int64(li.Vaa01), 10)
+							ie_cbm1.VAA07 = strconv.FormatInt(int64(li.Vaa07), 10)
+							ie_cbm1.ACF01 = strconv.FormatInt(int64(li.Acf01), 10)
+							ie_cbm1.VAO06 = strconv.FormatInt(int64(index+1), 10)
+							ie_cbm1.VAO07 = "1"
+							ie_cbm1.VAO10 = "0"
+							ie_cbm1.VAO11 = "1"
+							ie_cbm1.BAK01A = ""
+							ie_cbm1.CAM01 = diagnosisConfig.ContentCode
+							ie_cbm1.VAO15 = diagnosisConfig.ClassName
+							ie_cbm1.VAO18 = "0"
+							ie_cbm1.VAO22 = "1"
+							ie_cbm1.IAA01 = ""
+							ie_cbm1.IAD03 = ""
+							ie_cbm1.BAK01B = ""
+							ie_cbm1.VAO26 = ""
+							ie_cbm1.IAD04 = ""
+							ie_cbm1.IAD01 = ""
 							ie_cbm1.VAO25 = "2"
 							ie_cbm1.VAO35 = ""
 							vAO1.Ie = append(vAO1.Ie, ie_cbm1)
 						}
 					}
 				}
+
 				////
 				//////检验检查医嘱
 				//for _, item := range prescriptions{
@@ -4147,7 +4295,6 @@ func (c *CoordinateController) NMGSettleAccount() {
 				client := &http.Client{}
 				fmt.Println(string(xmlStr2))
 				saveLog("", string(xmlStr2), "1111", "上传明细xml", "")
-
 				req, _ = http.NewRequest("POST", "http://127.0.0.1:9532/"+"nmg/coordinate/upload", bytes.NewBufferString(string(bytesData)))
 				resp, _ := client.Do(req)
 				defer resp.Body.Close()
@@ -4583,7 +4730,7 @@ func (c *CoordinateController) NMGSettleAccount() {
 			}
 
 			// 输出JSON字符串
-			fmt.Println(string(jsonString))
+			//fmt.Println(string(jsonString))
 			saveLog("", string(jsonString), "1111333", "122222224444", "")
 
 
@@ -4826,7 +4973,7 @@ func (c *CoordinateController) NMGSettleAccount() {
 						ie_cbm1.CBM07 = "10"
 					}
 					if item.MedType == "190"{
-						ie_cbm1.CBM06 = "1"
+						ie_cbm1.CBM07 = "1"
 					}
 
 					ie_cbm1.BCK01B = strconv.FormatInt(int64(li.Bck01B), 10)
@@ -5622,11 +5769,11 @@ func (c *CoordinateController) NMGSettleAccount() {
 				for index, item := range big_ps[start-1 : stop] {
 					sick, _ := service.FindSickById(sick_type)
 					item.VMHisPrescriptionInfo.Diagnosis = "716"
-					dias := strings.Split(item.VMHisPrescriptionInfo.Diagnosis, ",")
+					diass := strings.Split(item.VMHisPrescriptionInfo.Diagnosis, ",")
 					//service.get
 
 					//诊断
-					for _, subitem := range dias {
+					for _, subitem := range diass {
 						diagnosisConfig, _ := service.FindDiagnoseByIdtwo(subitem)
 						if index == 0 {
 							var ie_cbm1 models.IEthree
@@ -5675,12 +5822,86 @@ func (c *CoordinateController) NMGSettleAccount() {
 							ie_cbm1.VAO26 = ""
 							ie_cbm1.IAD04 = ""
 							ie_cbm1.IAD01 = ""
+							ie_cbm1.VAO25 = "1"
+							ie_cbm1.VAO35 = ""
+							vAO1.Ie = append(vAO1.Ie, ie_cbm1)
+						}
+					}
+				}
+
+
+				for index, item := range big_ps[start-1 : stop] {
+					//sick, _ := service.FindSickById(sick_type)
+					//item.VMHisPrescriptionInfo.Diagnosis = "716"
+					//dias := strings.Split(item.VMHisPrescriptionInfo.Diagnosis, ",")
+					//service.get
+					//诊断
+					for _, subitem := range newArr {
+						diagnosisConfig, _ := service.FindDiagnoseByIdtwo(subitem)
+						//fmt.Println("6666666666666")
+						//fmt.Println(diagnosisConfig)
+						jsonString2, err := json.Marshal(diagnosisConfig)
+						if err != nil {
+							fmt.Println("转换失败:", err)
+							return
+						}
+						saveLog("", string(jsonString2), "444", "55555", "")
+
+						if index == 0 {
+							var ie_cbm1 models.IEthree
+							ie_cbm1.CBMID = strconv.FormatInt(int64(item.ID), 10)
+							//ie_cbm1.CBMID = strconv.FormatInt(int64(index+1), 10)
+							ie_cbm1.VAA01 = strconv.FormatInt(int64(li.Vaa01), 10)
+							ie_cbm1.VAA07 = strconv.FormatInt(int64(li.Vaa07), 10)
+							ie_cbm1.ACF01 = strconv.FormatInt(int64(li.Acf01), 10)
+							ie_cbm1.VAO06 = strconv.FormatInt(int64(index+1), 10)
+							ie_cbm1.VAO07 = "1"
+							ie_cbm1.VAO10 = "0"
+							ie_cbm1.VAO11 = "1"
+							ie_cbm1.BAK01A = ""
+							ie_cbm1.CAM01 = diagnosisConfig.ContentCode
+							ie_cbm1.VAO15 = diagnosisConfig.ClassName
+							ie_cbm1.VAO18 = "0"
+							ie_cbm1.VAO22 = "1"
+							ie_cbm1.IAA01 = ""
+							ie_cbm1.IAD03 = ""
+							ie_cbm1.BAK01B = ""
+							ie_cbm1.VAO26 = ""
+							ie_cbm1.IAD04 = ""
+							ie_cbm1.IAD01 = ""
+							ie_cbm1.VAO25 = "2"
+							ie_cbm1.VAO35 = ""
+							vAO1.Ie = append(vAO1.Ie, ie_cbm1)
+
+						} else {
+							var ie_cbm1 models.IEthree
+							ie_cbm1.CBMID = strconv.FormatInt(int64(item.ID), 10)
+							ie_cbm1.VAA01 = strconv.FormatInt(int64(li.Vaa01), 10)
+							ie_cbm1.VAA07 = strconv.FormatInt(int64(li.Vaa07), 10)
+							ie_cbm1.ACF01 = strconv.FormatInt(int64(li.Acf01), 10)
+							ie_cbm1.VAO06 = strconv.FormatInt(int64(index+1), 10)
+							ie_cbm1.VAO07 = "1"
+							ie_cbm1.VAO10 = "0"
+							ie_cbm1.VAO11 = "1"
+							ie_cbm1.BAK01A = ""
+							ie_cbm1.CAM01 = diagnosisConfig.ContentCode
+							ie_cbm1.VAO15 = diagnosisConfig.ClassName
+							ie_cbm1.VAO18 = "0"
+							ie_cbm1.VAO22 = "1"
+							ie_cbm1.IAA01 = ""
+							ie_cbm1.IAD03 = ""
+							ie_cbm1.BAK01B = ""
+							ie_cbm1.VAO26 = ""
+							ie_cbm1.IAD04 = ""
+							ie_cbm1.IAD01 = ""
 							ie_cbm1.VAO25 = "2"
 							ie_cbm1.VAO35 = ""
 							vAO1.Ie = append(vAO1.Ie, ie_cbm1)
 						}
 					}
 				}
+
+
 				////
 				//////检验检查医嘱
 				//for _, item := range prescriptions{
@@ -5728,6 +5949,7 @@ func (c *CoordinateController) NMGSettleAccount() {
 				client := &http.Client{}
 				fmt.Println(string(xmlStr2))
 				saveLog("", string(xmlStr2), "1111", "上传明细xml", "")
+
 				req, _ = http.NewRequest("POST", "http://127.0.0.1:9532/"+"nmg/coordinate/upload", bytes.NewBufferString(string(bytesData)))
 				resp, _ := client.Do(req)
 				defer resp.Body.Close()

controllers/hb/hbyb_controller.go

@@ -57,9 +57,17 @@ func HbybRegistRouters() {
 	beego.Router("/hbyb/2305", &HBybController{}, "get:Post2305")
 
 
+	beego.Router("/hbyb/3204", &HBybController{}, "post:Post3204")
+	beego.Router("/hbyb/8404", &HBybController{}, "post:Post8404")
+	beego.Router("/hbyb/3204a", &HBybController{}, "post:Post3204a")
+
+
+
 
 }
 
+
+
 func (c *HBybController) Post2401() {
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
 	var respJSON map[string]interface{}
@@ -485,6 +493,94 @@ func (c *HBybController) Post3202a() {
 }
 
 
+func (c *HBybController) Post3204a() {
+
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	userJSONBytes, _ := json.Marshal(respJSON["bps"])
+	var bps []*models.BusinessParamsTwo
+	if err := json.Unmarshal(userJSONBytes, &bps); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+
+	result := service.Hbyb3204a(baseParams, bps)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+
+
+func (c *HBybController) Post3204() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+	result := service.Hbyb3204(baseParams, respJSON["id"].(string))
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+
+
+func (c *HBybController) Post8404() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	var baseParams models.BaseParams
+	baseParams.InsuplcAdmdvs = respJSON["insuplc_admdvs"].(string)
+	baseParams.MdtrtareaAdmvs = respJSON["mdtrtarea_admvs"].(string)
+	baseParams.OrgName = respJSON["org_name"].(string)
+	baseParams.Doctor = respJSON["doctor"].(string)
+	baseParams.FixmedinsCode = respJSON["fixmedins_code"].(string)
+	result := service.Hbyb8404(baseParams,respJSON["month"].(string))
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}
+
+
+
 func (c *HBybController) Post1608() {
 
 	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)

controllers/js/jsyb_controller.go

@@ -1058,14 +1058,14 @@ func (c *JSybController) Get3507() {
 	}
 
 	userJSONBytes, _ := json.Marshal(respJSON["struct_3507s"])
-	var struct3507 []models.Struct3507
+	var struct3507 models.Struct3507
 	if err := json.Unmarshal(userJSONBytes, &struct3507); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
 
-	result, request_log := service.Jsyb3507(struct3507[0])
-	saveJsLog(result, request_log, "3507", "库存盘点", struct3507[0].OrgName)
+	result, request_log := service.Jsyb3507(struct3507)
+	saveJsLog(result, request_log, "3507", "库存盘点", struct3507.OrgName)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 	} else {

controllers/zh/zh_his_api_controller.go

@@ -1549,7 +1549,7 @@ func (c *ZHHisApiController) GetZHPatientInfo() {
 				insuplc_admdvs = miConfig.InsuplcAdmdvs
 			}
 
-			result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 1, patient.Name,admin_user_id)
+			result, request_log, result_log = service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, insuplc_admdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 2, "", 1, "",admin_user_id)
 			saveLog(result_log, request_log, "1101", "人员基本信息获取")
 		}
 		//result := service.Gdyb1101A(id_card_no, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, patient.Name)
@@ -3805,7 +3805,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		for _, item := range prescriptions {
 			if item.Type == 1 { //药品
 				for _, subItem := range item.HisDoctorAdviceInfo {
-					if len(subItem.BaseDrugLib.MedicalInsuranceNumber) == 0 {
+					if len(subItem.BaseDrugLib.MedicalInsuranceNumber) == 0 &&  subItem.Price > 0{
 
 						empty_code_errs = append(empty_code_errs,subItem.BaseDrugLib.DrugName)
 					}
@@ -3817,12 +3817,12 @@ func (c *ZHHisApiController) GetUploadInfo() {
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
 					if subItem.Type == 2 {
-						if len(subItem.HisProject.MedicalCode) == 0 {
+						if len(subItem.HisProject.MedicalCode) == 0  &&  subItem.Price > 0{
 							empty_code_errs = append(empty_code_errs,subItem.HisProject.ProjectName)
 
 						}
 					} else if subItem.Type == 3 {
-						if len(subItem.GoodInfo.MedicalInsuranceNumber) == 0 {
+						if len(subItem.GoodInfo.MedicalInsuranceNumber) == 0 &&  subItem.Price > 0 {
 							empty_code_errs = append(empty_code_errs,subItem.GoodInfo.GoodName)
 
 						}
@@ -3850,7 +3850,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 			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 {
 						//var randNum int
 						//randNum = rand.Intn(10000) + 1000
 						cus := &models.NewCustom{
@@ -3865,7 +3864,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 						}
 
 						customs = append(customs, cus)
-					}
+
 				}
 			}
 
@@ -3874,7 +3873,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 					//var randNum int
 					//randNum = rand.Intn(10000) + 1000
 					if subItem.Type == 2 {
-						if len(subItem.HisProject.MedicalCode) > 0 {
 							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 							cus := &models.NewCustom{
 								DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
@@ -3887,11 +3885,9 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								DoctorId:         item.Creator,
 							}
 							customs = append(customs, cus)
-						}
+
 					} else if subItem.Type == 3 {
-						if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 && subItem.GoodInfo.IsUser != 1 {
 							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-
 							cus := &models.NewCustom{
 								DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*cnt),
 								Cut:              fmt.Sprintf("%.4f", cnt),
@@ -3903,13 +3899,10 @@ func (c *ZHHisApiController) GetUploadInfo() {
 								DoctorId:         item.Creator,
 							}
 							customs = append(customs, cus)
-						}
 					}
 				}
 			}
-
 		}
-
 		//总页数,向上取整,注意除之前要先转换类型为float64
 		pagecount = int(math.Ceil(float64(len(customs)) / float64(pagesize)))
 		var ress []*ResultFour

invoice/sdk.go

@@ -0,0 +1,89 @@
+package invoice
+
+import (
+	"encoding/base64"
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+
+	"gdyb/common"
+)
+
+func NewSdk(algorithm, appkey, appsecret, privateKey, env string) *Client {
+	return &Client{
+		env:        env,
+		appkey:     appkey,
+		appsecret:  appsecret,
+		algorithm:  algorithm,
+		privateKey: privateKey,
+	}
+}
+
+type Client struct {
+	env        string
+	appkey     string
+	appsecret  string
+	privateKey string
+	algorithm  string
+}
+
+func (this *Client) HttpPost(baseUrl string, routerAddress string, post map[string]interface{}) ([]byte, error) {
+
+	// 获取转换后的post字符串
+	postData, err := common.GetPostDataWithMap(post)
+	if err != nil {
+		return nil, err
+	}
+
+	timestamp := strconv.FormatInt(time.Now().Unix(), 10)                //获取时间戳
+	nonce := common.GetRand(6)                                           //6位随机数
+	auth, err := this.getAuth(routerAddress, postData, timestamp, nonce) //认证串
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{}
+
+	reqest, err := http.NewRequest("POST", baseUrl+routerAddress, strings.NewReader((postData)))
+	if err != nil {
+		return nil, err
+	}
+
+	reqest.Header.Add("Authorization", auth)
+	reqest.Header.Add("Content-Type", "application/json")
+
+	r, err := client.Do(reqest)
+	if err != nil {
+		return nil, err
+	}
+	defer r.Body.Close()
+
+	return ioutil.ReadAll(r.Body)
+}
+
+// getAuth 获取授权字符串
+func (this *Client) getAuth(routerAddress string, postData string, timestamp string, nonce string) (string, error) {
+
+	originStr := "algorithm=" + this.algorithm + "|appkey=" + this.appkey + "|nonce=" + nonce + "|timestamp=" + timestamp + "|" + routerAddress + "|" + postData
+
+	var signs string
+	var err error
+	switch this.algorithm {
+	case common.HMAC_SHA256:
+		signs = base64.StdEncoding.EncodeToString(common.HMAC_Sha256(originStr, this.appsecret))
+	default:
+		panic(errors.New("algorithm not exists"))
+	}
+
+	if err != nil {
+		return "", err
+	}
+
+	auth := "algorithm=" + this.algorithm + ",appkey=" + this.appkey + ",nonce=" + nonce + ",timestamp=" + timestamp + ",signature=" + signs
+
+	return auth, nil
+}

main.go

@@ -1,8 +1,5 @@
 package main
 
-
-
-
 import (
 	_ "gdyb/routers"
 	 "gdyb/service"
@@ -15,28 +12,58 @@ import (
 	"os"
 	"fmt"
 	"github.com/astaxie/beego"
-	//"github.com/qiniu/api.v7/auth/qbox"
-	//"github.com/qiniu/api.v7/storage"
-	//"github.com/qiniu/roapi.v7/auth/qbox"
-	//"github.com/qiniu/api.v7/storage"
-	//"strconv"
-	//"time"
+	"github.com/shopspring/decimal"
+	"net/http"
+	"bytes"
+	"io/ioutil"
 )
+type ResultSeventeenOther struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     string `json:"infcode"`
+	Output      struct {
+		SetlListId string `json:"setl_list_id"`
+	} `json:"output"`
+	RefmsgTime  string `json:"refmsg_time"`
+	RespondTime string `json:"respond_time"`
+	Signtype    string `json:"signtype"`
+	WarnInfo    string `json:"warn_info"`
+}
+type ResultSix struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+type ResultEmpty10265 struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     string      `json:"infcode"`
+	Output      struct {
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
 
 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()
@@ -49,7 +76,7 @@ func main() {
 
 	//深圳百霖
 	//GetblBatchSettleList()
-	//GetblbrBatchSettleList()8
+	//GetblbrBatchSettleList()
 	//深圳百霖贝尔
 	//GetbrBatchSettleList()
 
@@ -65,7 +92,8 @@ func main() {
 
 	//赤峰费森
 	//GetcfBatchSettleList()
-
+	//GetNMSettleListHospital()
+	//Get4202()
 	beego.Run()
 
 }
@@ -5114,3 +5142,631 @@ func saveLog(result string, request string, infno string, desc string) {
 ////	}
 ////	fmt.Println(ret.Key, ret.Hash)
 ////}
+func  GetNMSettleListHospital() {
+	admin_user_id :=   int64(2738)
+	var orders []*models.HisOrder
+	orders, _ = service.GetAllHisOrder10265()
+	for _, item := range orders{
+		order_id := item.ID
+		order, _ := service.GetHisOrderByIDTwo(order_id)
+		roles, _ := service.GetDoctorListTwo(10265)
+		his, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+		admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
+		curRoles, _ := service.GetAdminUserInfoByID(10265, admin_user_id)
+		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
+		miConfig, _ := service.FindMedicalInsuranceInfo(10265)
+		if order.ID == 0 {
+			continue
+		}
+		struct4101 := service.Struct4101{
+			PsnNo:          order.PsnNo,
+			MdtrtId:        order.MdtrtId,
+			SetlId:         order.SetlId,
+			PsnName:        order.PsnName,
+			Gend:           order.Gend,
+			Brdy:           his.Brdy,
+			Age:            int64(order.Age),
+			Naty:           order.Naty,
+			PatnCertType:   "01",
+			Certno:         order.Certno,
+			Prfs:           "90",
+			ConerName:      roles[0].UserName,
+			PatnRlts:       "99",
+			ConerAddr:      miConfig.OrgName,
+			ConerTel:       admin.Mobile,
+			HiType:         order.Insutype,
+			Insuplc:        miConfig.InsuplcAdmdvs,
+			MaindiagFlag:   "1",
+			BillCode:       order.SetlId,
+			BillNo:         order.SetlId,
+			BizSn:          order.Number,
+			PsnSelfPay:     order.PsnPartAmt,
+			PsnOwnPay:      order.PsnPartAmt,
+			AcctPay:        order.AcctPay,
+			PsnCashpay:     order.PsnCashPay,
+			HiPaymtd:       "1",
+			Hsorg:          miConfig.InsuplcAdmdvs,
+			HsorgOpter:     miConfig.InsuplcAdmdvs,
+			MedinsFillPsn:  curRoles.UserName,
+			MedinsFillDept: depart.Name,
+			IptMedType:     "2",
+			AdmTime:        his.InHosptialTime,
+			AdmEndTime:     his.OutHosptialTime,
+		}
+		struct4101.SetlBegnDate = order.SetlTime
+		struct4101.SetlEndDate = order.SetlTime
+
+
+		var tempDiaginfos []service.DiaginfoStructTwo
+		var tempOpspdiseinfo2 service.OpspdiseinfoStruct
+		var tempOpspdiseinfos []service.OpspdiseinfoStruct
+
+		diagnosis_ids_arr := strings.Split(his.Diagnosis, ",")
+		diagnosis_ids_arr = RemoveRepeatedPurviewElement2(diagnosis_ids_arr)
+
+
+			var config []*models.HisXtDiagnoseConfig
+			for _, item := range diagnosis_ids_arr {
+				id, _ := strconv.ParseInt(item, 10, 64)
+				diagnosisConfig, _ := service.FindDiagnoseById(id)
+				if diagnosisConfig.ID > 0 {
+					config = append(config, &diagnosisConfig)
+				}
+			}
+			for index, item := range config {
+				if item.ID > 0 {
+					if index == 0 {
+						var tempDiaginfo service.DiaginfoStructTwo
+						tempDiaginfo.DiagCode = item.CountryCode
+						tempDiaginfo.DiagName = item.CountryContentName
+						tempDiaginfo.DiagType = "1"
+						tempDiaginfo.MaindiagFlag = "1"
+						tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+					} else {
+						var tempDiaginfo service.DiaginfoStructTwo
+						tempDiaginfo.DiagCode = item.CountryCode
+						tempDiaginfo.DiagName = item.CountryContentName
+						tempDiaginfo.DiagType = "1"
+						tempDiaginfo.MaindiagFlag = "0"
+						tempDiaginfos = append(tempDiaginfos, tempDiaginfo)
+					}
+				}
+			}
+			struct4101.Diseinfo = tempDiaginfos
+
+
+
+		sickConfigTwo, _ := service.FindSickById(his.SickType)
+		tempOpspdiseinfo2.DiagCode = sickConfigTwo.ContentCode
+		tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
+		tempOpspdiseinfo2.OprnOprtCode = ""
+		tempOpspdiseinfo2.OprnOprtName = ""
+		tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo2)
+		struct4101.OpspdiseinfoStruct = tempOpspdiseinfos
+
+		var iteminfo service.IteminfoStruct
+
+		var bedCostTotal float64 = 0         //床位总费
+		var bedCostSelfTotal float64 = 0     //床位自费
+		var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+
+		var operationCostTotal float64 = 0         //手术费
+		var operationCostSelfTotal float64 = 0     //手术费
+		var operationCostPartSelfTotal float64 = 0 //手术费
+
+		var otherCostTotal float64 = 0         //其他费用
+		var otherCostSelfTotal float64 = 0     //其他费用
+		var otherCostPartSelfTotal float64 = 0 //其他费用
+
+		var materialCostTotal float64 = 0         //材料费
+		var materialCostSelfTotal float64 = 0     //材料费
+		var materialCostPartSelfTotal float64 = 0 //材料费
+
+		var westernMedicineCostTotal float64 = 0         //西药费
+		var westernMedicineCostSelfTotal float64 = 0     //西药费
+		var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+
+		var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+		var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+		var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+
+		var checkCostTotal float64 = 0         //检查费
+		var checkCostSelfTotal float64 = 0     //检查费
+		var checkCostPartSelfTotal float64 = 0 //检查费
+
+		var laboratoryCostTotal float64 = 0         //化验费
+		var laboratoryCostSelfTotal float64 = 0     //化验费
+		var laboratoryCostPartSelfTotal float64 = 0 //化验费
+
+		var treatCostTotal float64 = 0         //治疗费用
+		var treatCostSelfTotal float64 = 0     //治疗费用
+		var treatCostPartSelfTotal float64 = 0 //治疗费用
+
+		decimal.DivisionPrecision = 2
+
+		var bed_fulamt_ownpay_amt float64 = 0
+		var operation_fulamt_ownpay_amt float64 = 0
+		var other_fulamt_ownpay_amt float64 = 0
+		var westernMedicine_fulamt_ownpay_amt float64 = 0
+		var chineseTraditional_fulamt_ownpay_amt float64 = 0
+		var check_fulamt_ownpay_amt float64 = 0
+		var material_fulamt_ownpay_amt float64 = 0
+		var laboratory_fulamt_ownpay_amt float64 = 0
+		var treat_fulamt_ownpay_amt float64 = 0
+
+		var bed_claa_sunmfee float64 = 0
+		var bed_clab_amt float64 = 0
+		var bed_other_amt float64 = 0
+
+		var operation_claa_sunmfee float64 = 0
+		var operation_clab_amt float64 = 0
+		var operation_other_amt float64 = 0
+
+		var other_claa_sunmfee float64 = 0
+		var other_clab_amt float64 = 0
+		var other_other_amt float64 = 0
+
+		var westernMedicine_claa_sunmfee float64 = 0
+		var westernMedicine_clab_amt float64 = 0
+		var westernMedicine_other_amt float64 = 0
+
+		var chineseTraditional_claa_sunmfee float64 = 0
+		var chineseTraditional_clab_amt float64 = 0
+		var chineseTraditional_other_amt float64 = 0
+
+		var check_claa_sunmfee float64 = 0
+		var check_clab_amt float64 = 0
+		var check_other_amt float64 = 0
+
+		var material_claa_sunmfee float64 = 0
+		var material_clab_amt float64 = 0
+		var material_other_amt float64 = 0
+
+		var laboratory_claa_sunmfee float64 = 0
+		var laboratory_clab_amt float64 = 0
+		var laboratory_other_amt float64 = 0
+
+		var treat_claa_sunmfee float64 = 0
+		var treat_clab_amt float64 = 0
+		var treat_other_amt float64 = 0
+
+		for _, item := range order.HisOrderInfo {
+			if item.MedChrgitmType == "01" { //床位费
+				bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				bed_fulamt_ownpay_amt, _ = decimal.NewFromFloat(bed_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+					bed_claa_sunmfee, _ = decimal.NewFromFloat(bed_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				}
+				if item.ChrgitmLv == "2" {
+					bed_clab_amt, _ = decimal.NewFromFloat(bed_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					bed_other_amt, _ = decimal.NewFromFloat(bed_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+
+			}
+
+			if item.MedChrgitmType == "03" { //检查费
+				checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				check_fulamt_ownpay_amt, _ = decimal.NewFromFloat(check_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+
+					check_claa_sunmfee, _ = decimal.NewFromFloat(check_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					check_clab_amt, _ = decimal.NewFromFloat(check_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					check_other_amt, _ = decimal.NewFromFloat(check_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+			if item.MedChrgitmType == "04" { //化验费
+				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				laboratory_fulamt_ownpay_amt, _ = decimal.NewFromFloat(laboratory_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+
+					laboratory_claa_sunmfee, _ = decimal.NewFromFloat(laboratory_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					laboratory_clab_amt, _ = decimal.NewFromFloat(laboratory_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					laboratory_other_amt, _ = decimal.NewFromFloat(laboratory_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+			if item.MedChrgitmType == "05" { //治疗费
+				treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				treat_fulamt_ownpay_amt, _ = decimal.NewFromFloat(treat_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+
+					treat_claa_sunmfee, _ = decimal.NewFromFloat(treat_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					treat_clab_amt, _ = decimal.NewFromFloat(treat_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					treat_other_amt, _ = decimal.NewFromFloat(treat_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+			if item.MedChrgitmType == "06" { //手术费
+				operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				operation_fulamt_ownpay_amt, _ = decimal.NewFromFloat(operation_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+
+				if item.ChrgitmLv == "1" {
+
+					operation_claa_sunmfee, _ = decimal.NewFromFloat(operation_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					operation_clab_amt, _ = decimal.NewFromFloat(operation_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					operation_other_amt, _ = decimal.NewFromFloat(operation_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+			if item.MedChrgitmType == "08" { //材料费
+				materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				material_fulamt_ownpay_amt, _ = decimal.NewFromFloat(material_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+
+					material_claa_sunmfee, _ = decimal.NewFromFloat(material_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					material_clab_amt, _ = decimal.NewFromFloat(material_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					material_other_amt, _ = decimal.NewFromFloat(material_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+			if item.MedChrgitmType == "09" { //西药费
+				westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				westernMedicine_fulamt_ownpay_amt, _ = decimal.NewFromFloat(westernMedicine_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+
+					westernMedicine_claa_sunmfee, _ = decimal.NewFromFloat(westernMedicine_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					westernMedicine_clab_amt, _ = decimal.NewFromFloat(westernMedicine_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					westernMedicine_other_amt, _ = decimal.NewFromFloat(westernMedicine_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+			if item.MedChrgitmType == "11" { //中成费
+				chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				chineseTraditional_fulamt_ownpay_amt, _ = decimal.NewFromFloat(chineseTraditional_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+
+					chineseTraditional_claa_sunmfee, _ = decimal.NewFromFloat(chineseTraditional_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					chineseTraditional_clab_amt, _ = decimal.NewFromFloat(chineseTraditional_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					chineseTraditional_other_amt, _ = decimal.NewFromFloat(chineseTraditional_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+			if item.MedChrgitmType == "14" { //其他费
+				otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+				otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				other_fulamt_ownpay_amt, _ = decimal.NewFromFloat(other_fulamt_ownpay_amt).Add(decimal.NewFromFloat(item.FulamtOwnpayAmt)).Float64()
+				if item.ChrgitmLv == "1" {
+					other_claa_sunmfee, _ = decimal.NewFromFloat(other_claa_sunmfee).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+
+				}
+				if item.ChrgitmLv == "2" {
+					other_clab_amt, _ = decimal.NewFromFloat(other_clab_amt).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+				if item.ChrgitmLv == "3" {
+					other_other_amt, _ = decimal.NewFromFloat(other_other_amt).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+				}
+			}
+
+		}
+
+		var iteminfoStructs []service.IteminfoStruct
+
+		if bedCostTotal != 0 {
+			iteminfo.MedChrgitm = "01"
+			iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
+			iteminfo.Amt = bedCostTotal
+			iteminfo.ClaaSumfee = bed_claa_sunmfee
+			iteminfo.ClabAmt = bed_clab_amt
+			iteminfo.OthAmt = bed_other_amt
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+		}
+
+		if checkCostTotal != 0 {
+			iteminfo.MedChrgitm = "03"
+			iteminfo.FulamtOwnpayAmt = check_fulamt_ownpay_amt
+			iteminfo.Amt = checkCostTotal
+			iteminfo.ClaaSumfee = check_claa_sunmfee
+			iteminfo.ClabAmt = check_clab_amt
+			iteminfo.OthAmt = check_other_amt
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+
+		}
+
+		if laboratoryCostTotal != 0 {
+			iteminfo.MedChrgitm = "04"
+			iteminfo.FulamtOwnpayAmt = laboratory_fulamt_ownpay_amt
+			iteminfo.Amt = laboratoryCostTotal
+			iteminfo.ClaaSumfee = laboratory_claa_sunmfee
+			iteminfo.ClabAmt = laboratory_clab_amt
+			iteminfo.OthAmt = laboratory_other_amt
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+
+		}
+
+		if treatCostTotal != 0 {
+			iteminfo.MedChrgitm = "05"
+			iteminfo.FulamtOwnpayAmt = treat_fulamt_ownpay_amt
+			iteminfo.Amt = treatCostTotal
+			iteminfo.ClaaSumfee = treat_claa_sunmfee
+			iteminfo.ClabAmt = treat_clab_amt
+			iteminfo.OthAmt = treat_other_amt
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+			//(struct4101.IteminfoStruct, iteminfo)
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+		}
+
+		if operationCostTotal != 0 {
+			iteminfo.MedChrgitm = "06"
+			iteminfo.FulamtOwnpayAmt = bed_fulamt_ownpay_amt
+			iteminfo.Amt = operationCostTotal
+			iteminfo.ClaaSumfee = operation_claa_sunmfee
+			iteminfo.ClabAmt = operation_clab_amt
+			iteminfo.OthAmt = operation_other_amt
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+		}
+
+		if materialCostTotal != 0 {
+			iteminfo.MedChrgitm = "08"
+			iteminfo.FulamtOwnpayAmt = material_fulamt_ownpay_amt
+			iteminfo.Amt = materialCostTotal
+			iteminfo.ClaaSumfee = material_claa_sunmfee
+			iteminfo.ClabAmt = material_clab_amt
+			iteminfo.OthAmt = material_other_amt
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+		}
+
+		if westernMedicineCostTotal != 0 {
+			iteminfo.MedChrgitm = "09"
+			iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
+			iteminfo.Amt = westernMedicineCostTotal
+			iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
+			iteminfo.ClabAmt = westernMedicine_clab_amt
+			iteminfo.OthAmt = westernMedicine_other_amt
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+		}
+		if chineseTraditionalMedicineCostTotal != 0 {
+			iteminfo.MedChrgitm = "11"
+			iteminfo.FulamtOwnpayAmt = westernMedicine_fulamt_ownpay_amt
+			iteminfo.Amt = westernMedicineCostTotal
+			iteminfo.ClaaSumfee = westernMedicine_claa_sunmfee
+			iteminfo.ClabAmt = westernMedicine_clab_amt
+			iteminfo.OthAmt = westernMedicine_other_amt
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+		}
+		if otherCostTotal != 0 {
+			iteminfo.MedChrgitm = "14"
+			iteminfo.FulamtOwnpayAmt = other_fulamt_ownpay_amt
+			iteminfo.Amt = otherCostTotal
+			iteminfo.ClaaSumfee = other_claa_sunmfee
+			iteminfo.ClabAmt = other_clab_amt
+			iteminfo.OthAmt = other_other_amt
+			//struct4101.IteminfoStruct = append(struct4101.IteminfoStruct, iteminfo)
+			iteminfoStructs = append(iteminfoStructs, iteminfo)
+		}
+		struct4101.IteminfoStruct = iteminfoStructs
+		struct4101.Ntly = "中国"
+		struct4101.AdmCaty = "A03.06"
+		var resOther ResultSeventeenOther
+		var res ResultSeventeen
+		if miConfig.MdtrtareaAdmvs == "150499" {
+			var pp models.PublicParams
+			pp.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			pp.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+			pp.FixmedinsName = miConfig.OrgName
+			pp.FixmedinsCode = miConfig.Code
+			pp.RequestUrl = miConfig.Url
+			pp.Cainfo = miConfig.Cainfo
+			pp.SecretKey = miConfig.SecretKey
+			pp.AccessKey = miConfig.AccessKey
+			pp.OpterName = curRoles.UserName
+			client := &http.Client{}
+			var req *http.Request
+			data := make(map[string]interface{})
+			data["struct4101"] = struct4101
+			data["pp"] = pp
+			bytesData, _ := json.Marshal(data)
+			req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"nmyb/4101", bytes.NewReader(bytesData))
+			resp, _ := client.Do(req)
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			}
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(respJSON)
+			if err := json.Unmarshal(userJSONBytes, &resOther); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+
+			}
+			res.InfRefmsgid = resOther.InfRefmsgid
+			res.Output = resOther.Output
+			res.ErrMsg = resOther.ErrMsg
+			infocode, _ := strconv.ParseInt(resOther.Infcode, 10, 64)
+			res.Infcode = infocode
+		}
+		if res.Infcode != 0 {
+			errlog := &models.HisOrderError{
+				UserOrgId: 10265,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				ErrMsg:    res.ErrMsg,
+				Status:    3000,
+				PatientId: order_id,
+				Stage:     10265,
+			}
+			service.CreateErrMsgLog(errlog)
+			continue
+		} else {
+			hisFundSettleListResult := &models.HisFundSettleListResult{
+				Number:    res.Output.SetlListId,
+				Status:    1,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				UserOrgId: 10265,
+				IsUpload:  1,
+				OrderId:   order_id,
+			}
+			service.CreateUploadRecord(hisFundSettleListResult)
+			continue
+		}
+	}
+}
+func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
+	newArr = make([]string, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i] == arr[j] {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}
+func Get4202(){
+	admin_user_id :=   int64(2738)
+	var orders []*models.HisOrder
+	orders, _ = service.GetAllHisOrder10265()
+	for _,item := range orders{
+		order_id := item.ID
+		stas_type := "1"
+		order, _ := service.GetHisOrderByID(order_id)
+		miConfig, _ := service.FindMedicalInsuranceInfo(10265)
+		var user_name string
+		role, _ := service.GetAdminUserInfoByID(10265, admin_user_id)
+		if role.ID == 0 {
+			user_name = "管理员"
+		} else {
+			user_name = role.UserName
+		}
+		baseParams := models.BaseParams{
+			SecretKey:      miConfig.SecretKey,
+			FixmedinsCode:  miConfig.Code,
+			InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,
+			MdtrtareaAdmvs: miConfig.MdtrtareaAdmvs,
+			OrgName:        miConfig.OrgName,
+			Doctor:         user_name,
+			RequestUrl:     miConfig.Url,
+			AccessKey:      miConfig.AccessKey,
+		}
+
+		businessParams := models.BusinessParams{
+			PsnNo:    order.PsnNo,
+			MdtrtId:  order.MdtrtId,
+			SetlId:   order.SetlId,
+			StasType: stas_type,
+		}
+
+		api := "http://172.16.13.254:9532/" + "nmyb/4102?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
+			"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&stas_type=" + stas_type
+		resp, _ := http.Get(api)
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		}
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		result, _ := json.Marshal(respJSON)
+		var res2 ResultSix
+		var resEmpty10265 ResultEmpty10265
+
+		if err := json.Unmarshal(result, &resEmpty10265); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+		}
+		Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+		res2.Infcode = Infcode
+		res2.RespondTime = resEmpty10265.RespondTime
+		res2.ErrMsg = resEmpty10265.ErrMsg
+		res2.Output = resEmpty10265.Output
+		res2.WarnMsg = resEmpty10265.WarnMsg
+		if res2.Infcode == 0 {
+			continue
+		} else {
+			errlog := &models.HisOrderError{
+				UserOrgId: 10265,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				ErrMsg:    res2.ErrMsg,
+				Status:    2000,
+				PatientId: order_id,
+				Stage:     10265,
+			}
+			service.CreateErrMsgLog(errlog)
+			continue
+		}
+	}
+}

models/dialysis.go

@@ -922,9 +922,9 @@ type SgjUserAdminRole struct {
 	Department                              string `gorm:"column:department" json:"department" form:"department"`
 }
 
-//func (SgjUserAdminRole) TableName() string {
-//	return "sgj_user_admin_role"
-//}
+func (SgjUserAdminRole) TableName() string {
+	return "sgj_user_admin_role"
+}
 
 type SgjUserAdmin struct {
 	ID           int64  `gorm:"column:id" json:"id" form:"id"`

models/drug_stock.go

@@ -42,6 +42,10 @@ type DrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+
+	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
+
 }
 
 func (DrugWarehouseInfo) TableName() string {

models/fapiao.go

@@ -0,0 +1,98 @@
+package models
+
+type FapiaoConfig struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsUse             int64  `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	TaxpayerId        string `gorm:"column:taxpayer_id" json:"taxpayer_id" form:"taxpayer_id"`
+	TerminalCode      string `gorm:"column:terminal_code" json:"terminal_code" form:"terminal_code"`
+	SellerTaxpayerNum string `gorm:"column:seller_taxpayer_num" json:"seller_taxpayer_num" form:"seller_taxpayer_num"`
+	SellerAddress     string `gorm:"column:seller_address" json:"seller_address" form:"seller_address"`
+	SellerTel         string `gorm:"column:seller_tel" json:"seller_tel" form:"seller_tel"`
+	SellerBankName    string `gorm:"column:seller_bank_name" json:"seller_bank_name" form:"seller_bank_name"`
+	SellerBankAccount string `gorm:"column:seller_bank_account" json:"seller_bank_account" form:"seller_bank_account"`
+	TitleType         string `gorm:"column:title_type" json:"title_type" form:"title_type"`
+	BuyerTitle        string `gorm:"column:buyer_title" json:"buyer_title" form:"buyer_title"`
+	CallbackUrl       string `gorm:"column:callback_url" json:"callback_url" form:"callback_url"`
+	UserOpenid        string `gorm:"column:user_openid" json:"user_openid" form:"user_openid"`
+}
+
+func (FapiaoConfig) TableName() string {
+	return "fapiao_config"
+}
+
+type HisOrderByFaPiao struct {
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode            int64  `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg            string `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo             string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg             string `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime        string `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid        string `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId            string `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId             string `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo              string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName            string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType        string `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno             string `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend               string `gorm:"column:gend" json:"gend" form:"gend"`
+	Insutype           string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SetlTime           string `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MedType            string `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	FaPiaoSn           string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
+
+	MedfeeSumamt   float64        `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FaPiaoCode     string         `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber   string         `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	Patients       Patients       `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient     HisPatient     `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
+	HisFaPiaoOrder HisFaPiaoOrder `gorm:"ForeignKey:FaPiaoSn;AssociationForeignKey:OrderSn" json:"result"`
+	Creator        int64          `gorm:"column:creator" json:"creator" form:"creator"`
+}
+
+func (HisOrderByFaPiao) TableName() string {
+	return "his_order"
+}
+
+type HisFaPiaoOrder struct {
+	ID                int64    `gorm:"column:id" json:"id" form:"id"`
+	InvoiceId         string   `gorm:"column:invoice_id" json:"invoice_id" form:"invoice_id"`
+	OrderSn           string   `gorm:"column:order_sn" json:"order_sn" form:"order_sn"`
+	TicketSn          string   `gorm:"column:ticket_sn" json:"ticket_sn" form:"ticket_sn"`
+	TicketDate        string   `gorm:"column:ticket_date" json:"ticket_date" form:"ticket_date"`
+	AmountWithTax     string   `gorm:"column:amount_with_tax" json:"amount_with_tax" form:"amount_with_tax"`
+	AmountWithoutTax  string   `gorm:"column:amount_without_tax" json:"amount_without_tax" form:"amount_without_tax"`
+	TaxAmount         string   `gorm:"column:tax_amount" json:"tax_amount" form:"tax_amount"`
+	IsRedWashed       string   `gorm:"column:is_red_washed" json:"is_red_washed" form:"is_red_washed"`
+	PdfUrl            string   `gorm:"column:pdf_url" json:"pdf_url" form:"pdf_url"`
+	OfdUrl            string   `gorm:"column:ofd_url" json:"ofd_url" form:"ofd_url"`
+	XmlUrl            string   `gorm:"column:xml_url" json:"xml_url" form:"xml_url"`
+	FapiaoStatus      string   `gorm:"column:fapiao_status" json:"fapiao_status" form:"fapiao_status"`
+	OrderIds          string   `gorm:"column:order_ids" json:"order_ids" form:"order_ids"`
+	UserOrgId         int64    `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status            int64    `gorm:"column:status" json:"status" form:"status"`
+	PatientId         int64    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime             int64    `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64    `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator           string   `gorm:"column:creator" json:"creator" form:"creator"`
+	MedfeeSumamt      float64  `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	PsnCashPay        float64  `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	FundPaySumamt     float64  `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	RedInvoiceId      string   `gorm:"column:red_invoice_id" json:"red_invoice_id" form:"red_invoice_id"`
+	RedInvoiceCreator string   `gorm:"column:red_invoice_creator" json:"red_invoice_creator" form:"red_invoice_creator"`
+	Patients          Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	Message           string   `gorm:"column:message" json:"message" form:"message"`
+}
+
+func (HisFaPiaoOrder) TableName() string {
+	return "his_fapiao_order"
+}

models/his_models.go

@@ -753,6 +753,9 @@ type HisOrder struct {
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
 	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+	SickName   string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
+
+	FaPiaoSn     string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
 }
 
 func (HisOrder) TableName() string {
@@ -1603,6 +1606,7 @@ type HisChargeSettleOrder struct {
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	PayWays             string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
 	OthDesc             string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
+	SickName   string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
@@ -1905,6 +1909,7 @@ type NewHisOrder111 struct {
 	WechatPay    string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
 	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
 	JifenPay     string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+	SickName   string `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 
 	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`

models/models_3501.go

@@ -32,6 +32,9 @@ type Struct3501 struct {
 	AppSecret           string
 	SignKey             string
 	Enckey              string
+	DrugTracCodg		string
+	Code		string
+
 }
 type Struct3502 struct {
 	MedListCodg         string
@@ -63,6 +66,10 @@ type Struct3502 struct {
 	AppSecret           string
 	SignKey             string
 	Enckey              string
+	DrugTracCodg		string
+	Code		string
+
+
 }
 type Struct3503 struct {
 	MedListCodg         string
@@ -100,6 +107,10 @@ type Struct3503 struct {
 	AppSecret           string
 	SignKey             string
 	Enckey              string
+	DrugTracCodg		string
+	Code		string
+
+
 }
 type Struct3504 struct {
 	MedListCodg         string
@@ -133,6 +144,10 @@ type Struct3504 struct {
 	AppSecret           string
 	SignKey             string
 	Enckey              string
+	DrugTracCodg		string
+	Code		string
+
+
 }
 type Struct3505 struct {
 	MedListCodg         string
@@ -186,6 +201,9 @@ type Struct3505 struct {
 	AppSecret           string
 	SignKey             string
 	Enckey              string
+	Code		string
+
+
 }
 type Struct3506 struct {
 	MedListCodg         string
@@ -224,6 +242,10 @@ type Struct3506 struct {
 	AppSecret           string
 	SignKey             string
 	Enckey              string
+	DrugTracCodg		string
+	Code		string
+
+
 }
 type Struct3507 struct {
 	FixmedinsBchno string
@@ -242,6 +264,10 @@ type Struct3507 struct {
 	AppSecret      string
 	SignKey        string
 	Enckey         string
+	DrugTracCodg		string
+	Code		string
+
+
 }
 
 type XtDrugInventory struct {

models/new_stock_models.go

@@ -264,8 +264,10 @@ type NewDrugWarehouseInfo struct {
 	IsPc    int64  `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
 	IsBg    int64  `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
 	Bchno   string `gorm:"column:bchno" json:"bchno" form:"bchno"`
-	PcDate  string `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+	PcDate  int64 `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
 	BgBchno string `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
+	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
 }
 
 func (NewDrugWarehouseInfo) TableName() string {
@@ -443,6 +445,9 @@ type DrugFlow struct {
 	Bchno                     string               `gorm:"column:bchno" json:"bchno" form:"bchno"`
 	SaleDate                  string               `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
 	BgBchno                   string               `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
+	DrugCode 	string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
+
 }
 
 func (DrugFlow) TableName() string {

models/self_drug_models.go

@@ -394,6 +394,8 @@ type XtDrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
 }
 
 func (XtDrugWarehouseInfo) TableName() string {

models/stock_models.go

@@ -828,6 +828,8 @@ type VsDrugWarehouseInfo struct {
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
 }
 
 func (VsDrugWarehouseInfo) TableName() string {
@@ -1564,6 +1566,8 @@ type StartDrugWarehouseInfo struct {
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	IsCheck          int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
 }
 
 func (StartDrugWarehouseInfo) TableName() string {

routers/router.go

@@ -28,6 +28,7 @@ func init() {
 	}))
 	sg.HisManagerApiRegistRouters()
 	sg.GdybRegistRouters()
+	sg.FaPiaoApiRegistRouters()
 	hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
 	zh.ZHHisManagerApiRegistRouters()
@@ -37,4 +38,5 @@ func init() {
 	coordinate.CoordinateRcegistRouters()
 	coordinate.CoordinatenetRcegistRouters()
 
+
 }

service/ahyb_service.go

@@ -492,8 +492,8 @@ func AHyb2203(psnNo string, mdtrtId string, operator string, department string,
 		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码
 		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
 		diseinfo_sun["diag_dept"] = department       // 诊断科室
-		diseinfo_sun["dise_dor_no"] = doctor_name      // 诊断医生编码
-		diseinfo_sun["dise_dor_name"] = doctor_number       // 诊断医生姓名
+		diseinfo_sun["dise_dor_no"] = doctor_number      // 诊断医生编码
+		diseinfo_sun["dise_dor_name"] = doctor_name       // 诊断医生姓名
 		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
 		diseinfo_sun["vali_flag"] = "1"              // 有效标志
 		diseinfo = append(diseinfo, diseinfo_sun)

service/coordinate_service.go

@@ -1511,6 +1511,13 @@ func FindPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date
 
 }
 
+
+func FindPatientPrescriptionInfoThree(org_id int64, patient_id int64, st_time int64,end_timne int64, p_type int64) (info []models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date >= ? and record_date <= ? AND patient_id = ? AND p_type = ? ", org_id, st_time,end_timne, patient_id, p_type).Find(&info).Error
+	return
+
+}
+
 func GetExecutionFrequencyByName(name string, org_id int64) (ef models.ExecutionFrequencyDic, err error) {
 	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("org_id = ? AND name = ?", org_id, name).First(&ef).Error
 	return

service/fapiao/bule.go

@@ -0,0 +1,6 @@
+package fapiao
+
+func Blue(postData map[string]interface{}) (string, map[string]interface{}) {
+	routerAddress := "/tax-api/invoice/blue/v1"
+	return routerAddress, postData
+}

service/fapiao/invalid.go

@@ -0,0 +1,16 @@
+package fapiao
+
+func Invalid() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/invalid/v1"
+
+	postData = map[string]interface{}{
+		"seller_taxpayer_num": "500102010004038",
+		"order_sn":            "",
+		"order_id":            "gp_20190828115454_742_11296_31131",
+		"name":                "fff",
+		"is_red":              0,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/login.go

@@ -0,0 +1,13 @@
+package fapiao
+
+import "gdyb/models"
+
+func Login(code string, config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+	routerAddress = "/tax-api/invoice/sms/upload/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+		"sms_code":      code,
+	}
+	return routerAddress, postData
+}

service/fapiao/print.go

@@ -0,0 +1,18 @@
+package fapiao
+
+func Print() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/print/v1"
+
+	postData = map[string]interface{}{
+		"seller_taxpayer_num": "500102010004038",
+		"order_sn":            "",
+		"order_id":            "gp_20190828115454_742_11296_31131",
+		"print_type":          "",
+		"print_flag":          "",
+		"print_mode":          "",
+		"is_red":              0,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/qrcode.go

@@ -0,0 +1,26 @@
+package fapiao
+
+import "gdyb/models"
+
+func GetQRCode(config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/auth/get-qrcode/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+	}
+
+	return routerAddress, postData
+}
+
+func GetQRStatus(auth_id string, config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/auth/query-qrcode-status/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+		"auth_id":       auth_id,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/query.go

@@ -0,0 +1,27 @@
+package fapiao
+
+import "gdyb/models"
+
+func Query(seller_taxpayer_num string, order_sn string, order_id string) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/query/v1"
+
+	postData = map[string]interface{}{
+		"seller_taxpayer_num": seller_taxpayer_num,
+		"order_sn":            order_sn,
+		"order_id":            order_id,
+		"is_red":              0,
+	}
+
+	return routerAddress, postData
+}
+
+func QueryStock(config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+	routerAddress = "/tax-api/invoice/query-stock/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":       config.TaxpayerId,
+		"terminal_code":     config.TerminalCode,
+		"invoice_type_code": "026",
+	}
+	return routerAddress, postData
+}

service/fapiao/red.go

@@ -0,0 +1,22 @@
+package fapiao
+
+func Red(seller_taxpayer_num string, callback_url string, order_sn string) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/red/quick/v1"
+
+	invoices := make([]map[string]interface{}, 1)
+
+	invoice := make(map[string]interface{})
+	invoice["seller_taxpayer_num"] = seller_taxpayer_num
+	invoice["callback_url"] = callback_url
+	invoice["order_sn"] = order_sn
+	invoice["apply_reason"] = "2"
+
+	invoices[0] = invoice
+
+	postData = map[string]interface{}{
+		"invoices": invoices,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/sms.go

@@ -0,0 +1,14 @@
+package fapiao
+
+import "gdyb/models"
+
+func GetSMSCode(config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/login/check/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/waitopen.go

@@ -0,0 +1,14 @@
+package fapiao
+
+func WaitOpen() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/wait-open/v1"
+
+	postData = map[string]interface{}{
+		"taxpayer_num":      "20181010000000865115391398242493",
+		"machine_no":        "125523523523",
+		"invoice_type_code": "026",
+	}
+
+	return routerAddress, postData
+}

service/fapiao_service.go

@@ -0,0 +1,130 @@
+package service
+
+import (
+	"gdyb/models"
+	"fmt"
+)
+
+func FindFaPiaoConfigInfo(org_id int64) (config models.FapiaoConfig, err error) {
+	err = readDb.Model(&models.FapiaoConfig{}).Where("status = 1 AND user_org_id = ?", org_id).First(&config).Error
+	return
+}
+func GetAdminUserRole(id int64, orgid int64) (models.SgjUserAdminRole, error) {
+	role := models.SgjUserAdminRole{}
+	err := UserReadDB().Where("admin_user_id = ? and org_id = ? and status = 1", id, orgid).Find(&role).Error
+	return role, err
+}
+func GetFaPiaoSettleList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, sort_type int64, start_time string, end_time string, is_open_fapiao int64, patient_id int64) (order []*models.HisOrderByFaPiao, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisOrderByFaPiao{})
+
+	// Join the patients table based on user_org_id
+	db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id and patient.user_org_id = ?", user_org_id)
+
+	// Handle the is_open_fapiao logic
+	if is_open_fapiao == 1 {
+		// is_open_fapiao == 1: Look for orders with a corresponding fa_piao_number
+		db = db.Joins("left join his_fapiao_order as fo on fo.ticket_sn = his_order.fa_piao_number and fo.user_org_id = ?", user_org_id).
+			Where("fo.id IS NOT NULL") // Ensure fa_piao_number exists
+	} else if is_open_fapiao == 2 {
+		// is_open_fapiao == 2: Look for orders without a corresponding fa_piao_number
+		db = db.Joins("left join his_fapiao_order as fo on fo.ticket_sn = his_order.fa_piao_number and fo.user_org_id = ?", user_org_id).
+			Where("fo.id IS NULL") // Ensure fa_piao_number does not exist
+	}
+
+	// Handle sorting logic
+	if sort_type == 1 {
+		if start_time_timestamp != 0 {
+			db = db.Where("his_order.settle_accounts_date >= ?", start_time_timestamp)
+		}
+		if end_time_timestamp != 0 {
+			db = db.Where("his_order.settle_accounts_date <= ?", end_time_timestamp)
+		}
+	} else {
+		if len(start_time) != 0 {
+			db = db.Where("his_order.setl_time >= ?", start_time+" 00:00:00")
+		}
+		if len(end_time) != 0 {
+			db = db.Where("his_order.setl_time <= ?", end_time+" 23:59:59")
+		}
+	}
+	if patient_id > 0 {
+		db = db.Where("his_order.patient_id = ?", patient_id)
+
+	}
+
+	// Preload related data
+	db = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisFaPiaoOrder", "status = 1")
+
+	// Count the total number of records
+	db = db.Count(&total)
+
+	// Apply pagination
+	db = db.Limit(limit).Offset(offset)
+
+	// Execute query and return results
+	err = db.Find(&order).Error
+	//
+	//for _, item := range order {
+	//	var hfpo models.HisFaPiaoOrder
+	//	readDb.Model(&models.HisFaPiaoOrder{}).Where("ticket_sn = ?", item.FaPiaoNumber).First(&hfpo)
+	//	item.HisFaPiaoOrder =
+	//}
+
+	return
+}
+
+func GetFaPiaoList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64) (order []*models.HisFaPiaoOrder, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisFaPiaoOrder{})
+	db = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id)
+	db = db.Where("ctime >= ? and ctime <= ? and user_org_id = ? and status = 1", start_time_timestamp, end_time_timestamp, user_org_id)
+	// Count the total number of records
+	db = db.Count(&total)
+	// Apply pagination
+	db = db.Limit(limit).Offset(offset)
+	// Execute query and return results
+	err = db.Find(&order).Error
+	return
+}
+
+func GetFaPiaoOrderByIDS(ids []string) (orders []models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id in (?) AND status = 1", ids).Find(&orders).Error
+	return
+}
+
+func GetFaPiaoOrderById(id int64) (orders models.HisFaPiaoOrder, err error) {
+	err = readDb.Model(&models.HisFaPiaoOrder{}).Where("id = ?", id).Find(&orders).Error
+	return
+}
+
+func GetFaPiaoOrderInfoByNumbers(numbers []string) (infos []models.HisOrderInfo, err error) {
+	err = readDb.Model(&models.HisOrderInfo{}).Where("order_number in (?)", numbers).Find(&infos).Error
+	return
+}
+
+func SaveFaPiaoOrder(fapiao *models.HisFaPiaoOrder) (err error) {
+	err = writeDb.Save(&fapiao).Error
+	return
+}
+
+func UpdateFaPiaoNumber(number string, ids []string) (err error) {
+	err = XTWriteDB().Model(&models.HisOrder{}).Where("id in (?)", ids).Updates(map[string]interface{}{"fa_piao_number": number}).Error
+	return
+}
+
+func UpdateFaPiaoSN(number string, ids []string) (err error) {
+	fmt.Println(ids)
+	fmt.Println(number)
+
+	err = XTWriteDB().Model(&models.HisOrder{}).Where("id in (?)", ids).Updates(map[string]interface{}{"fa_piao_sn": number}).Error
+	return
+}
+
+func UpdateFaPiaoNumberByNumber(number string) (err error) {
+	err = XTWriteDB().Model(&models.HisOrder{}).Where("fa_piao_number = ?", number).Updates(map[string]interface{}{"fa_piao_number": ""}).Error
+	return
+}
+

service/fj_service.go

@@ -3037,7 +3037,7 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
 	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3501.Memo                             // 人员编号 （来自1101接口返回）
-	druginputData["drug_trac_codg"] = "12345678912345678901"
+	druginputData["drug_trac_codg"] = struct3501.DrugTracCodg
 	//druginputData2["drugtracinfo"] = druginputData
 	inputData["drug_trac_info"] = druginputData
 	input["invinfo"] = inputData

service/gdyb_service.go

@@ -443,6 +443,10 @@ func Gdyb2201A(psnNo string, insutype string, certNo string, org_name string, op
 
 		return hex.EncodeToString(out), requestLog
 	} else {
+		fmt.Println(url)
+		fmt.Println(gdyb_paasid)
+		fmt.Println(secret_key)
+
 		request, err := http.NewRequest("POST", url, reader)
 		if err != nil {
 			fmt.Println(err.Error())
@@ -1154,10 +1158,10 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 					//randNum = rand.Intn(10000) + 1000
 					role, _ := GetAdminUserInfoByID(item.UserOrgId, new_doctor_id)
 					cus := &Custom{
-						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
 						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.4f", subItem.Price),
+						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 						HospApprFlag:     subItem.HospApprFlag,
 						DoctorNumber:     role.DoctorNumber,
@@ -1620,7 +1624,7 @@ func Gdyb2205(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接口返回）
 
 	input["data"] = inputData
@@ -3557,7 +3561,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["gend"] = struct4101.Gend                     // 性别  必填
 	inputData["brdy"] = struct4101.Brdy                     // 出生日期  必填
 	inputData["age"] = struct4101.Age                       // 年龄  必填
-	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
+	inputData["ntly"] = "CHN"                  // 国籍  必填
 	inputData["nwb_age"] = ""                               // 年龄  必填
 	inputData["naty"] = struct4101.Naty                     // 民族  必填
 
@@ -3586,12 +3590,12 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["opsp_diag_caty"] = ""                          // 门诊慢特病诊断  必填
 	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
 	inputData["ipt_med_type"] = ""                            // 住院医疗类型  必填
-	inputData["adm_way"] = ""                                 // 入院途径  必填
-	inputData["trt_type"] = "10"                              // 治疗类别  必填
-	inputData["adm_time"] = ""                                // 入院时间  必填
+	inputData["adm_way"] = "2"                                 // 入院途径  必填
+	inputData["trt_type"] = "1"                              // 治疗类别  必填
+	inputData["adm_time"] = struct4101.SetlEndDate                                 // 入院时间  必填
 	inputData["adm_caty"] = "A03.06"                          // 入院科别  必填
 	inputData["refldept_dept"] = ""                           // 转科科别  必填
-	inputData["dscg_time"] = ""                               // 出院时间  必填
+	inputData["dscg_time"] = struct4101.SetlBegnDate                               // 出院时间  必填
 	inputData["dscg_caty"] = "A03.06"                         // 出院科别  必填
 	inputData["caty"] = "A03.06"                              // 出院科别  必填
 	inputData["act_ipt_days"] = ""                            // 实际住院天数  必填
@@ -3615,8 +3619,8 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["bill_code"] = struct4101.BillCode              // 票据代码  必填
 	inputData["bill_no"] = struct4101.BillNo                  // 票据号码  必填
 	inputData["biz_sn"] = struct4101.BizSn                    // 业务流水号  必填
-	inputData["days_rinp_flag_31"] = ""                       // 出院 31 天内再住院计划标志  必填
-	inputData["days_rinp_pup_31"] = ""                        // 出院 31 天内再住院目的  必填
+	inputData["days_rinp_flag_31"] = "1"                       // 出院 31 天内再住院计划标志  必填
+	inputData["days_rinp_pup_31"] = "1"                        // 出院 31 天内再住院目的  必填
 	inputData["chfpdr_name"] = struct4101.DoctorName          // 主诊医师姓名  必填
 	inputData["chfpdr_code"] = struct4101.DoctorCode          // 主诊医师代码  必填
 	inputData["setl_begn_date"] = struct4101.SetlBegnDate     // 结算开始日期  必填
@@ -3630,6 +3634,8 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["medins_fill_dept"] = struct4101.MedinsFillDept // 医疗机构填报部门  必填
 	inputData["medins_fill_psn"] = struct4101.MedinsFillPsn   // 医疗机构填报人  必填
 	inputData["psn_cashpay"] = struct4101.PsnCashpay          // 医疗机构填报人  必填
+	inputData["resp_nurs_code"] = "N440307016120" // 民族  必填
+
 
 	payinfo := make([]map[string]interface{}, 0) // 基金支付信息
 	for _, item := range struct4101.CustomStruct {
@@ -3641,7 +3647,6 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 		}
 	}
 	opspdiseinfo := make([]map[string]interface{}, 0) // 门诊慢特病诊断信息
-
 	opspdiseinfotemp := make(map[string]interface{})
 	opspdiseinfotemp["diag_name"] = "慢性肾功能不全（血透治疗）" // 诊断名称  必填
 	opspdiseinfotemp["diag_code"] = "N18.904"       // 诊断代码 必填
@@ -3685,7 +3690,7 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 
 	input["setlinfo"] = inputData
 	input["payinfo"] = payinfo
-	input["opspdiseinfo"] = opspdiseinfo
+	//input["opspdiseinfo"] = opspdiseinfo
 	input["diseinfo"] = diseinfo
 	inputMessage["input"] = input //交易输入
 
@@ -4683,7 +4688,7 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
 	inputMessage["fixmedins_name"] = org_name
-		inputMessage["sign_no"] = "" //交易签到流水号
+		inputMessage["sign_no"] = "489925883" //交易签到流水号
 
 	//定点医药机构名称
 	//if mdtrtarea_admvs == "440100" {
@@ -6050,7 +6055,7 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 	for _, subitem := range result3260 {
 		for _, item := range subitem.Output.Data {
-			if item.MdtrtId != "out20230406681871" && item.MdtrtId != "out20230406681868" && item.MdtrtId != "out202404174009254" &&  item.MdtrtId != "out202405154379275"   {
+			if item.MdtrtId != "out20230406681871" && item.MdtrtId != "out20230406681868"  {
 				feedetailInfo := make(map[string]interface{})
 				feedetailInfo["certno"] = item.Certno
 				feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
@@ -6239,7 +6244,7 @@ func Gdyb3263(org_name string, doctor string, fixmedins_code string, insuplc_adm
 
 	for _, subitem := range result3260 {
 		for _, item := range subitem.Output.Data {
-			if item.MdtrtId != "out20230406681871" && item.MdtrtId != "out20230406681868" && item.MdtrtId != "out202404174009254" {
+			if item.MdtrtId != "out20230406681871" && item.MdtrtId != "out20230406681868"  {
 				feedetailInfo := make(map[string]interface{})
 				feedetailInfo["certno"] = item.Certno
 				feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）

service/hbyb_service.go

@@ -16,6 +16,7 @@ import (
 	"encoding/xml"
 	"github.com/go-ole/go-ole/oleutil"
 	"github.com/go-ole/go-ole"
+	"regexp"
 
 )
 
@@ -78,25 +79,47 @@ func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
-	var inputLog string
+	//var inputLog string
 	bytesData, err := json.Marshal(inputMessage)
-	inputLog = string(bytesData)
+	//inputLog = string(bytesData)
 	fmt.Println(string(bytesData))
 	if err != nil {
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
 
-	//var json2 string
 
 	out := GetoleInfo("1101",string(bytesData))
-
-	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "1101", string(bytesData), json2)
-	//out, err := cmd.CombinedOutput()
-	//if err != nil {
-	//	fmt.Println("error:", err.Error())
-	//}
-	return out, inputLog
+	aa := ""
+	// Regular expression to find JSON part
+	re := regexp.MustCompile(`\{.*\}`)
+
+	// Find the first match
+	match := re.Find([]byte(ConvertToString(string(out), "gbk", "utf-8")))
+
+	if match != nil {
+		// Convert bytes to string
+		jsonStr := string(match)
+
+		// Parse JSON
+		var jsonData interface{}
+		err := json.Unmarshal([]byte(jsonStr), &jsonData)
+		if err != nil {
+			fmt.Println("Error parsing JSON:", err)
+		} else {
+			// Print formatted JSON
+			jsonBytes, err := json.MarshalIndent(jsonData, "", "    ")
+			if err != nil {
+				fmt.Println("Error formatting JSON:", err)
+			} else {
+				aa = string(jsonBytes)
+				//fmt.Println(string(jsonBytes))
+			}
+		}
+	} else {
+		fmt.Println("No valid JSON found in the input string.")
+	}
+	return aa, ConvertToString(string(bytesData), "gbk", "utf-8")
 
 }
 
@@ -264,7 +287,7 @@ func Hbyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 		fmt.Println(err.Error())
 		return err.Error(), ""
 	}
-
+	//
 	//var json2 string
 	//cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "2203", string(bytesData), json2)
 	//out, err := cmd.Output()
@@ -999,6 +1022,58 @@ func Hbyb1608(baseParams models.BaseParams,cnt string,medfee_sumamt string,start
 }
 
 
+func Hbyb3204(baseParams models.BaseParams, id string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputMessage["infno"] = "3204" // 交易编码
+	inputData["clr_appy_evt_id"] = id                       // 险种
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, _ := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	out := GetoleInfo("3204",string(bytesData))
+	fmt.Println(string(out))
+	return  out
+}
+
+
+func Hbyb8404(baseParams models.BaseParams, month string) string {
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "8404" // 交易编码
+	inputData["nurscare_org_no"] = baseParams.FixmedinsCode
+	inputData["setl_mon"] = month
+	inputData["page_num"] = "1"
+	inputData["page_size"] = "10"
+	inputData["Longterm_dcla_rea"] = "查询"
+	// 险种
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, _ := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	out := GetoleInfo("8404",string(bytesData))
+	fmt.Println(string(out))
+	return  out
+}
+
+
+
+
+
+
 func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
@@ -1018,7 +1093,7 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 		inputData := make(map[string]interface{})
 		inputData["insutype"] = ""                        // 险种
 		inputData["clr_type"] = ""                        // 就诊 ID（来自2201接口返回）
-		inputData["setl_optins"] = item.SetlOptins                     // 结算经办机构
+		inputData["setl_optins"] = "420922"                     // 结算经办机构
 		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
 		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
 		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
@@ -1029,22 +1104,53 @@ func Hbyb3202a(baseParams models.BaseParams, businessParams []*models.BusinessPa
 	input["clrdata"] = inputDatas
 	inputMessage["input"] = input //交易输入
 
-	bytesData, err := json.Marshal(inputMessage)
+	//bytesData, err := json.Marshal(inputMessage)
+	bytesData, _ := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "3202a", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
+	out := GetoleInfo("3202a",string(bytesData))
+	return  out
+}
+
+
+func Hbyb3204a(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
+
+	fmt.Println(baseParams)
+	fmt.Println(businessParams)
+	// 生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+
+	// 生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
+	input := make(map[string]interface{})
+	//inputDatas := []make(map[string]interface{})
+	inputDatas := make([]map[string]interface{}, 0)
+
+	inputMessage["infno"] = "3204a" // 交易编码
+	for _, item := range businessParams {
+		inputData := make(map[string]interface{})
+		inputData["insutype"] = ""                        // 险种
+		inputData["clr_type"] = ""                        // 就诊 ID（来自2201接口返回）
+		inputData["setl_optins"] = ""                     // 结算经办机构
+		inputData["stmt_begndate"] = item.StmtBegndate    // 对帐开始时间
+		inputData["stmt_enddate"] = item.StmtEnddate      //对帐结束时间
+		inputData["fund_pay_sumamt"] = item.FundPaySumamt //基金支付总额
+		inputData["acct_pay"] = item.AcctPay              //个人账户支付金额
+		inputData["med_type"] = "14"                        //个人账户支付金额
+		inputDatas = append(inputDatas, inputData)
 	}
-	fmt.Println(string(out))
-	return ConvertToString(string(out), "gbk", "utf-8")
+	input["clrdata"] = inputDatas
+	inputMessage["input"] = input //交易输入
 
+	//bytesData, err := json.Marshal(inputMessage)
+	bytesData, _ := json.Marshal(inputMessage)
+	out := GetoleInfo("3204a",string(bytesData))
+	fmt.Println(out)
+	return  out
 }
+
+
+
 func Hbyb3202b(baseParams models.BaseParams, businessParams []*models.BusinessParamsTwo) string {
 
 	fmt.Println(baseParams)
@@ -1075,21 +1181,9 @@ func Hbyb3202b(baseParams models.BaseParams, businessParams []*models.BusinessPa
 	input["clrdata"] = inputDatas
 	inputMessage["input"] = input //交易输入
 
-	bytesData, err := json.Marshal(inputMessage)
-	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	var json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "3202a", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-	return ConvertToString(string(out), "gbk", "utf-8")
-
+	bytesData, _ := json.Marshal(inputMessage)
+	out := GetoleInfo("3202a",string(bytesData))
+	return  out
 }
 
 
@@ -1119,20 +1213,10 @@ func Hbyb5262(baseParams models.BaseParams, businessParams models.BusinessParams
 	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 json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "5262", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-	return ConvertToString(string(out), "gbk", "utf-8")
+	//bytesData, err := json.Marshal(inputMessage)
+	bytesData, _ := json.Marshal(inputMessage)
+	out := GetoleInfo("5262",string(bytesData))
+	return  out
 }
 
 func Hbyb5267(baseParams models.BaseParams, businessParams models.BusinessParams5262, page string , limit string) string {
@@ -1159,20 +1243,12 @@ func Hbyb5267(baseParams models.BaseParams, businessParams models.BusinessParams
 	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 json2 string
-	cmd := exec.Command("java", "-jar", "yh_hb_fat.jar", "5267", string(bytesData), json2)
-	out, err := cmd.Output()
-	if err != nil {
-		fmt.Println("error:", err.Error())
-	}
-	fmt.Println(string(out))
-	return ConvertToString(string(out), "gbk", "utf-8")
+	//bytesData, err := json.Marshal(inputMessage)
+
+	//bytesData, err := json.Marshal(inputMessage)
+	bytesData, _ := json.Marshal(inputMessage)
+	out := GetoleInfo("5267",string(bytesData))
+	return  out
 }
 
 //文件上传
@@ -1310,7 +1386,7 @@ func Hbyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, baseParams.SecretKey)
+	//signature := setSignature(timestamp, nonce, baseParams.SecretKey)
 
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs)
@@ -1318,7 +1394,7 @@ func Hbyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3202"                                    // 交易编码
 	inputData["file_qury_no"] = businessParams.FileQuryNo             // 险种
-	inputData["setl_optins"] = baseParams.InsuplcAdmdvs               // 结算经办机构
+	inputData["setl_optins"] = ""              // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额
@@ -1330,46 +1406,12 @@ func Hbyb3202(baseParams models.BaseParams, businessParams models.BusinessParams
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
-	bytesData, err := json.Marshal(inputMessage)
+	//mjson, _ := json.Marshal(inputMessage)
+	//str2 := string(mjson)
+	bytesData, _ := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	reader := bytes.NewReader(bytesData)
-	gdyb_url := beego.AppConfig.String("gdyb_url")
-	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
-	url := gdyb_url + "3202"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/3202"
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3202"
-
-	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/3202"
-	request, err := http.NewRequest("POST", url, reader)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("x-tif-paasid", gdyb_paasid)
-	request.Header.Set("x-tif-signature", signature)
-	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
-	request.Header.Set("x-tif-nonce", nonce)
-	client := http.Client{}
-	resp, err := client.Do(request)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	respBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println(err.Error())
-		return err.Error()
-	}
-	str := string(respBytes)
-	fmt.Println(str)
-	return str
+	out := GetoleInfo("3202",string(bytesData))
+	return out
 }
 
 //func Hbyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_type string) string {
@@ -3168,8 +3210,41 @@ func Hb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, insut
 	if err != nil {
 		fmt.Println("error:", err.Error())
 	}
-	return  ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	//if id_card_type == 4 {
+			aa := ""
+		// Regular expression to find JSON part
+		re := regexp.MustCompile(`\{.*\}`)
+
+		// Find the first match
+		match := re.Find([]byte(ConvertToString(string(out), "gbk", "utf-8")))
+
+		if match != nil {
+			// Convert bytes to string
+			jsonStr := string(match)
 
+			// Parse JSON
+			var jsonData interface{}
+			err := json.Unmarshal([]byte(jsonStr), &jsonData)
+			if err != nil {
+				fmt.Println("Error parsing JSON:", err)
+			} else {
+				// Print formatted JSON
+				jsonBytes, err := json.MarshalIndent(jsonData, "", "    ")
+				if err != nil {
+					fmt.Println("Error formatting JSON:", err)
+				} else {
+					aa = string(jsonBytes)
+					//fmt.Println(string(jsonBytes))
+				}
+			}
+		} else {
+			fmt.Println("No valid JSON found in the input string.")
+		}
+		return aa, ConvertToString(string(bytesData), "gbk", "utf-8")
+	//}else{
+
+		//return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
+	//}
 	//return string(out), string(bytesData)
 }
 

service/his_service.go

@@ -5,6 +5,7 @@ import (
 	"gdyb/models"
 	"github.com/jinzhu/gorm"
 	"time"
+	"strconv"
 )
 
 type HisPatient struct {
@@ -320,6 +321,8 @@ type OtherDrugWarehouseInfo struct {
 	WarehousingCount int64 `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
 	Status           int64 `gorm:"column:status" json:"status" form:"status"`
 	OrgId            int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
 }
 
 func (OtherDrugWarehouseInfo) TableName() string {
@@ -628,6 +631,8 @@ type HisOrder struct {
 	PayWays                 string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
 	OthDesc                 string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
 	SetlDetail              string  `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	FaPiaoSn     string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
+	//FaPiaoSn     string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
@@ -969,6 +974,13 @@ func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
 	return
 }
 
+func GetFaPiaoHisOrderByID(order_id int64) (order models.HisFaPiaoOrder, err error) {
+	str := strconv.FormatInt(order_id, 10)
+	key := "%" + str +"%"
+	err = readDb.Model(&models.HisFaPiaoOrder{}).Where("order_ids like ? and status = 1", key).First(&order).Error
+	return
+}
+
 func GetHisOrderByIDTwo(order_id int64) (order models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Preload("HisOrderInfo", "status = 1").Preload("HisPatient", "status = 1").Where("id = ? AND status = 1", order_id).First(&order).Error
 	return
@@ -1061,9 +1073,17 @@ func GetOrderByTimeFour(start_time int64, end_time int64, org_id int64) (orders
 	return
 }
 
+func GetOrderByTimeTenaaa(start_time int64, end_time int64, org_id int64,org string) (orders []*models.HisOrder, err error) {
+	db := readDb.Model(&models.HisOrder{})
+	db = db.Where("clr_options = ?  and user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? ", org,org_id, end_time, start_time)
+	err = db.Find(&orders).Error
+	return
+}
+
+
 func GetOrderByTime11222(start_time int64, end_time int64, org_id int64) (orders []*models.HisOrder, err error) {
 	db := readDb.Model(&models.HisOrder{})
-	db = db.Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ?", org_id, end_time, start_time)
+	db = db.Where("psn_name = '付云芳' and user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ?", org_id, end_time, start_time)
 	err = db.Find(&orders).Error
 	return
 }
@@ -1539,7 +1559,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 = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> ''  AND setl_time >= '2024-04-01 00:00:00' AND setl_time <= '2024-07-30 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138  AND status = 1  AND  order_status = 2 AND  setl_id <> ''  AND setl_time >= '2024-04-01 00:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
@@ -1549,17 +1569,23 @@ 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-01-01 00:00:00' AND setl_time <= '2024-03-31 23: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-04-01 00:00:00' AND setl_time <= '2024-09-30 23:00:00' and mdtrt_id not like '%out%'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
 
 func GetAllHisOrder10265() (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10265  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2023-09-01 00:00:00'").Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10265  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2024-09-01 00:00:00' AND setl_time <= '2024-09-30 23:59:00'").Order("setl_time asc").Find(&his).Error
 	fmt.Println(err)
 	return
 }
 
+//func GetAllHisOrder10265() (his []*models.HisOrder, err error) {
+//	err = readDb.Model(&models.HisOrder{}).Where(" user_org_id = 10265  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND setl_time >= '2023-09-01 00:00:00'").Order("setl_time asc").Find(&his).Error
+//	fmt.Println(err)
+//	return
+//}
+
 //	func GetAllHisOrder2(org_id int64) (his []models.HisOrder, err error) {
 //		err = readDb.Model(&models.HisOrder{}).Where("id = 180753").Order("setl_time asc").First(&his).Error
 //		return
@@ -1703,18 +1729,33 @@ func GetAllHisOrderTwo10485() (his []*models.HisOrder, err error) {
 	return
 }
 
-func GetNewDrugWarehouseInfo(id_arr []string) (newDrugWarehouse []*models.NewDrugWarehouseInfo, err error) {
-	readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and id in (?) ", 10191, id_arr).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", 10191).Preload("Dealers", "status = 1 AND org_id = ?", 10191).Find(&newDrugWarehouse)
+func GetNewDrugWarehouseInfo(org_id int64, id_arr []string) (newDrugWarehouse []*models.NewDrugWarehouseInfo, err error) {
+	readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and id in (?) ", org_id, id_arr).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&newDrugWarehouse)
+	return
+}
+
+func GetNewDrugFlowInfo(org_id int64,id_arr []string) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?)", org_id, id_arr).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }
 
-func GetNewDrugFlowInfo(id_arr []string) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?)", 10191, id_arr).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+
+func GetNewDrugFlowInfotwo() (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10188 and status = 1 and id >= ? and consumable_type = 3 and is_sale = 0", 2394762).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }
 
+
+func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10217 and status = 1 and id >= ?  and consumable_type = 3 and is_sale = 0", 2328112).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
+	return
+}
 func GetHisPrescriptionByID(id int64) (pre models.HisPrescription) {
 	err = readDb.Model(&models.HisPrescription{}).Where("id = ? and status = 1", id).Find(&pre).Error
 	return
@@ -1754,3 +1795,287 @@ func GetBbx01ByTeamID(team_id int64) (team models.XtHisProjectTeam) {
 	err = readDb.Model(&models.XtHisProjectTeam{}).Where("id = ?", team_id).First(&team).Error
 	return
 }
+func GetHisOrderDetailByNumber(order_number string, org_id int64) (order []*HisOrderInfo, err error) {
+	err = readDb.Model(&HisOrderInfo{}).Where("order_number = ? AND status = 1", order_number).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisPrescriptionTwo", "status = 1 AND user_org_id = ?", org_id).Preload("VMHisProject", "status = 1 AND user_org_id = ?", org_id).Preload("VMGoodInfo", "status = 1 AND org_id = ?", org_id)
+	}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("VMHisPrescriptionTwo", "status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status = 1 AND org_id = ?", org_id)
+	}).Find(&order).Error
+	return
+}
+
+
+type HisOrderInfo struct {
+	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber            string                 `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate             int64                  `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId               int64                  `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt       float64                `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                    float64                `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                   float64                `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId              int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedChrgitmType         string                 `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	Status                 int64                  `gorm:"column:status" json:"status" form:"status"`
+	FeedetlSn              string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	ChldMedcFlag           string                 `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	ChrgitmLv              string                 `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId              int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ProjectId              int64                  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	SelfpayProp            float64                `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	ItemId                 int64                  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	FulamtOwnpayAmt        float64                `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+}
+
+func (HisOrderInfo) TableName() string {
+	return "his_order_info"
+}
+
+
+type HisDoctorAdviceInfo struct {
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+
+	Price                float64              `gorm:"column:price" json:"price" form:"price"`
+	DrugId               int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Drug                 Drug                 `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+
+	IsMedicine           int64                `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId int64                `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+	IsSelfDrug           int64                `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+}
+
+type Drug struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	Dosage                      string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
+	Unval                       string  `gorm:"column:unval" json:"unval" form:"unval"`
+	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
+	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+}
+
+func (Drug) TableName() string {
+	return "xt_base_drug"
+}
+
+type VMHisProject struct {
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                      string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify              int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	StatisticalClassification int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
+	SingleDose                string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency        string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	DeliveryWay               string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	MedicalCode               string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+}
+
+func (VMHisProject) TableName() string {
+	return "xt_his_project"
+}
+
+type VMGoodInfo struct {
+	ID                     int64   `gorm:"column:id" json:"id"`
+	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name"`
+	GoodTypeId             int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id"`
+	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	PackingUnit            string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+}
+
+func (VMGoodInfo) TableName() string {
+	return "xt_good_information"
+}
+
+
+func (HisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+type VMHisPatient struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	BalanceAccountsType    int64   `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	Name                   string  `gorm:"column:name" json:"name" form:"name"`
+	Gender                 int64   `gorm:"column:gender" json:"gender" form:"gender"`
+	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
+	MedicalTreatmentType   int64   `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Age                    float64 `gorm:"column:age" json:"age" form:"age"`
+	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
+	IdCardNo               string  `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	AdminUserId            int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments            int64   `gorm:"column:departments" json:"departments" form:"departments"`
+	IsNeedCostOfProduction int64   `gorm:"column:is_need_cost_of_production" json:"is_need_cost_of_production" form:"is_need_cost_of_production"`
+	RegisterCost           float64 `gorm:"column:register_cost" json:"register_cost" form:"register_cost"`
+	TreatmentCost          float64 `gorm:"column:treatment_cost" json:"treatment_cost" form:"treatment_cost"`
+	CostOfProduction       float64 `gorm:"column:cost_of_production" json:"cost_of_production" form:"cost_of_production"`
+	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
+	UserOrgId              int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId              int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number                 string  `gorm:"column:number" json:"number" form:"number"`
+	Doctor                 int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	PsnNo                  string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType            string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno                 string  `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName                string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                   string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                   string  `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                   string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                  string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
+}
+
+func (VMHisPatient) TableName() string {
+	return "his_patient"
+}
+
+type HisPrescriptionProject struct {
+	ID                 int64        `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64      `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64        `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string       `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string       `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string       `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string       `gorm:"column:day" json:"day" form:"day"`
+	VMHisProject       VMHisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	VMGoodInfo         VMGoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+
+	Remark               string               `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string               `gorm:"column:unit" json:"unit" form:"unit"`
+
+	Type                 int64                `gorm:"column:type" json:"type" form:"type"`
+
+	Doctor         int64 `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime  int64 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff int64 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime      int64 `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState     int64 `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker        int64 `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime      int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId         int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
+
+	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ExecutionFrequencyId int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+}
+
+func (HisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}

service/jsyb_service.go

@@ -8,6 +8,7 @@ import (
 	"gdyb/utils/csbhttp"
 	//"io/ioutil"
 	"net"
+	"strings"
 	//"net/http"
 	"strconv"
 	"time"
@@ -241,7 +242,7 @@ func Jsyb1101ForEleCert(org_name string, doctor string, fixmedins_code string, i
 	inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
 	inputData["card_sn"] = ""           // 卡识别码
 	inputData["certno"] = id_card_no    // 证件号码
-	inputData["psn_cert_type"] = "1"    // 人员证件类型
+	inputData["psn_cert_type"] = "01"    // 人员证件类型
 
 	inputData["mdtrt_cert_no"] = Token // 就诊凭证编号
 	inputData["begntime"] = ""         // 开始时间
@@ -1718,14 +1719,15 @@ func Jsyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 
 func Jsyb3501(struct3501 models.Struct3501) (string, string) {
 	timestamp := time.Now().Unix()
+
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.Code, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3501"                                  // 交易编码
 	inputData["med_list_codg"] = struct3501.MedListCodg             // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3501.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3501.FixmedinsHilistName         // 定点医药机构目录名称
 	inputData["rx_flag"] = struct3501.RxFlag                        //
 	inputData["invdate"] = struct3501.Invdate                       // 人员编号 （来自1101接口返回）
 	inputData["inv_cnt"] = struct3501.InvCnt                        // 人员编号 （来自1101接口返回）
@@ -1734,6 +1736,11 @@ func Jsyb3501(struct3501 models.Struct3501) (string, string) {
 	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
 	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
 	inputData["memo"] = ""                                          // 人员编号 （来自1101接口返回）
+	feedetail := make([]map[string]interface{}, 0)
+	druginputData := make(map[string]interface{})
+	druginputData["drug_trac_codg"] = struct3501.DrugTracCodg
+	feedetail = append(feedetail,druginputData)
+	inputData["drugtracinfo"] = feedetail
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -1750,7 +1757,7 @@ func Jsyb3501(struct3501 models.Struct3501) (string, string) {
 func Jsyb3502(struct3502 models.Struct3502) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsCode, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.Code, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3502"                      // 交易编码
@@ -1758,7 +1765,7 @@ func Jsyb3502(struct3502 models.Struct3502) (string, string) {
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
 
 	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3502.OrgName     // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3502.FixmedinsHilistName     // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
 	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
 	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
@@ -1769,6 +1776,12 @@ func Jsyb3502(struct3502 models.Struct3502) (string, string) {
 	inputData["memo"] = struct3502.Memo               // 人员编号 （来自1101接口返回）
 	inputData["trdn_flag"] = ""                       // 人员编号 （来自1101接口返回）
 
+	input["invinfo"] = inputData
+	feedetail := make([]map[string]interface{}, 0)
+	druginputData := make(map[string]interface{})
+	druginputData["drug_trac_codg"] = struct3502.DrugTracCodg
+	feedetail = append(feedetail,druginputData)
+	inputData["drugtracinfo"] = feedetail
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -1786,7 +1799,7 @@ func Jsyb3503(struct3503 models.Struct3503) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
 	fmt.Println(struct3503)
-	inputMessage := SetJSInputMessage(timestamp, struct3503.OrgName, struct3503.Opter, struct3503.FixmedinsHilistId, struct3503.InsuplcAdmdvs, struct3503.MdtrtareaAdmvs, struct3503.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3503.OrgName, struct3503.Opter, struct3503.Code, struct3503.InsuplcAdmdvs, struct3503.MdtrtareaAdmvs, struct3503.Cainfo)
 
 	input := make(map[string]interface{})
 
@@ -1832,7 +1845,7 @@ func Jsyb3503(struct3503 models.Struct3503) (string, string) {
 func Jsyb3504(struct3504 models.Struct3504) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3504.OrgName, struct3504.Opter, struct3504.FixmedinsCode, struct3504.InsuplcAdmdvs, struct3504.MdtrtareaAdmvs, struct3504.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3504.OrgName, struct3504.Opter, struct3504.Code, struct3504.InsuplcAdmdvs, struct3504.MdtrtareaAdmvs, struct3504.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3504"                                      // 交易编码
@@ -1870,13 +1883,13 @@ func Jsyb3504(struct3504 models.Struct3504) (string, string) {
 func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.Code, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := 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接口返回）
@@ -1916,6 +1929,16 @@ func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 	inputData["sel_retn_time"] = struct3505.SelRetnTime            // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3505.Memo                            // 人员编号 （来自1101接口返回）
+	//input["selinfo"] = inputData
+	feedetail := make([]map[string]interface{}, 0)
+
+	codes := strings.Split(struct3505.DrugTracCodg,",")
+	for _,item := range codes{
+		druginputData := make(map[string]interface{})
+		druginputData["drug_trac_codg"] = item
+		feedetail = append(feedetail,druginputData)
+	}
+	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -1932,13 +1955,13 @@ func Jsyb3505(struct3505 models.Struct3505) (string, string) {
 func Jsyb3506(struct3506 models.Struct3506) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsCode, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.Code, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3506"                                  // 交易编码
 	inputData["med_list_codg"] = struct3506.MedListCodg             // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3506.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_hilist_name"] = struct3506.FixmedinsHilistName         // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno        // 人员编号 （来自1101接口返回）
 
 	inputData["setl_id"] = struct3506.SetlId                       // 人员编号 （来自1101接口返回）
@@ -1958,6 +1981,17 @@ func Jsyb3506(struct3506 models.Struct3506) (string, string) {
 	inputData["memo"] = ""                                         // 人员编号 （来自1101接口返回）
 	inputData["medins_prod_sel_no"] = ""                           // 人员编号 （来自1101接口返回）
 
+	feedetail := make([]map[string]interface{}, 0)
+
+	codes := strings.Split(struct3506.DrugTracCodg,",")
+	for _,item := range codes{
+		druginputData := make(map[string]interface{})
+		druginputData["drug_trac_codg"] = item
+		feedetail = append(feedetail,druginputData)
+	}
+	//input["drugtracinfo"] = feedetail
+	//input["drugtracinfo"] = struct3506.DrugTracCodg
+	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -1978,7 +2012,7 @@ func Jsyb3507(struct3507 models.Struct3507) (string, string) {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3507"                          // 交易编码
-	inputData["fixmedins_bchno"] = struct3507.FixmedinsCode // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3507.FixmedinsBchno // 人员编号 （来自1101接口返回）
 	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData

service/jx_service.go

@@ -1027,7 +1027,7 @@ func Jxyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doct
 func Jxyb5203(baseParams models.BaseParams, businessParams models.BusinessParams) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJXInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
+	inputMessage := SetJXInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, "440300", baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "5203" // 交易编码
@@ -1050,7 +1050,7 @@ func Jxyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 func Jxyb5202(baseParams models.BaseParams, businessParams models.BusinessParams) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJXInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, baseParams.InsuplcAdmdvs, baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
+	inputMessage := SetJXInputMessage(timestamp, baseParams.OrgName, baseParams.Doctor, baseParams.FixmedinsCode, "440300", baseParams.MdtrtareaAdmvs, baseParams.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "5202" // 交易编码
@@ -1931,8 +1931,8 @@ func Jxyb3201(fixmedins_setl_cnt int64,  stmt_begndate string, stmt_enddate stri
 	inputData["medfee_sumamt"] = medfee_sumamt           //医疗费总额
 	inputData["fund_pay_sumamt"] = fund_pay_sumamt       //基金支付总额
 	inputData["acct_pay"] = acct_pay                     //个人账户支付金额
-	inputData["fixmedins_setl_cnt"] = fixmedins_setl_cnt //定点医药机构结算笔数
-	inputData["refd_setl_flag"] = 0                      //
+	inputData["fixmedins_setl_cnt"] = 20 //定点医药机构结算笔数
+	inputData["refd_setl_flag"] = 1                  //
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入

utils/csbhttp/httpcaller.go

@@ -19,8 +19,9 @@ CSB-HTTP-SDK based on GO language.
 package csbhttp
 
 import (
+	//
 	"fmt"
-	//"crypto/tls"
+	"crypto/tls"
 	"bytes"
 	"encoding/json"
 	"io/ioutil"
@@ -179,6 +180,7 @@ func Invoke(params HttpParams, time_stamp string) (str string, rtnHeaders map[st
 
 	client := &http.Client{
 		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 			Dial: func(netw, addr string) (net.Conn, error) {
 				conn, err := net.DialTimeout(netw, addr, defaultSetting.ConnectTimeout) //设置建立连接超时
 				if err != nil {