111

conf/app.conf

@@ -55,7 +55,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
 #gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 
-gdyb_url = "http://test.inner.getway.ylbzj.hebei.gov.cn/ebus/rio_fsi/"
+gdyb_url = "http://test.inner.getway.ylbzj.hebei.gov.cn/ebus/mbs_fsi_auth"
 #test
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
 #gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
@@ -80,7 +80,7 @@ gdyb_url = "http://test.inner.getway.ylbzj.hebei.gov.cn/ebus/rio_fsi/"
 #gdyb_paasid = "gdyb_inf"
 #江西
 #gdyb_url = "http://10.77.211.236/CSB/hsa-fsi-"
-gdyb_paasid = "mbs_fsi_auth
+gdyb_paasid = "mbs_fsi_auth"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/coordinate/coordinate_controller.go

@@ -16,6 +16,16 @@ import (
 	"time"
 )
 
+type ZBDrug struct {
+	Code   string `json:"code"`
+	Msg    string `json:"msg"`
+	Result []struct {
+		Bbx01 int64  `json:"bbx01"`
+		Bby01 int64  `json:"bby01"`
+		Kf    string `json:"库房id"`
+	} `json:"result"`
+}
+
 type ResultUpload struct {
 	Code   string `json:"code"`
 	Msg    string `json:"msg"`
@@ -57,6 +67,11 @@ type ResultReg struct {
 	InfoSeq    string `json:"infoSeq"`
 }
 
+type GroupPrescription struct {
+	GroupNo int64
+	PId     int64
+}
+
 func CoordinateRegistRouters() {
 	beego.Router("/coordinate/settleAccount", &CoordinateController{}, "get:SettleAccount")
 
@@ -212,6 +227,20 @@ func (c *CoordinateController) SettleAccount() {
 		info.Bck01c = departmwnt.Number
 		info.Bce02a = doctor_info.DoctorNumber
 
+		var info2 models.UploadInfo
+		info2.Vaa01 = res.Result[0].Vaa01
+		info2.Fasong = "1"
+		info2.Vaa07 = res.Result[0].Vaa07
+		info2.Bck01c = departmwnt.Number
+		info2.Bce02a = doctor_info.DoctorNumber
+
+		var info3 models.UploadInfo
+		info3.Vaa01 = res.Result[0].Vaa01
+		info3.Fasong = "1"
+		info3.Vaa07 = res.Result[0].Vaa07
+		info3.Bck01c = departmwnt.Number
+		info3.Bce02a = doctor_info.DoctorNumber
+
 		diagnosis_ids := strings.Split(patientPrescription.Diagnosis, ",")
 		var config []*models.HisXtDiagnoseConfig
 		for _, item := range diagnosis_ids {
@@ -226,18 +255,30 @@ func (c *CoordinateController) SettleAccount() {
 			info.Diag = append(info.Diag, &diag)
 		}
 		var presInfos []*models.PresInfo
-		var presDetails []*models.PresDetail
+		var presInfos2 []*models.PresInfo
+		var presInfos3 []*models.PresInfo
 
 		var doctoradvices []*models.HisDoctorAdviceInfo
-		var groups []int64
+		var projects []*models.HisPrescriptionProject
+
+		var groups []*GroupPrescription
 		for _, item := range prescriptions {
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				doctoradvices = append(doctoradvices, subItem)
 			}
 		}
 
+		for _, item := range prescriptions {
+			for _, subItem := range item.HisPrescriptionProject {
+				projects = append(projects, subItem)
+			}
+		}
+
 		for _, item := range doctoradvices {
-			groups = append(groups, item.Groupno)
+			var gp GroupPrescription
+			gp.GroupNo = item.Groupno
+			gp.PId = item.PrescriptionId
+			groups = append(groups, &gp)
 		}
 		groups = RemoveRepeatedGroupElement(groups)
 
@@ -247,206 +288,222 @@ func (c *CoordinateController) SettleAccount() {
 		}
 		var doctoradvice []*DoctorAdvices
 
-		for _, group := range groups {
+		for index, group := range groups {
 			var da DoctorAdvices
-			da.GroupNo = group
+			da.GroupNo = group.GroupNo + int64(index)
 			for _, item := range doctoradvices {
-				if group == item.Groupno {
+				if group.GroupNo == item.Groupno && group.PId == item.PrescriptionId {
 					da.item = append(da.item, item)
 				}
 			}
+
 			doctoradvice = append(doctoradvice, &da)
 		}
 
+		fmt.Println("doctoradvice")
+		fmt.Println(doctoradvice)
+
+		var presInfo models.PresInfo
+		presInfo.Cbmid = "0"
+		presInfo.Cbm06 = "0"
+		presInfo.Cbm07 = "0"
+		var presDetails []*models.PresDetail
+
+		var presInfo2 models.PresInfo
+		presInfo2.Cbmid = "0"
+		presInfo2.Cbm06 = "9"
+		presInfo2.Cbm07 = "0"
+		var presDetails2 []*models.PresDetail
+
+		var presInfo3 models.PresInfo
+		presInfo3.Cbmid = "0"
+		presInfo3.Cbm06 = "5"
+		presInfo3.Cbm07 = "0"
+		var presDetails3 []*models.PresDetail
+
 		for _, item := range doctoradvice {
 			var presDetail models.PresDetail
-			var presInfo models.PresInfo
-			presInfo.Cbmid = strconv.FormatInt(item.GroupNo, 10)
-
-			presInfo.Cbm06 = "0"
-			presInfo.Cbm07 = ""
 			presDetail.Vaf59 = strconv.FormatInt(item.GroupNo, 10)
 			var infoItems []*models.Item
 			for index, subItem := range item.item {
 				ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
+				result3, request3 := service.GetDrugInfo(subItem.BaseDrugLib.MedicalInsuranceNumber)
+				saveLog(result3, request3, "查询药品", "查询药品", org.OrgName)
+
+				var res ZBDrug
+				if err := json.Unmarshal([]byte(result3), &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 
 				var infoItem models.Item
-				infoItem.Rownr = strconv.FormatInt(int64(index), 10)
+				infoItem.Rownr = strconv.FormatInt(int64(index+1), 10)
 				infoItem.Vaf11 = "2"
 				infoItem.Vaf36 = time.Unix(subItem.CreatedTime, 0).Format("2006-01-02 15:04:05")
 				infoItem.Bbx01 = subItem.BaseDrugLib.MedicalInsuranceNumber
 				infoItem.Bda01 = "1"
-				infoItem.Bby01 = ""
+				infoItem.Bby01 = strconv.FormatInt(res.Result[0].Bby01, 10)
 				if subItem.BaseDrugLib.MinUnit != subItem.BaseDrugLib.DoseUnit {
-					infoItem.Vaf22 = subItem.BaseDrugLib.DrugName + " " + subItem.BaseDrugLib.Dose + subItem.BaseDrugLib.DoseUnit + "*" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit + "/" + subItem.BaseDrugLib.MaxUnit
+					infoItem.Vaf22 = subItem.BaseDrugLib.DrugName + " " + subItem.BaseDrugLib.DoseUnit + "*" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit + "/" + subItem.BaseDrugLib.MaxUnit
 				}
 				infoItem.Vaf14 = subItem.BaseDrugLib.DrugName
 				infoItem.Bdi01 = ef.Code
 				infoItem.Vaf17 = strconv.FormatInt(subItem.Day, 10)
 				infoItem.Vaf18 = fmt.Sprintf("%.2f", subItem.SingleDose)
+				infoItem.Vaf15 = subItem.DeliveryWay
 
 				infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
 				infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
 				infoItem.Vaf35 = "0"
 				infoItem.Vaf32 = "0"
-				infoItem.Bck01b = departmwnt.Number
+				fmt.Println(res.Result[0].Kf)
+				infoItem.Bck01b = res.Result[0].Kf
 				infoItem.Bck01d = departmwnt.Number
 				infoItem.Vaf58 = "0"
 				infoItem.Vaf61 = "1"
 				infoItems = append(infoItems, &infoItem)
-			}
 
+				var infoItem2 models.Item //用药途径
+				project, _ := service.GetWayInfoByName(subItem.DeliveryWay, 10340)
+				infoItem2.Rownr = "0"
+				infoItem2.Vaf11 = "2"
+				infoItem2.Vaf36 = time.Unix(subItem.CreatedTime, 0).Format("2006-01-02 15:04:05")
+				infoItem2.Bbx01 = project.MedicalCode
+				infoItem2.Bda01 = "Z"
+				infoItem2.Bby01 = project.MedicalCode
+				infoItem2.Vaf14 = project.ProjectName
+				infoItem2.Vaf15 = project.ProjectName
+				infoItem2.Bdi01 = "160"
+				infoItem2.Vaf17 = strconv.FormatInt(subItem.Day, 10)
+				infoItem2.Vaf20 = "1"
+				infoItem2.Vaf21 = "1"
+				infoItem2.Vaf35 = "0"
+				infoItem2.Vaf18 = "0"
+				infoItem2.Vaf32 = "1"
+				infoItem2.Bck01b = departmwnt.Number
+				infoItem2.Bck01d = res.Result[0].Kf
+				infoItem2.Vaf58 = "0"
+				infoItem2.Vaf61 = "1"
+				infoItems = append(infoItems, &infoItem2)
+
+				fmt.Println(infoItems)
+			}
 			presDetail.Item = infoItems
 			presDetails = append(presDetails, &presDetail)
-			presInfo.PresDetail = presDetails
-			presInfos = append(presInfos, &presInfo)
-
 		}
 
-		for index, item := range prescriptions {
-			var presDetail models.PresDetail
-			var presInfo models.PresInfo
-			presInfo.Cbmid = strconv.FormatInt(item.ID, 10)
-			if item.Type == 1 {
-				presInfo.Cbm06 = "0"
-			} else {
-				presInfo.Cbm06 = "5"
-			}
+		for index, subItem := range projects {
 
-			if item.Type == 1 {
-				presInfo.Cbm07 = item.MedType
-			} else {
-				presInfo.Cbm07 = item.MedType
-			}
+			if subItem.Type == 2 {
+				var presDetail2 models.PresDetail
+				presDetail2.Vaf59 = strconv.FormatInt(int64(index+1), 10)
+				var infoItems2 []*models.Item
+				var infoItem models.Item
+				infoItem.Rownr = "1"
+				infoItem.Vaf11 = "0"
+				infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
+				infoItem.Bbx01 = subItem.HisProject.MedicalCode
+
+				if subItem.HisProject.CostClassify == 2 {
+					infoItem.Bda01 = "T"
+				} else if subItem.HisProject.CostClassify == 3 {
+					infoItem.Bda01 = "L"
+				} else {
+					infoItem.Bda01 = "T"
+				}
+				infoItem.Bby01 = "0"
+				infoItem.Vaf14 = subItem.HisProject.ProjectName
+				infoItem.Vaf22 = subItem.HisProject.ProjectName
+				infoItem.Bdi01 = "160"
+				infoItem.Vaf17 = "1"
+				infoItem.Vaf20 = "1"
+				infoItem.Vaf21 = subItem.Count
+				infoItem.Vaf35 = "0"
+				infoItem.Vaf18 = "0"
+				infoItem.Vaf32 = "0"
+				infoItem.Bck01b = departmwnt.Number
+				infoItem.Bck01d = departmwnt.Number
+				infoItem.Vaf58 = "0"
+				infoItem.Vaf61 = "1"
+				infoItems2 = append(infoItems2, &infoItem)
+				presDetail2.Item = infoItems2
+				presDetails2 = append(presDetails2, &presDetail2)
 
-			presDetail.Vaf59 = strconv.FormatInt(int64(index+1), 10)
-			var infoItems []*models.Item
-			//for index, subItem := range item.HisDoctorAdviceInfo {
-			//	ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
-			//
-			//	var infoItem models.Item
-			//	infoItem.Rownr = strconv.FormatInt(int64(index+1), 10)
-			//	infoItem.Vaf11 = "2"
-			//	infoItem.Vaf36 = time.Unix(subItem.ExecutionTime, 0).Format("2006-01-02 15:04:05")
-			//	infoItem.Bbx01 = subItem.BaseDrugLib.MedicalInsuranceNumber
-			//	infoItem.Bda01 = "1"
-			//	infoItem.Bby01 = ""
-			//	if subItem.BaseDrugLib.MinUnit != subItem.BaseDrugLib.DoseUnit {
-			//		infoItem.Vaf22 = subItem.BaseDrugLib.DrugName + " " + subItem.BaseDrugLib.Dose + subItem.BaseDrugLib.DoseUnit + "*" + strconv.FormatInt(subItem.BaseDrugLib.MinNumber, 10) + subItem.BaseDrugLib.MinUnit + "/" + subItem.BaseDrugLib.MaxUnit
-			//	}
-			//	infoItem.Vaf14 = subItem.BaseDrugLib.DrugName
-			//	infoItem.Bdi01 = ef.Code
-			//	infoItem.Vaf17 = strconv.FormatInt(subItem.Day, 10)
-			//	infoItem.Vaf20 = fmt.Sprintf("%.2f", subItem.SingleDose)
-			//	infoItem.Vaf21 = fmt.Sprintf("%.2f", subItem.PrescribingNumber)
-			//	infoItem.Vaf35 = "0"
-			//	infoItem.Vaf32 = "0"
-			//	infoItem.Bck01b = departmwnt.Number
-			//	infoItem.Bck01d = departmwnt.Number
-			//	infoItem.Vaf58 = "0"
-			//	infoItem.Vaf61 = "1"
-			//	infoItems = append(infoItems, &infoItem)
-			//}
-			for _, subItem := range item.HisPrescriptionProject {
-				//ef, _ := service.GetExecutionFrequencyByName(subItem.ExecutionFrequency, subItem.UserOrgId)
-
-				if subItem.Type == 2 {
-					if subItem.HisProject.CostClassify == 10 {
-						var infoItem models.Item
-						infoItem.Rownr = "0"
-						infoItem.Vaf11 = "2"
-						infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
-						infoItem.Bbx01 = subItem.HisProject.MedicalCode
-						infoItem.Bda01 = "Z"
-						infoItem.Bby01 = ""
-						infoItem.Vaf14 = subItem.HisProject.ProjectName
-						infoItem.Vaf15 = subItem.HisProject.ProjectName
-						infoItem.Bdi01 = "160"
-						infoItem.Vaf17 = subItem.Day
-						infoItem.Vaf20 = subItem.SingleDose
-						infoItem.Vaf21 = subItem.Count
-						infoItem.Vaf35 = "0"
-						infoItem.Vaf18 = ""
-						infoItem.Vaf32 = "1"
-						infoItem.Bck01b = departmwnt.Number
-						infoItem.Bck01d = departmwnt.Number
-						infoItem.Vaf58 = "0"
-						infoItem.Vaf61 = "1"
-						infoItems = append(infoItems, &infoItem)
+			} else {
+				var presDetail3 models.PresDetail
+				presDetail3.Vaf59 = strconv.FormatInt(int64(index+1), 10)
+				var infoItems2 []*models.Item
+				var infoItem models.Item
+				result3, request3 := service.GetGoodInfo(subItem.GoodInfo.MedicalInsuranceNumber)
+				saveLog(result3, request3, "查询耗材", "查询耗材", org.OrgName)
+				var res ZBDrug
+				if err := json.Unmarshal([]byte(result3), &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 
-					} else {
+				infoItem.Rownr = "1"
+				infoItem.Vaf11 = "0"
+				infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
+				infoItem.Bbx01 = subItem.GoodInfo.MedicalInsuranceNumber
+				infoItem.Bda01 = "M"
+				infoItem.Bby01 = strconv.FormatInt(res.Result[0].Bby01, 10)
+				infoItem.Vaf14 = subItem.GoodInfo.GoodName + " " + subItem.GoodInfo.SpecificationName
+				infoItem.Vaf22 = subItem.GoodInfo.GoodName + " " + subItem.GoodInfo.SpecificationName
+				infoItem.Bdi01 = "160"
+				infoItem.Vaf17 = "1"
+				infoItem.Vaf18 = "0"
+				infoItem.Vaf20 = subItem.SingleDose
+				infoItem.Vaf21 = subItem.Count
+				infoItem.Vaf35 = "0"
+				infoItem.Vaf32 = "0"
+				infoItem.Bck01b = res.Result[0].Kf
+				infoItem.Bck01d = departmwnt.Number
+				infoItem.Vaf58 = "0"
+				infoItem.Vaf61 = "1"
+				infoItems2 = append(infoItems2, &infoItem)
+				presDetail3.Item = infoItems2
+				presDetails3 = append(presDetails3, &presDetail3)
 
-						var infoItem models.Item
-						infoItem.Rownr = "0"
-						infoItem.Vaf11 = "1"
-						infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
-						infoItem.Bbx01 = subItem.HisProject.MedicalCode
-
-						if subItem.HisProject.CostClassify == 2 {
-							infoItem.Bda01 = "T"
-						} else if subItem.HisProject.CostClassify == 3 {
-							infoItem.Bda01 = "L"
-						} else {
-							infoItem.Bda01 = "T"
-						}
-						infoItem.Bby01 = ""
-						infoItem.Vaf14 = subItem.HisProject.ProjectName
-
-						infoItem.Bdi01 = "160"
-						infoItem.Vaf17 = subItem.Day
-						infoItem.Vaf20 = subItem.SingleDose
-						infoItem.Vaf21 = subItem.Count
-						infoItem.Vaf35 = "0"
-						infoItem.Vaf18 = fmt.Sprintf("%.2f", subItem.SingleDose)
-						infoItem.Vaf32 = "0"
-						infoItem.Bck01b = departmwnt.Number
-						infoItem.Bck01d = departmwnt.Number
-						infoItem.Vaf58 = "0"
-						infoItem.Vaf61 = "1"
-						infoItems = append(infoItems, &infoItem)
+			}
+		}
 
-					}
+		presInfo.PresDetail = presDetails
+		presInfo2.PresDetail = presDetails2
+		presInfo3.PresDetail = presDetails3
 
-				} else {
-					var infoItem models.Item
-					infoItem.Rownr = "0"
-					infoItem.Vaf11 = "1"
-					infoItem.Vaf36 = time.Unix(subItem.Ctime, 0).Format("2006-01-02 15:04:05")
-					infoItem.Bbx01 = subItem.GoodInfo.MedicalInsuranceNumber
-					infoItem.Bda01 = "M"
-					infoItem.Bby01 = ""
-					infoItem.Vaf14 = subItem.GoodInfo.GoodName + " " + subItem.GoodInfo.SpecificationName
-					infoItem.Bdi01 = "160"
-					infoItem.Vaf17 = subItem.Day
-					infoItem.Vaf20 = subItem.SingleDose
-					infoItem.Vaf21 = subItem.Count
-					infoItem.Vaf35 = "0"
-					infoItem.Vaf32 = "0"
-					infoItem.Bck01b = departmwnt.Number
-					infoItem.Bck01d = departmwnt.Number
-					infoItem.Vaf58 = "0"
-					infoItem.Vaf61 = "1"
-					infoItems = append(infoItems, &infoItem)
+		presInfos = append(presInfos, &presInfo)
+		presInfos2 = append(presInfos2, &presInfo2)
+		presInfos3 = append(presInfos3, &presInfo3)
 
-				}
+		info.PresInfo = presInfos
+		info2.PresInfo = presInfos2
+		info3.PresInfo = presInfos3
 
-			}
+		var infos []models.UploadInfo
 
-			presDetail.Item = infoItems
-			presDetails = append(presDetails, &presDetail)
-			presInfo.PresDetail = presDetails
-			presInfos = append(presInfos, &presInfo)
-		}
+		infos = append(infos, info)
+		infos = append(infos, info2)
+		infos = append(infos, info3)
 
-		info.PresInfo = presInfos
 		var result2 string
 		var request2 string
 		if res.Result[0].Type == "1" {
-			result2, request2 = service.UploadPrescriptionForCoordinate(info)
+			for _, item := range infos {
+				result2, request2 = service.UploadPrescriptionForCoordinate(item)
+				saveLog(result2, request2, "上传明细", "上传明细", org.OrgName)
+
+			}
+
 		} else {
-			result2, request2 = service.UploadPrescriptionForCoordinateHospital(info)
+			for _, item := range infos {
+				result2, request2 = service.UploadPrescriptionForCoordinateHospital(item)
+				saveLog(result2, request2, "上传明细", "上传明细", org.OrgName)
+
+			}
 		}
-		saveLog(result2, request2, "上传明细", "上传明细", org.OrgName)
 
 		var res2 ResultUpload
 		if err := json.Unmarshal([]byte(result2), &res2); err != nil {
@@ -653,12 +710,12 @@ func saveLog(result string, request string, infno string, desc string, org_name
 
 }
 
-func RemoveRepeatedGroupElement(arr []int64) (newArr []int64) {
-	newArr = make([]int64, 0)
+func RemoveRepeatedGroupElement(arr []*GroupPrescription) (newArr []*GroupPrescription) {
+	newArr = make([]*GroupPrescription, 0)
 	for i := 0; i < len(arr); i++ {
 		repeat := false
 		for j := i + 1; j < len(arr); j++ {
-			if arr[i] == arr[j] {
+			if arr[i].GroupNo == arr[j].GroupNo && arr[i].PId == arr[j].PId {
 				repeat = true
 				break
 			}

controllers/js/jsyb_controller.go

@@ -67,7 +67,7 @@ func (c *JSybController) Get3501() {
 		return
 	}
 
-	userJSONBytes, _ := json.Marshal(respJSON["config"])
+	userJSONBytes, _ := json.Marshal(respJSON["struct_3501s"])
 	var struct3501 []models.Struct3501
 	if err := json.Unmarshal(userJSONBytes, &struct3501); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
@@ -99,7 +99,7 @@ func (c *JSybController) Get3502() {
 		return
 	}
 
-	userJSONBytes, _ := json.Marshal(respJSON["config"])
+	userJSONBytes, _ := json.Marshal(respJSON["struct_3502s"])
 	var struct3502s []models.Struct3502
 	if err := json.Unmarshal(userJSONBytes, &struct3502s); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
@@ -107,7 +107,7 @@ func (c *JSybController) Get3502() {
 	}
 
 	result, request_log := service.Jsyb3502(struct3502s[0])
-	saveJsLog(result, request_log, "3501", "库存盘点", struct3502s[0].OrgName)
+	saveJsLog(result, request_log, "3502", "库存盘点", struct3502s[0].OrgName)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 	} else {
@@ -131,12 +131,13 @@ func (c *JSybController) Get3503() {
 		return
 	}
 
-	userJSONBytes, _ := json.Marshal(respJSON["config"])
+	userJSONBytes, _ := json.Marshal(respJSON["struct_3503s"])
 	var struct3503 models.Struct3503
 	if err := json.Unmarshal(userJSONBytes, &struct3503); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
+	fmt.Println(struct3503)
 
 	result, request_log := service.Jsyb3503(struct3503)
 	saveJsLog(result, request_log, "3503", "库存采购", struct3503.OrgName)
@@ -163,7 +164,7 @@ func (c *JSybController) Get3504() {
 		return
 	}
 
-	userJSONBytes, _ := json.Marshal(respJSON["config"])
+	userJSONBytes, _ := json.Marshal(respJSON["struct_3504s"])
 	var struct3504 []models.Struct3504
 	if err := json.Unmarshal(userJSONBytes, &struct3504); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
@@ -195,15 +196,15 @@ func (c *JSybController) Get3505() {
 		return
 	}
 
-	userJSONBytes, _ := json.Marshal(respJSON["config"])
-	var struct3505 []models.Struct3505
+	userJSONBytes, _ := json.Marshal(respJSON["struct_3505s"])
+	var struct3505 models.Struct3505
 	if err := json.Unmarshal(userJSONBytes, &struct3505); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
 
-	result, request_log := service.Jsyb3505(struct3505[0])
-	saveJsLog(result, request_log, "3505", "库存盘点", struct3505[0].OrgName)
+	result, request_log := service.Jsyb3505(struct3505)
+	saveJsLog(result, request_log, "3505", "销售", struct3505.OrgName)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 	} else {
@@ -227,15 +228,15 @@ func (c *JSybController) Get3506() {
 		return
 	}
 
-	userJSONBytes, _ := json.Marshal(respJSON["config"])
-	var struct3506 []models.Struct3506
+	userJSONBytes, _ := json.Marshal(respJSON["struct_3506s"])
+	var struct3506 models.Struct3506
 	if err := json.Unmarshal(userJSONBytes, &struct3506); err != nil {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
 
-	result, request_log := service.Jsyb3506(struct3506[0])
-	saveJsLog(result, request_log, "3506", "库存盘点", struct3506[0].OrgName)
+	result, request_log := service.Jsyb3506(struct3506)
+	saveJsLog(result, request_log, "3506", "销售退库", struct3506.OrgName)
 	var dat2 map[string]interface{}
 	if err := json.Unmarshal([]byte(request_log), &dat2); err == nil {
 	} else {
@@ -259,7 +260,7 @@ func (c *JSybController) Get3507() {
 		return
 	}
 
-	userJSONBytes, _ := json.Marshal(respJSON["config"])
+	userJSONBytes, _ := json.Marshal(respJSON["struct_3507s"])
 	var struct3507 []models.Struct3507
 	if err := json.Unmarshal(userJSONBytes, &struct3507); err != nil {
 		utils.ErrorLog("解析失败：%v", err)

controllers/sg/his_api_controller.go

@@ -431,6 +431,24 @@ func (c *HisApiController) Get9001() {
 
 	if miConfig.MdtrtareaAdmvs == "350500" {
 		service.GetFjAuthorizationInfo(miConfig.Code)
+	} else if miConfig.MdtrtareaAdmvs == "131023" {
+
+		result, _ := service.HeBeiyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
+
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+		userJSONBytes, _ := json.Marshal(dat)
+		var res models.Result9001
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
 	} else {
 		result, _ := service.Gdyb9001(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1669)
 
@@ -2526,10 +2544,12 @@ func (c *HisApiController) ReadCard() {
 			id_card_str := strings.Split(SFZStr, "^")
 
 			card_no := id_card_str[0]
-			name := id_card_str[1]
+			patient, _ := service.GetPatientByNumber(card_no, c.GetAdminUserInfo().CurrentOrgId)
 
-			name = ConvertToString(name, "gbk", "utf-8")
-			result, _ := service.Hnyb1101(card_no, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", "1", miConfig.Url, miConfig.AccessKey, "", name, card_no)
+			//name := id_card_str[1]
+
+			//name = ConvertToString(name, "gbk", "utf-8")
+			result, _ := service.Hnyb1101(card_no, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", "1", miConfig.Url, miConfig.AccessKey, "", patient.Name, card_no)
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)
@@ -3690,12 +3710,12 @@ func (c *HisApiController) GetSFZBaseInfo() string {
 		readCard = DllDef.MustFindProc("ReadSFZ")
 	}
 
-	str := make([]byte, 1024)
-	str1 := make([]byte, 1024)
-	r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(4096), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(4096))
+	str := make([]byte, 8096)
+	str1 := make([]byte, 8096)
+	r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(8096), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(8096))
 
 	fmt.Println(r)
-	return string(str)
+	return Remove0000(string(str))
 }
 
 func (c *HisApiController) GetEleBaseInfo() string {
@@ -5096,14 +5116,14 @@ func (c *HisApiController) GetSettleListHospital() {
 }
 
 func (c *HisApiController) GetBatchSettleList() {
-	orders, _ := service.GetAllHisOrder(10138)
+	orders, _ := service.GetAllHisOrder(10106)
 	for _, item := range orders {
 		order_id := item.ID
 		order, _ := service.GetHisOrderByIDTwo(order_id)
 		roles, _ := service.GetDoctorListTwo(c.GetAdminUserInfo().CurrentOrgId)
 		his, _ := service.GetHisPatientByNumber(order.MdtrtId)
 		admin, _ := service.GetAdminUserByUserID(roles[0].AdminUserId)
-		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2185)
+		curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, 2495)
 		depart, _ := service.GetDepartMentDetail(curRoles.DepartmentId)
 		miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
@@ -7241,6 +7261,66 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			}
 
+		} else if miConfig.MdtrtareaAdmvs == "131023" {
+
+			var result string
+			var requestLog string
+			result, requestLog = service.HeBeiyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), "")
+			if id_card_type == 4 {
+				psn_info, _ := service.GetPsnByPatientId(id)
+				PsnNo = psn_info.PsnNo
+				PsnCertType = psn_info.PsnCertType
+				Certno = psn_info.Certno
+				PsnName = psn_info.PsnName
+				Gend = psn_info.Gend
+				Naty = psn_info.Naty
+				Brdy = psn_info.Brdy
+				Age = psn_info.Age
+				infoStr = psn_info.Insuinfo
+				idetinfoStr = psn_info.Idetinfo
+				infocode = 0
+				verify_number = psn_info.VerifyNumber
+
+			} else {
+				saveLog(result, requestLog, "1101", "人员基本信息获取")
+				if miConfig.Code == "H15049901371" {
+
+					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res.ErrMsg = res10265.ErrMsg
+					res.Output = res10265.Output
+					res.InfRefmsgid = res10265.InfRefmsgid
+
+				} else {
+					if err := json.Unmarshal([]byte(result), &res); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
+				PsnNo = res.Output.Baseinfo.PsnNo
+				PsnCertType = res.Output.Baseinfo.PsnCertType
+				Certno = res.Output.Baseinfo.Certno
+				PsnName = res.Output.Baseinfo.PsnName
+				Gend = res.Output.Baseinfo.Gend
+				Naty = res.Output.Baseinfo.Naty
+				Brdy = res.Output.Baseinfo.Brdy
+				Age = res.Output.Baseinfo.Age
+				Iinfos, _ := json.Marshal(res.Output.Iinfo)
+				Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+				infoStr = string(Iinfos)
+				idetinfoStr = string(Idetinfos)
+				if miConfig.Code == "H15049901371" {
+					infocode, _ = strconv.ParseInt(res10265.Infcode, 10, 64)
+				} else {
+					infocode = res.Infcode
+				}
+
+			}
+
 		} else {
 
 			var result string
@@ -7666,6 +7746,35 @@ func (c *HisApiController) GetRegisterInfo() {
 					return
 				}
 				infocode = resThree.Infcode
+			} else if miConfig.MdtrtareaAdmvs == "131023" {
+				psn_info, _ := service.GetPsnByPatientId(id)
+				result, requestLog := service.HeBeiyb2201A(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
+				saveLog(result, requestLog, "2201A", "挂号")
+				if miConfig.Code == "H15049901371" {
+
+					if err := json.Unmarshal([]byte(result), &resThree10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					resThree.ErrMsg = resThree10265.ErrMsg
+					resThree.Output = resThree10265.Output
+					resThree.InfRefmsgid = resThree10265.InfRefmsgid
+				} else {
+					if err := json.Unmarshal([]byte(result), &resThree); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+				}
+
+				if miConfig.Code == "H15049901371" {
+					infocode, _ = strconv.ParseInt(resThree10265.Infcode, 10, 64)
+				} else {
+					infocode = resThree.Infcode
+
+				}
+
 			} else {
 				psn_info, _ := service.GetPsnByPatientId(id)
 				result, requestLog := service.Gdyb2201A(PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_info.DoctorNumber, insuplc_admdvs_temp, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, doctor_info.UserName, record_time, psn_info.VerifyNumber)
@@ -8238,6 +8347,12 @@ func (c *HisApiController) GetUploadInfo() {
 							return
 						}
 					}
+					if miConfig.MdtrtareaAdmvs == "320921" {
+						data["doctor_id"] = "D320923012139"
+
+					} else {
+						data["doctor_id"] = "D371621008686"
+					}
 					bytesData, _ := json.Marshal(data)
 					var req *http.Request
 					if miConfig.MdtrtareaAdmvs == "320921" {
@@ -8281,7 +8396,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 				} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-					result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, sickConfig.CountryCode)
+					result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, doctor_info.DoctorNumber, his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, sickConfig.CountryCode, doctor_info.DoctorNumber)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(result), &dat); err == nil {
 						fmt.Println(dat)
@@ -8415,6 +8530,9 @@ func (c *HisApiController) GetUploadInfo() {
 							advice_id = 0
 							project_id = id
 						}
+						if item.MedChrgitmType == "9" {
+							item.MedChrgitmType = "09"
+						}
 
 						info := &models.HisOrderInfo{
 							OrderNumber:      order.Number,
@@ -10385,7 +10503,12 @@ func (c *HisApiController) GetPreUploadInfo() {
 						})
 						return
 					} else {
+						if miConfig.MdtrtareaAdmvs == "320921" {
+							data["doctor_id"] = "D320923012139"
 
+						} else {
+							data["doctor_id"] = "D371621008686"
+						}
 						bytesData, _ := json.Marshal(data)
 						var req *http.Request
 						if miConfig.MdtrtareaAdmvs == "320921" {
@@ -10433,7 +10556,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 			} else if miConfig.MdtrtareaAdmvs == "350500" {
 
-				result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, sickConfig.CountryCode)
+				result, request_log, _ := service.FJyb2204(his.PsnNo, his.Number, prescriptions, chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(patientPrescription.Departments, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), his.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, strconv.FormatInt(his.BalanceAccountsType, 10), roles.UserName, miConfig.Url, miConfig.Code, miConfig.AppSecret, miConfig.SignKey, miConfig.EncKey, sickConfig.CountryCode, doctor_info.DoctorNumber)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result), &dat); err == nil {
 					fmt.Println(dat)

controllers/zh/zh_his_api_controller.go

@@ -1518,10 +1518,15 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 
 				}
 			} else if med_type == 11 {
-				struct2401.MedType = "11"
+				struct2401.MedType = "21"
 			}
 		} else {
-			struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
+			if med_type == 11 {
+				struct2401.MedType = "21"
+			} else {
+				struct2401.MedType = strconv.FormatInt(int64(med_type), 10)
+
+			}
 		}
 		struct2401.IptNo = ipt_otp_no
 		struct2401.AtddrNo = doctorInfo.DoctorNumber

main.go

@@ -1,19 +1,14 @@
 package main
 
 import (
-	//"github.com/qiniu/api.v7/auth/qbox"
-	//"github.com/qiniu/api.v7/storage"
-
 	_ "gdyb/routers"
 	"gdyb/service"
 
+	"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"
-
-	"github.com/astaxie/beego"
 	//"strconv"
 	//"time"
 )
@@ -30,7 +25,7 @@ func init() {
 
 }
 func main() {
-	service.BeginAutoCreateWeekSchedulesJob()
+	service.AutoCreateStock()
 	beego.Run()
 }
 

models/drug.go

@@ -63,12 +63,12 @@ type BaseDrugLib struct {
 	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"`
 
-	MinNumber int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	Dose      string  `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit  string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	DrugDay   string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
-	MinPrice  float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	IsUser    int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	MinNumber int64 `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	//Dose      string  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDay  string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MinPrice float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsUser   int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 }

models/drug_stock.go

@@ -65,7 +65,7 @@ type DrugWarehouseOut struct {
 	Type                    int64         `gorm:"column:type" json:"type" form:"type"`
 	IsSys                   int64         `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	Manufacturers           *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers                 *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	Dealers                 *Dealers      `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (DrugWarehouseOut) TableName() string {
@@ -117,7 +117,7 @@ type DrugSalesReturn struct {
 	Dealer        int64         `gorm:"column:dealer" json:"dealer" form:"dealer"`
 	Type          int64         `gorm:"column:type" json:"type" form:"type"`
 	Manufacturers *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers       *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	Dealers       *Dealers      `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (DrugSalesReturn) TableName() string {
@@ -165,7 +165,7 @@ type DrugCancelStock struct {
 	Manufacturer  int64         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Type          int64         `gorm:"column:type" json:"type" form:"type"`
 	Manufacturers *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers       *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	Dealers       *Dealers      `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (DrugCancelStock) TableName() string {

models/good_models.go

@@ -72,6 +72,7 @@ type GoodInfo struct {
 	GoodsType          GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
 	IsUser             int64     `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	PackingUnit        string    `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	Number             string    `gorm:"column:number" json:"number" form:"number"`
 }
 
 func (GoodInfo) TableName() string {

models/his_models.go

@@ -1646,8 +1646,8 @@ type UploadInfo struct {
 	Diag     []*Diag
 	Fasong   string `json:"fasong"`
 	PresInfo []*PresInfo
-	Vaa01    int `json:"vaa01"`
-	Vaa07    int `json:"vaa07"`
+	Vaa01    int64 `json:"vaa01"`
+	Vaa07    int64 `json:"vaa07"`
 }
 
 type Diag struct {
@@ -1679,7 +1679,7 @@ type Item struct {
 	Vaf14  string `json:"vaf14"`
 	Vaf15  string `json:"vaf15"`
 	Vaf17  string `json:"vaf17"`
-	Vaf18  int    `json:"vaf18"`
+	Vaf18  string `json:"vaf18"`
 	Vaf19  string `json:"vaf19"`
 	Vaf20  string `json:"vaf20"`
 	Vaf21  string `json:"vaf21"`

models/new_stock_models.go

@@ -14,7 +14,7 @@ type NewWarehousing struct {
 	Dealer            int64        `gorm:"column:dealer" json:"dealer"`
 	Manufacturer      int64        `gorm:"column:manufacturer" json:"manufacturer"`
 	Manufacturers     Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers           Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers           Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	Type              int64        `gorm:"column:type" json:"type"`
 	SupplyWarehouseId int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	StorehouseId      int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
@@ -59,7 +59,7 @@ type NewWarehousingInfo struct {
 	SecondWarehouseInfoId int64        `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	GoodInfo              GoodInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" json:"infos"`
 	Manufacturers         Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers               Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers               Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 }
 
 func (NewWarehousingInfo) TableName() string {
@@ -81,7 +81,7 @@ type NewWarehouseOut struct {
 	Dealer                  int64        `gorm:"column:dealer" json:"dealer"`
 	Manufacturer            int64        `gorm:"column:manufacturer" json:"manufacturer"`
 	Manufacturers           Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers                 Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers                 Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	Type                    int64        `gorm:"column:type" json:"type"`
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
 	SupplyCancelOutId       int64        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
@@ -139,7 +139,7 @@ type NewWarehouseOutInfo struct {
 	VmStockFlow             VmStockFlow     `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId" json:"stock_flow"`
 	OverCount               int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	Manufacturers           Manufacturer    `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers                 Dealer          `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers                 Dealers         `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 }
 
 func (NewWarehouseOutInfo) TableName() string {
@@ -196,7 +196,7 @@ type NewCancelStockInfo struct {
 	IsCheck         int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	GoodInfo        GoodInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" json:"info"`
 	Manufacturers   Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers         Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers         Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 }
 
 func (NewCancelStockInfo) TableName() string {
@@ -247,7 +247,7 @@ type NewDrugWarehouseInfo struct {
 	RetailTotalPrice float64      `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	BaseDrugLib      BaseDrugLib  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	Manufacturers    Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers          Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers          Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 
 	BatchNumber               string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	MaxUnit                   string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
@@ -283,7 +283,7 @@ type NewDrugWarehouseOut struct {
 	Type                    int64         `gorm:"column:type" json:"type" form:"type"`
 	IsSys                   int64         `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	Manufacturers           *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers                 *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	Dealers                 *Dealers      `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (NewDrugWarehouseOut) TableName() string {
@@ -291,33 +291,35 @@ func (NewDrugWarehouseOut) TableName() string {
 }
 
 type NewDrugWarehouseOutInfo struct {
-	ID                      int64        `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64        `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64        `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64        `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64        `gorm:"column:count" json:"count" form:"count"`
-	Price                   float64      `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64      `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64        `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64        `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64        `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64        `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64        `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64        `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string       `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64        `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string       `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64        `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64        `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64        `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	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"`
-	BaseDrugLib             BaseDrugLib  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
-	Manufacturers           Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers                 Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
-	BatchNumber             string       `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	ID                      int64                `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64                `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64                `gorm:"column:count" json:"count" form:"count"`
+	Price                   float64              `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64              `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64                `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64                `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string               `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64                `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64                `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64                `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	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"`
+	BaseDrugLib             BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+	Manufacturers           Manufacturer         `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
+	Dealers                 Dealers              `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	BatchNumber             string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	WarehouseInfoId         int64                `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	NewDrugWarehouseInfo    NewDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId" json:"in_info"`
 }
 
 func (NewDrugWarehouseOutInfo) TableName() string {
@@ -339,7 +341,7 @@ type NewDrugCancelStock struct {
 	Manufacturer  int64         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Type          int64         `gorm:"column:type" json:"type" form:"type"`
 	Manufacturers *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers       *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	Dealers       *Dealers      `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (NewDrugCancelStock) TableName() string {
@@ -368,7 +370,7 @@ type NewDrugCancelStockInfo struct {
 	Number           string       `gorm:"column:number" json:"number" form:"number"`
 	BaseDrugLib      BaseDrugLib  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	Manufacturers    Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers          Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers          Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	BatchNumber      string       `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 }
 

models/stock_models.go

@@ -24,7 +24,7 @@ func (Manufacturer) TableName() string {
 	return "xt_manufacturer"
 }
 
-type Dealer struct {
+type Dealers struct {
 	ID             int64  `gorm:"column:id" json:"id"`
 	DealerName     string `gorm:"column:dealer_name" json:"dealer_name"`
 	Contact        string `gorm:"column:contact" json:"contact"`
@@ -44,7 +44,7 @@ type Dealer struct {
 	WuBi           string `gorm:"column:wubi" json:"wubi"`
 }
 
-func (Dealer) TableName() string {
+func (Dealers) TableName() string {
 	return "xt_dealer"
 }
 
@@ -62,7 +62,7 @@ type Warehousing struct {
 	Dealer            int64        `gorm:"column:dealer" json:"dealer"`
 	Manufacturer      int64        `gorm:"column:manufacturer" json:"manufacturer"`
 	Manufacturers     Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers           Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers           Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	Type              int64        `gorm:"column:type" json:"type"`
 	SupplyWarehouseId int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	StorehouseId      int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
@@ -211,7 +211,7 @@ type WarehouseOut struct {
 	Dealer                  int64        `gorm:"column:dealer" json:"dealer"`
 	Manufacturer            int64        `gorm:"column:manufacturer" json:"manufacturer"`
 	Manufacturers           Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers                 Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Dealers                 Dealers      `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	Type                    int64        `gorm:"column:type" json:"type"`
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
 	SupplyCancelOutId       int64        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
@@ -399,7 +399,7 @@ type WarehousingGoodInfo struct {
 	Status            int64        `gorm:"column:status" json:"status"`
 	GoodsType         GoodsType    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
 	Manufacturers     Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers           Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	Dealers           Dealers      `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	BuyPrice          float64      `gorm:"column:buy_price" json:"buy_price"`
 	Total             float64      `gorm:"column:total" json:"total" form:"total"`
 	RegisterNumber    string       `gorm:"column:register_number" json:"register_number" form:"register_number"`

service/auto_create_week_schedules_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"gdyb/models"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
@@ -68,13 +69,17 @@ func AutoCreateStock() {
 	var NewDrugWarehouseOut []*models.NewDrugWarehouseOutInfo
 	var NewDrugCancelStock []*models.NewDrugCancelStockInfo
 
-	readDb.Model(&models.NewWarehousingInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehousing)
-	readDb.Model(&models.NewWarehouseOutInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehouseOut)
-	readDb.Model(&models.NewCancelStockInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewCancelStock)
+	//readDb.Model(&models.NewWarehousingInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).First(&NewWarehousing)
+	//readDb.Model(&models.NewWarehouseOutInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehouseOut)
+	//readDb.Model(&models.NewCancelStockInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewCancelStock)
 
-	readDb.Model(&models.NewDrugWarehouseInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
-	readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
-	readDb.Model(&models.NewDrugCancelStockInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
+	//readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 4778", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
+	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 360136", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
+	//readDb.Model(&models.NewDrugCancelStockInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1 AND id >= 4778", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
+
+	//readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 5720", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouse)
+	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 366003", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
+	//readDb.Model(&models.NewDrugCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 ", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
 
 	for _, item := range NewWarehousing {
 		res := Post3503ForGoodInfo(org_id, item)
@@ -149,7 +154,7 @@ func AutoCreateStock() {
 
 //采购
 func Post3503ForGoodInfo(org_id int64, infos *models.NewWarehousingInfo) ResultSix {
-
+	fmt.Println(&infos)
 	var res ResultSix
 	miConfig, _ := FindMedicalInsuranceInfo(org_id)
 	data := make(map[string]interface{})
@@ -157,32 +162,48 @@ func Post3503ForGoodInfo(org_id int64, infos *models.NewWarehousingInfo) ResultS
 	var struct3503 models.Struct3503
 	struct3503.MedListCodg = infos.GoodInfo.MedicalInsuranceNumber
 	struct3503.FixmedinsHilistId = miConfig.Code
+	struct3503.FixmedinsCode = miConfig.Code
 	struct3503.FixmedinsHilistName = miConfig.OrgName
 	struct3503.FixmedinsBchno = infos.Number
-	struct3503.SplerName = infos.Dealers.DealerName
+	var d models.Dealers
+	readDb.Model(&models.Dealers{}).Where("id = ?", infos.Dealer).First(&d)
+	if d.ID == 0 {
+		struct3503.SplerName = infos.Manufacturers.ManufacturerName
+	} else {
+		struct3503.SplerName = d.DealerName
+	}
 	struct3503.ManuLotnum = infos.Number
 	struct3503.ProdentpName = infos.Manufacturers.ManufacturerName
-	struct3503.Aprvno = infos.LicenseNumber
-	struct3503.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
-	struct3503.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
+	struct3503.Aprvno = infos.GoodInfo.Number
+	struct3503.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02")
+	struct3503.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02")
 	struct3503.PurcRetnCnt = strconv.FormatInt(infos.TotalCount, 10)
 	struct3503.RxFlag = "0"
-	struct3503.PurcRetnStoinTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
-	struct3503.PurcRetnOpterName = "仓管员"
+	struct3503.PurcRetnStoinTime = time.Unix(infos.Ctime, 0).Format("2006-01-02")
+	if org_id == 10217 {
+		struct3503.PurcRetnOpterName = "施实芹"
+	} else {
+		struct3503.PurcRetnOpterName = ""
+	}
 	struct3503.OrgName = miConfig.OrgName
 	struct3503.AccessKey = miConfig.AccessKey
 	struct3503.RequestUrl = miConfig.Url
 	struct3503.SecretKey = miConfig.SecretKey
+	struct3503.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3503.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 	struct3503.Memo = ""
 	struct3503s = append(struct3503s, struct3503)
-	data["struct_3501s"] = struct3503s
+	data["struct_3503s"] = struct3503s[0]
+
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
+	fmt.Println(string(bytesData))
 	var req *http.Request
 
 	if miConfig.MdtrtareaAdmvs == "320921" {
 		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3503", bytes.NewReader(bytesData))
 	} else {
+		fmt.Println("111111")
 		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3503", bytes.NewReader(bytesData))
 	}
 
@@ -223,29 +244,37 @@ func Post3503ForDrug(org_id int64, infos *models.NewDrugWarehouseInfo) ResultSix
 	var res ResultSix
 	miConfig, _ := FindMedicalInsuranceInfo(org_id)
 	data := make(map[string]interface{})
-	var struct3501s []models.Struct3503
-	var struct3501 models.Struct3503
-	struct3501.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
-	struct3501.FixmedinsHilistId = miConfig.Code
-	struct3501.FixmedinsHilistName = miConfig.OrgName
-	struct3501.FixmedinsBchno = infos.BatchNumber
-	struct3501.SplerName = infos.Dealers.DealerName
-	struct3501.ManuLotnum = infos.BatchNumber
-	struct3501.ProdentpName = infos.Manufacturers.ManufacturerName
-	struct3501.Aprvno = infos.BaseDrugLib.Number
-	struct3501.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
-	struct3501.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
-	struct3501.PurcRetnCnt = strconv.FormatInt(infos.WarehousingCount, 10)
-	struct3501.RxFlag = "0"
-	struct3501.PurcRetnStoinTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
-	struct3501.PurcRetnOpterName = "仓管员"
-	struct3501.OrgName = miConfig.OrgName
-	struct3501.AccessKey = miConfig.AccessKey
-	struct3501.RequestUrl = miConfig.Url
-	struct3501.SecretKey = miConfig.SecretKey
-	struct3501.Memo = ""
-	struct3501s = append(struct3501s, struct3501)
-	data["struct_3501s"] = struct3501s
+	var struct3503s []models.Struct3503
+	var struct3503 models.Struct3503
+	struct3503.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
+	struct3503.FixmedinsHilistId = miConfig.Code
+	struct3503.FixmedinsHilistName = miConfig.OrgName
+	struct3503.FixmedinsBchno = infos.BatchNumber
+	var d models.Dealers
+	readDb.Model(&models.Dealers{}).Where("id = ?", infos.Dealer).First(&d)
+	struct3503.SplerName = d.DealerName
+	struct3503.ManuLotnum = infos.BatchNumber
+	struct3503.ProdentpName = infos.Manufacturers.ManufacturerName
+	struct3503.Aprvno = infos.BaseDrugLib.Number
+	struct3503.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
+	struct3503.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
+	struct3503.PurcRetnCnt = strconv.FormatInt(infos.WarehousingCount, 10)
+	struct3503.RxFlag = "0"
+	struct3503.PurcRetnStoinTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
+	if org_id == 10217 {
+		struct3503.PurcRetnOpterName = "施实芹"
+	} else {
+		struct3503.PurcRetnOpterName = "顾林玲"
+	}
+	struct3503.OrgName = miConfig.OrgName
+	struct3503.AccessKey = miConfig.AccessKey
+	struct3503.RequestUrl = miConfig.Url
+	struct3503.SecretKey = miConfig.SecretKey
+	struct3503.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3503.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3503.Memo = ""
+	struct3503s = append(struct3503s, struct3503)
+	data["struct_3503s"] = struct3503s[0]
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
@@ -384,46 +413,57 @@ func Post3505ForDrug(org_id int64, infos *models.NewDrugWarehouseOutInfo) Result
 
 	miConfig, _ := FindMedicalInsuranceInfo(org_id)
 	data := make(map[string]interface{})
-	var struct3501s []models.Struct3505
-	var struct3501 models.Struct3505
-
-	struct3501.OrgName = miConfig.OrgName
-	struct3501.AccessKey = miConfig.AccessKey
-	struct3501.RequestUrl = miConfig.Url
-	struct3501.SecretKey = miConfig.SecretKey
-
-	struct3501.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
-	struct3501.FixmedinsHilistId = miConfig.Code
-	struct3501.FixmedinsHilistName = miConfig.OrgName
-	struct3501.FixmedinsBchno = infos.BatchNumber
+	var struct3505s []models.Struct3505
+	var struct3505 models.Struct3505
+	struct3505.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
+	struct3505.FixmedinsHilistId = miConfig.Code
+	struct3505.FixmedinsHilistName = miConfig.OrgName
+	struct3505.FixmedinsBchno = infos.NewDrugWarehouseInfo.BatchNumber
+	struct3505.FixmedinsCode = miConfig.Code
+
+	struct3505.OrgName = miConfig.OrgName
+	struct3505.AccessKey = miConfig.AccessKey
+	struct3505.RequestUrl = miConfig.Url
+	struct3505.SecretKey = miConfig.SecretKey
+	struct3505.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3505.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+
+	struct3505.FixmedinsBchno = infos.NewDrugWarehouseInfo.BatchNumber
 	if org_id == 10188 {
-		struct3501.PrscDrName = "王曙光"
-		struct3501.PharName = "王曙光"
-		struct3501.PharPracCertNo = ""
+		struct3505.PrscDrName = "王曙光"
+		struct3505.PharName = "顾林玲"
+		struct3505.PharPracCertNo = "K0404020449"
 
 	} else if org_id == 10217 {
-		struct3501.PrscDrName = "王云刚"
-		struct3501.PharName = "王云刚"
-		struct3501.PharPracCertNo = ""
+		struct3505.PrscDrName = "王云刚"
+		struct3505.PharName = "施实芹"
+		struct3505.PharPracCertNo = "1532050832051512010002"
 	}
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	chrgBchno := rand.Intn(100000) + 10000
 	ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
-	struct3501.MdtrtSn = ipt_otp_no
-	struct3501.ManuLotnum = infos.BatchNumber
-	struct3501.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
-	struct3501.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
-	struct3501.RxFlag = "0"
-	struct3501.TrdnFlag = "1"
-	struct3501.RtalDocno = strconv.FormatInt(int64(infos.ID), 10)
-	struct3501.SelRetnCnt = strconv.FormatInt(int64(infos.Count), 10)
-	struct3501.SelRetnTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
-	struct3501.SelRetnOpterName = "仓管员"
+	struct3505.MdtrtSn = ipt_otp_no
+	struct3505.ManuLotnum = infos.NewDrugWarehouseInfo.BatchNumber
+	struct3505.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
+	//struct3505.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
+	struct3505.RxFlag = "0"
+	struct3505.TrdnFlag = "1"
+	struct3505.RtalDocno = strconv.FormatInt(int64(infos.ID), 10)
+	struct3505.SelRetnCnt = strconv.FormatInt(int64(infos.Count), 10)
+	struct3505.SelRetnTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
 
-	struct3501s = append(struct3501s, struct3501)
-	data["struct_3501s"] = struct3501s
+	if org_id == 10188 {
+		struct3505.SelRetnOpterName = "孙欣欣"
+
+	} else if org_id == 10217 {
+		struct3505.SelRetnOpterName = "晁海燕"
+
+	}
+
+	struct3505s = append(struct3505s, struct3505)
+	data["struct_3505s"] = struct3505s[0]
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
@@ -473,37 +513,44 @@ func Post3506ForGoodInfo(org_id int64, infos *models.NewCancelStockInfo) ResultS
 	var res ResultSix
 	miConfig, _ := FindMedicalInsuranceInfo(org_id)
 	data := make(map[string]interface{})
-	var struct3501s []models.Struct3506
-	var struct3501 models.Struct3506
-
-	struct3501.OrgName = miConfig.OrgName
-	struct3501.AccessKey = miConfig.AccessKey
-	struct3501.RequestUrl = miConfig.Url
-	struct3501.SecretKey = miConfig.SecretKey
-	struct3501.MedListCodg = infos.GoodInfo.MedicalInsuranceNumber
-	struct3501.FixmedinsHilistId = miConfig.Code
-	struct3501.FixmedinsHilistName = miConfig.OrgName
-	struct3501.FixmedinsBchno = infos.Number
-	struct3501.ManuLotnum = infos.Number
-	struct3501.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
+	var struct3506s []models.Struct3506
+	var struct3506 models.Struct3506
+
+	struct3506.OrgName = miConfig.OrgName
+	struct3506.AccessKey = miConfig.AccessKey
+	struct3506.RequestUrl = miConfig.Url
+	struct3506.SecretKey = miConfig.SecretKey
+	struct3506.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3506.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3506.MedListCodg = infos.GoodInfo.MedicalInsuranceNumber
+	struct3506.FixmedinsHilistId = miConfig.Code
+	struct3506.FixmedinsHilistName = miConfig.OrgName
+	struct3506.FixmedinsBchno = infos.Number
+	struct3506.ManuLotnum = infos.Number
+	struct3506.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
 	//struct3501.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
-	struct3501.RxFlag = "0"
-	struct3501.TrdnFlag = "1"
-	struct3501.SelRetnCnt = strconv.FormatInt(int64(infos.Count), 10)
-	struct3501.SelRetnTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
-	struct3501.SelRetnOpterName = "仓管员"
-	struct3501.Memo = ""
+	struct3506.RxFlag = "0"
+	struct3506.TrdnFlag = "1"
+	struct3506.SelRetnCnt = strconv.FormatInt(int64(infos.Count), 10)
+	struct3506.SelRetnTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
+	//struct3506.SelRetnOpterName = "仓管员"
+	if org_id == 10188 {
+		struct3506.SelRetnOpterName = "孙欣欣"
+	} else if org_id == 10217 {
+		struct3506.SelRetnOpterName = "晁海燕"
+	}
+	struct3506.Memo = ""
 
-	struct3501s = append(struct3501s, struct3501)
-	data["struct_3501s"] = struct3501s
+	struct3506s = append(struct3506s, struct3506)
+	data["struct_3506s"] = struct3506s
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
 
 	if miConfig.MdtrtareaAdmvs == "320921" {
-		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3506", bytes.NewReader(bytesData))
 	} else {
-		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3506", bytes.NewReader(bytesData))
 	}
 
 	resp, _ := client.Do(req)
@@ -541,37 +588,46 @@ func Post3506ForGoodInfo(org_id int64, infos *models.NewCancelStockInfo) ResultS
 }
 func Post3506ForDrug(org_id int64, infos *models.NewDrugCancelStockInfo) ResultSix {
 	var res ResultSix
-
 	miConfig, _ := FindMedicalInsuranceInfo(org_id)
 	data := make(map[string]interface{})
-	var struct3501s []models.Struct3506
-	var struct3501 models.Struct3506
-	struct3501.OrgName = miConfig.OrgName
-	struct3501.AccessKey = miConfig.AccessKey
-	struct3501.RequestUrl = miConfig.Url
-	struct3501.SecretKey = miConfig.SecretKey
-	struct3501.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
-	struct3501.FixmedinsHilistId = miConfig.Code
-	struct3501.FixmedinsHilistName = miConfig.OrgName
-	struct3501.FixmedinsBchno = infos.BatchNumber
-	struct3501.ManuLotnum = infos.BatchNumber
-	struct3501.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
-	struct3501.RxFlag = "0"
-	struct3501.TrdnFlag = "1"
-	struct3501.SelRetnCnt = strconv.FormatInt(int64(infos.Count), 10)
-	struct3501.SelRetnTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
-	struct3501.SelRetnOpterName = "仓管员"
-	struct3501.Memo = ""
-	struct3501s = append(struct3501s, struct3501)
-	data["struct_3501s"] = struct3501s
+	var struct3506s []models.Struct3506
+	var struct3506 models.Struct3506
+	struct3506.FixmedinsCode = miConfig.Code
+	struct3506.OrgName = miConfig.OrgName
+	struct3506.AccessKey = miConfig.AccessKey
+	struct3506.RequestUrl = miConfig.Url
+	struct3506.SecretKey = miConfig.SecretKey
+	struct3506.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3506.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3506.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
+	struct3506.FixmedinsHilistId = miConfig.Code
+	struct3506.FixmedinsHilistName = miConfig.OrgName
+	struct3506.FixmedinsBchno = infos.BatchNumber
+	struct3506.ManuLotnum = infos.BatchNumber
+	struct3506.ManuDate = time.Unix(infos.ProductDate, 0).Format("2006-01-02 15:04:05")
+	//struct3501.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
+	struct3506.RxFlag = "0"
+	struct3506.TrdnFlag = "1"
+	struct3506.SelRetnCnt = strconv.FormatInt(int64(infos.Count), 10)
+	struct3506.SelRetnTime = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
+	//struct3506.SelRetnOpterName = "仓管员"
+	if org_id == 10188 {
+		struct3506.SelRetnOpterName = "孙欣欣"
+	} else if org_id == 10217 {
+		struct3506.SelRetnOpterName = "晁海燕"
+	}
+	struct3506.Memo = ""
+
+	struct3506s = append(struct3506s, struct3506)
+	data["struct_3506s"] = struct3506s[0]
 	client := &http.Client{}
 	bytesData, _ := json.Marshal(data)
 	var req *http.Request
 
 	if miConfig.MdtrtareaAdmvs == "320921" {
-		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3506", bytes.NewReader(bytesData))
 	} else {
-		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3506", bytes.NewReader(bytesData))
 	}
 
 	resp, _ := client.Do(req)

service/coordinate_service.go

@@ -121,7 +121,7 @@ func UploadPrescriptionForCoordinate(info models.UploadInfo) (string, string) {
 	for _, item := range info.PresInfo {
 		inputDataPresInfo := make(map[string]interface{})
 		inputDataPresInfo["cbm06"] = item.Cbm06
-		inputDataPresInfo["cbm07"] = item.Cbm06
+		inputDataPresInfo["cbm07"] = item.Cbm07
 		inputDataPresInfo["cbmid"] = item.Cbmid
 		presDetails := make([]map[string]interface{}, 0)
 
@@ -291,7 +291,7 @@ func UploadPrescriptionForCoordinateHospital(info models.UploadInfo) (string, st
 	}
 	reader := bytes.NewReader(bytesData)
 	var url string
-	gdyb_url := "http://218.104.146.179:9091/esb/listener/saveOrdInfoIp"
+	gdyb_url := "http://218.104.146.179:90911/esb/listener/saveOrdInfoIp"
 	url = gdyb_url
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
@@ -326,6 +326,100 @@ func UpDatePrescriptionNumberForCoordinate(user_org_id int64, ids []int64, numbe
 	return
 }
 
+func GetDrugInfo(bbx01 string) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["bbx01"] = bbx01 // 就诊凭证编号
+	inputData["name"] = ""     // 就诊凭证编号
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/getGrug"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("GET", 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("code", "Xmrjyy")
+
+	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(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+
+func GetGoodInfo(bbx01 string) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["bbx01"] = bbx01 // 就诊凭证编号
+	inputData["name"] = ""     // 就诊凭证编号
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/getMaterial"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("GET", 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("code", "Xmrjyy")
+
+	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(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+
 func FindPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date 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 patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).First(&info).Error
 	return
@@ -375,3 +469,8 @@ func GetExecutionFrequencyByName(name string, org_id int64) (ef models.Execution
 	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("(org_id = ? OR org_id = 0) AND name = ?", org_id, name).First(&ef).Error
 	return
 }
+
+func GetWayInfoByName(name string, org_id int64) (ef models.HisProject, err error) {
+	err = readDb.Model(&models.HisProject{}).Where("user_org_id = ? AND project_name = ? AND status= 1 AND cost_classify = 100", org_id, name).First(&ef).Error
+	return
+}

service/fj_service.go

@@ -308,7 +308,7 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 }
 
 //  门诊费用明细信息上传
-func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string, dise_code string) (string, string, string) {
+func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string, dise_code string, doctor_number string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -429,7 +429,7 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["medc_way_dscr"] = ""                          // 用药途径描述
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
-		feedetailInfo["bilg_dr_codg"] = doctor_id                    // 开单医生编码
+		feedetailInfo["bilg_dr_codg"] = doctor_number                // 开单医生编码
 		feedetailInfo["bilg_dr_name"] = doctor                       // 开单医师姓名
 		feedetailInfo["acord_dept_codg"] = ""                        // 受单科室编码
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称

service/gdyb_service.go

@@ -101,25 +101,29 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	if certificates == "3" {
 		inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 		inputData["certno"] = certNo        // 证件号码
-		inputData["psn_cert_type"] = "99"   // 人员证件类型
+		inputData["psn_cert_type"] = "06"   // 人员证件类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
 	} else {
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
 			inputData["psn_cert_type"] = ""     // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
 			inputData["psn_cert_type"] = ""     // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
 		}
 	}
 
-	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-	inputData["begntime"] = ""          // 开始时间
-	inputData["psn_name"] = psn_name    // 人员姓名
+	inputData["begntime"] = "" // 开始时间
+	inputData["psn_name"] = "" // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -3270,6 +3274,11 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 
 // 生成签名
 func setSignature(timestamp int64, nonce string, secret_key string) string {
+	fmt.Println(timestamp)
+	fmt.Println(nonce)
+	fmt.Println(secret_key)
+	fmt.Println(strconv.FormatInt(timestamp, 10))
+
 	str := strconv.FormatInt(timestamp, 10) + secret_key + nonce + strconv.FormatInt(timestamp, 10)
 	hash := sha256.New()
 	//输入数据
@@ -3282,16 +3291,34 @@ func setSignature(timestamp int64, nonce string, secret_key string) string {
 	return hashCode
 }
 
+const charset = "abcdefghijklmnopqrstuvwxyz" +
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+
+var seededRand *rand.Rand = rand.New(
+	rand.NewSource(time.Now().UnixNano()))
+
 // 生成随机字符串
 func GetRandomString(l int) string {
-	str := "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	bytes := []byte(str)
-	result := []byte{}
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	for i := 0; i < l; i++ {
-		result = append(result, bytes[r.Intn(len(bytes))])
-	}
-	return string(result)
+
+	//str := "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	//bytes := []byte(str)
+	//result := []byte{}
+	//r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	//for i := 0; i < l; i++ {
+	//	result = append(result, bytes[r.Intn(len(bytes))])
+	//}
+	return String(32)
+}
+func StringWithCharset(length int, charset string) string {
+	b := make([]byte, length)
+	for i := range b {
+		b[i] = charset[seededRand.Intn(len(charset))]
+	}
+	return string(b)
+}
+
+func String(length int) string {
+	return StringWithCharset(length, charset)
 }
 
 // 生成基础报文
@@ -3323,7 +3350,7 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage["dev_no"] = ""                                                                 // 设备编号
 	inputMessage["dev_safe_info"] = ""                                                          // 设备安全信息
 	inputMessage["cainfo"] = ""                                                                 // 数字签名信息
-	inputMessage["signtype"] = "SM3"                                                            // 签名类型
+	inputMessage["signtype"] = "MOCK"                                                           // 签名类型
 	inputMessage["infver"] = "V1.0"                                                             // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
 	inputMessage["opter"] = doctor                                                              // 经办人
@@ -3692,9 +3719,10 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	inputMessage["infno"] = "1101" // 交易编码
 
 	if certificates == 3 {
-		inputData["mdtrt_cert_type"] = "99" // 就诊凭证类型
-		inputData["certno"] = certNo        // 证件号码
-		inputData["psn_cert_type"] = "99"   // 人员证件类型
+		inputData["mdtrt_cert_type"] = "99"     // 就诊凭证类型
+		inputData["certno"] = "01836483"        // 证件号码
+		inputData["psn_cert_type"] = "01"       // 人员证件类型
+		inputData["mdtrt_cert_no"] = "01836483" // 就诊凭证编号
 
 	} else {
 		if certificates == 1 {
@@ -3703,11 +3731,15 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 				inputData["card_sn"] = ""           // 卡识别码
 				inputData["certno"] = certNo        // 证件号码
 				inputData["psn_cert_type"] = "01"   // 人员证件类型
+				inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
 			} else {
 				inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 				inputData["card_sn"] = ""           // 卡识别码
 				inputData["certno"] = certNo        // 证件号码
 				inputData["psn_cert_type"] = "01"   // 人员证件类型
+				inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
 			}
 
 		} else if certificates == 6 {
@@ -3715,13 +3747,14 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
 			inputData["psn_cert_type"] = "17"   // 人员证件类型
+			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+
 		}
 
 	}
 
-	inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
-	inputData["begntime"] = ""          // 开始时间
-	inputData["psn_name"] = ""          // 人员姓名
+	inputData["begntime"] = "" // 开始时间
+	inputData["psn_name"] = "" // 人员姓名
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 
@@ -4428,7 +4461,7 @@ func Gdyb9001(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
-	signature := setSignature(timestamp, nonce, secret_key)
+	signature := setSignature(timestamp, nonce, "d6Ad0P1B3z6Dsdst0gYAFPlz8YlIvFDx")
 	//生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})

service/his_service.go

@@ -1422,7 +1422,7 @@ func GetPsnByPatientIdTwo(patient_id int64, record_date int64) (psn models.HisPs
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-08-01 00:00:00' AND setl_time <= '2022-09-30 23:59:59'", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ?  AND status = 1  AND  order_status = 2 AND setl_id <> ''  AND med_type = '14' AND setl_time >= '2022-09-01 00:00:00'", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }
 func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError, err error) {

service/hn_service.go

@@ -399,11 +399,11 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 	timestamp2 := time.Now().Unix()
 
-	//tempTime := time.Unix(timestamp2, 0)
-	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	tempTime := time.Unix(timestamp2, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	var customs []*Custom
 	for _, item := range hisPrescription {
-		tm := time.Unix(item.PreTime, 0)
+		//tm := time.Unix(item.PreTime, 0)
 
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
@@ -421,7 +421,7 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						DoctorName:              new_doctor_name,
 						ProvinceDrugMedListCodg: "",
 						ProvinceGoodMedListCodg: "",
-						FeeOcurTime:             tm.Format("2006-01-02 15:04:05"),
+						FeeOcurTime:             timeFormatOne,
 					}
 
 					if subItem.BaseDrugLib.DrugClassify == "2" {
@@ -451,7 +451,7 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							HospApprFlag:            -1,
 							ProvinceDrugMedListCodg: "",
 							ProvinceGoodMedListCodg: "",
-							FeeOcurTime:             tm.Format("2006-01-02 15:04:05"),
+							FeeOcurTime:             timeFormatOne,
 						}
 						customs = append(customs, cus)
 					}
@@ -471,7 +471,7 @@ func Hnyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 							DoctorName:              new_doctor_name,
 							ProvinceDrugMedListCodg: "",
 							ProvinceGoodMedListCodg: subItem.GoodInfo.ProvincesCode,
-							FeeOcurTime:             tm.Format("2006-01-02 15:04:05"),
+							FeeOcurTime:             timeFormatOne,
 						}
 						customs = append(customs, cus)
 					}

service/jsyb_service.go

@@ -612,12 +612,13 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["medc_way_dscr"] = ""                          // 用药途径描述
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
-		feedetailInfo["bilg_dr_codg"] = item.DoctorNumber            // 开单医生编码
-		feedetailInfo["bilg_dr_name"] = item.DoctorName              // 开单医师姓名
-		feedetailInfo["acord_dept_codg"] = ""                        // 受单科室编码
-		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
-		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
-		feedetailInfo["orders_dr_name"] = ""                         // 受单医生姓名
+
+		feedetailInfo["bilg_dr_codg"] = "D371621008686"   // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = "王云刚"             // 开单医师姓名
+		feedetailInfo["acord_dept_codg"] = ""             // 受单科室编码
+		feedetailInfo["acord_dept_name"] = ""             // 受单科室名称
+		feedetailInfo["orders_dr_code"] = "D371621008686" // 受单医生编码
+		feedetailInfo["orders_dr_name"] = "王云刚"           // 受单医生姓名
 		if balance_accounts_type == "8" {
 			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
 		} else {
@@ -1029,8 +1030,8 @@ func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 		inputMessage["opter"] = "晁海燕"      // 经办人
 		inputMessage["opter_name"] = "晁海燕" // 经办人姓名
 	} else {
-		inputMessage["opter"] = doctor      // 经办人
-		inputMessage["opter_name"] = doctor // 经办人姓名
+		inputMessage["opter"] = "孙欣欣"      // 经办人
+		inputMessage["opter_name"] = "孙欣欣" // 经办人姓名
 	}
 	inputMessage["inf_time"] = timeFormatOne        // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code // 定点医药机构编号
@@ -1772,37 +1773,38 @@ func Jsyb3502(struct3502 models.Struct3502) (string, string) {
 func Jsyb3503(struct3503 models.Struct3503) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3503.OrgName, struct3503.Opter, struct3503.FixmedinsCode, struct3503.InsuplcAdmdvs, struct3503.MdtrtareaAdmvs, struct3503.Cainfo)
+	fmt.Println(struct3503)
+	inputMessage := SetJSInputMessage(timestamp, struct3503.OrgName, struct3503.Opter, struct3503.FixmedinsHilistId, struct3503.InsuplcAdmdvs, struct3503.MdtrtareaAdmvs, struct3503.Cainfo)
+
 	input := make(map[string]interface{})
-	inputData := make(map[string]interface{})
+
 	inputMessage["infno"] = "3503"
-	inputData["med_list_codg"] = struct3503.MedListCodg
-	inputData["fixmedins_hilist_id"] = struct3503.FixmedinsCode
-	inputData["fixmedins_hilist_name"] = struct3503.OrgName
-
-	inputData["dynt_no"] = ""
-	inputData["fixmedins_bchno"] = struct3503.FixmedinsBchno // 人员编号 （来自1101接口返回）
-
-	inputData["spler_name"] = struct3503.SplerName       // 人员编号 （来自1101接口返回）
-	inputData["spler_pmtno"] = ""                        // 人员编号 （来自1101接口返回）
-	inputData["manu_lotnum"] = struct3503.ManuLotnum     // 人员编号 （来自1101接口返回）
-	inputData["prodentp_name"] = struct3503.ProdentpName // 人员编号 （来自1101接口返回）
-	inputData["aprvno"] = struct3503.Aprvno              // 人员编号 （来自1101接口返回）
-	inputData["manu_date"] = struct3503.ManuDate         // 人员编号 （来自1101接口返回）
-	inputData["expy_end"] = struct3503.ExpyEnd           // 人员编号 （来自1101接口返回）
-
-	inputData["finl_trns_pric"] = struct3503.FinlTrnsPric // 人员编号 （来自1101接口返回）
-	inputData["purc_retn_cnt"] = struct3503.PurcRetnCnt   // 人员编号 （来自1101接口返回）
-	inputData["purc_invo_codg"] = struct3503.PurcInvoCodg // 人员编号 （来自1101接口返回）
-	inputData["purc_invo_no"] = struct3503.PurcInvoNo     // 人员编号 （来自1101接口返回）
-
-	inputData["rx_flag"] = struct3503.RxFlag // 人员编号 （来自1101接口返回）
-
-	inputData["purc_retn_stoin_time"] = struct3503.PurcRetnStoinTime // 人员编号 （来自1101接口返回）
-	inputData["purc_retn_opter_name"] = struct3503.PurcRetnOpterName // 人员编号 （来自1101接口返回）
-	inputData["prod_geay_flag"] = ""                                 // 人员编号 （来自1101接口返回）
-	inputData["memo"] = ""                                           // 人员编号 （来自1101接口返回）
-	input["purcinfo"] = inputData
+
+	item := struct3503
+	feedetailInfo := make(map[string]interface{})
+	feedetailInfo["med_list_codg"] = item.MedListCodg
+	feedetailInfo["fixmedins_hilist_id"] = item.FixmedinsHilistId
+	feedetailInfo["fixmedins_hilist_name"] = item.FixmedinsHilistName
+	feedetailInfo["dynt_no"] = ""
+	feedetailInfo["fixmedins_bchno"] = item.FixmedinsBchno         // 人员编号 （来自1101接口返回）
+	feedetailInfo["spler_name"] = item.SplerName                   // 人员编号 （来自1101接口返回）
+	feedetailInfo["spler_pmtno"] = ""                              // 人员编号 （来自1101接口返回）
+	feedetailInfo["manu_lotnum"] = item.ManuLotnum                 // 人员编号 （来自1101接口返回）
+	feedetailInfo["prodentp_name"] = item.ProdentpName             // 人员编号 （来自1101接口返回）
+	feedetailInfo["aprvno"] = item.Aprvno                          // 人员编号 （来自1101接口返回）
+	feedetailInfo["manu_date"] = item.ManuDate                     // 人员编号 （来自1101接口返回）
+	feedetailInfo["expy_end"] = item.ExpyEnd                       // 人员编号 （来自1101接口返回）
+	feedetailInfo["finl_trns_pric"] = item.FinlTrnsPric            // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_retn_cnt"] = item.PurcRetnCnt              // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_invo_codg"] = item.PurcInvoCodg            // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_invo_no"] = item.PurcInvoNo                // 人员编号 （来自1101接口返回）
+	feedetailInfo["rx_flag"] = item.RxFlag                         // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_retn_stoin_time"] = item.PurcRetnStoinTime // 人员编号 （来自1101接口返回）
+	feedetailInfo["purc_retn_opter_name"] = item.PurcRetnOpterName // 人员编号 （来自1101接口返回）
+	feedetailInfo["prod_geay_flag"] = ""                           // 人员编号 （来自1101接口返回）
+	feedetailInfo["memo"] = ""                                     // 人员编号 （来自1101接口返回）
+
+	input["purcinfo"] = feedetailInfo
 	inputMessage["input"] = input //交易输入
 
 	bytesData, err := json.Marshal(inputMessage)
@@ -1856,14 +1858,14 @@ 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.FixmedinsCode, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3505"                              // 交易编码
-	inputData["med_list_codg"] = struct3505.MedListCodg         // 定点医药机构目录编号
-	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsCode // 定点医药机构目录编号
-	inputData["fixmedins_hilist_name"] = struct3505.OrgName     // 定点医药机构目录名称
-	inputData["fixmedins_bchno"] = struct3505.FixmedinsCode     // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3505"                                  // 交易编码
+	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3505.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
 
 	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
 	inputData["prsc_dr_certno"] = struct3505.PrscDrCertno      // 人员编号 （来自1101接口返回）