777

controllers/sg/his_api_controller.go

@@ -24,6 +24,7 @@ import (
 	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 
+	"github.com/go-ole/go-ole/oleutil"
 	"io"
 	"io/ioutil"
 	//"math"
@@ -38,8 +39,6 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-	"github.com/go-ole/go-ole"
-	"github.com/go-ole/go-ole/oleutil"
 )
 
 type HisApiController struct {
@@ -200,8 +199,12 @@ func (c *HisApiController) FJ3501AND3502() {
 	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	//库盘
+	var errs []string
 	for _, drug := range drugs {
 		if drug.IsPc == 0 && drug.IsBg == 0 {
+			var res2 ResultSix
+			var res3 ResultSix
+
 			number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3501"
 			var struct3501 models.Struct3501
 			struct3501.OrgName = miConfig.OrgName
@@ -230,51 +233,89 @@ func (c *HisApiController) FJ3501AND3502() {
 			memo["pric"] = drug.Price
 			bytesData, _ := json.Marshal(memo)
 			struct3501.Memo = string(bytesData)
-			result1, result2, result3 := service.FJyb3501(struct3501)
+			result1, result2, _ := service.FJyb3501(struct3501)
 			saveLog(result1, result2, "3501", "3501")
 			//saveLog(result, requestLog, "2201", "挂号")
 
-			fmt.Println(result1)
-			fmt.Println(result2)
-			fmt.Println(result3)
-
-			var struct3502 models.Struct3502
-			struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
-			struct3502.FixmedinsHilistId = miConfig.Code
-			struct3502.FixmedinsHilistName = miConfig.OrgName
-			struct3502.FixmedinsCode = miConfig.Code
-			struct3502.RxFlag = "0"
-			struct3502.InvChgTime = time.Now().Format("2006-01-02")
-			struct3502.OrgName = miConfig.OrgName
-			struct3501.Opter = roles.UserName
-			struct3502.AccessKey = miConfig.AccessKey
-			struct3502.RequestUrl = miConfig.Url
-			struct3502.SecretKey = miConfig.SecretKey
-			struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-			struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-
-			struct3502.Url = miConfig.Url
-			struct3502.AppId = miConfig.Cainfo
-			struct3502.AppSecret = miConfig.AppSecret
-			struct3502.Enckey = miConfig.EncKey
-			struct3502.SignKey = miConfig.SignKey
-			struct3502.SecretKey = miConfig.SecretKey
-
-			struct3502.Memo = ""
-			struct3502.InvChgType = "108"
-			struct3502.FixmedinsBchno = number
-			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
-			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
-			result11, result22, result33 := service.FJyb3502(struct3502)
-			fmt.Println(result11)
-			fmt.Println(result22)
-			fmt.Println(result33)
-			saveLog(result11, result22, "3502", "3502")
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result1)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
+			if res2.Infcode != -1 {
+				drug.IsPc = 1
+				drug.Bchno = number
+				drug.PcDate = time.Now().Format("2006-01-02")
+				err := service.SaveW(drug)
+				if err == nil {
+					var struct3502 models.Struct3502
+					struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+					struct3502.FixmedinsHilistId = miConfig.Code
+					struct3502.FixmedinsHilistName = miConfig.OrgName
+					struct3502.FixmedinsCode = miConfig.Code
+					struct3502.RxFlag = "0"
+					struct3502.InvChgTime = time.Now().Format("2006-01-02")
+					struct3502.OrgName = miConfig.OrgName
+					struct3501.Opter = roles.UserName
+					struct3502.AccessKey = miConfig.AccessKey
+					struct3502.RequestUrl = miConfig.Url
+					struct3502.SecretKey = miConfig.SecretKey
+					struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+					struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+					struct3502.Url = miConfig.Url
+					struct3502.AppId = miConfig.Cainfo
+					struct3502.AppSecret = miConfig.AppSecret
+					struct3502.Enckey = miConfig.EncKey
+					struct3502.SignKey = miConfig.SignKey
+					struct3502.SecretKey = miConfig.SecretKey
+					struct3502.Memo = ""
+					struct3502.InvChgType = "108"
+					struct3502.FixmedinsBchno = drug.Bchno
+					struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
+					struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
+					result11, result22, _ := service.FJyb3502(struct3502)
+					saveLog(result11, result22, "3502", "3502")
+
+					var respJSON3 map[string]interface{}
+					if err := json.Unmarshal([]byte(string(result11)), &respJSON3); err != nil {
+						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					userJSONBytes3, _ := json.Marshal(respJSON3)
+					if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					if res3.Infcode == -1 {
+						errs = append(errs, "变更"+drug.BaseDrugLib.DrugName+",出错:"+res3.ErrMsg)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"failed_code": -10,
+							"msg":         res3.ErrMsg,
+						})
+					} else {
+						drug.IsBg = 1
+						service.SaveW(drug)
+					}
+				}
+			} else {
+				errs = append(errs, "盘存"+drug.BaseDrugLib.DrugName+",出错:"+res2.ErrMsg)
+			}
 
 		}
 		//变更
 		if drug.IsPc == 1 && drug.IsBg == 0 {
+			var res3 ResultSix
+
 			var struct3502 models.Struct3502
 			struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
 			struct3502.FixmedinsHilistId = miConfig.Code
@@ -301,13 +342,41 @@ func (c *HisApiController) FJ3501AND3502() {
 			struct3502.FixmedinsBchno = drug.Bchno
 			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
 			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
-			result1, result2, result3 := service.FJyb3502(struct3502)
+			result1, result2, _ := service.FJyb3502(struct3502)
 			saveLog(result1, result2, "3502", "3502")
-			fmt.Println(result1)
-			fmt.Println(result2)
-			fmt.Println(result3)
+			var respJSON3 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result1)), &respJSON3); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes3, _ := json.Marshal(respJSON3)
+			if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res3.Infcode == -1 {
+				errs = append(errs, "变更"+drug.BaseDrugLib.DrugName+",出错:"+res3.ErrMsg)
+			} else {
+				drug.IsBg = 1
+				//drug.Bchno = number
+				//drug.PcDate = time.Now().Format("2006-01-02")
+				service.SaveW(drug)
+			}
 		}
 	}
+
+	if len(errs) == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "盘存变更成功",
+		})
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         errs,
+		})
+	}
 }
 func (c *HisApiController) DeletePCandBG() {
 	ids := c.GetString("ids")
@@ -317,10 +386,14 @@ func (c *HisApiController) DeletePCandBG() {
 
 	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	var err []string
 	for _, item := range drugs {
 		if item.IsPc == 1 && item.IsBg == 1 {
+			var res FJ3507Result
+			var res2 FJ3507Result
+
 			var struct3507 models.Struct3507
-			struct3507.FixmedinsBchno = ""
+			struct3507.FixmedinsBchno = item.Bchno
 			struct3507.InvDataType = "1"
 			struct3507.Opter = roles.UserName
 			struct3507.OrgName = miConfig.OrgName
@@ -329,55 +402,134 @@ func (c *HisApiController) DeletePCandBG() {
 			struct3507.SecretKey = miConfig.SecretKey
 			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-
 			struct3507.Url = miConfig.Url
 			struct3507.AppId = miConfig.Cainfo
 			struct3507.AppSecret = miConfig.AppSecret
 			struct3507.Enckey = miConfig.EncKey
 			struct3507.SignKey = miConfig.SignKey
 			struct3507.SecretKey = miConfig.SecretKey
-			service.FJyb3507(struct3507)
+			result, result1, _ := service.FJyb3507(struct3507)
+			saveLog(result, result1, "3507", "3507")
 
-			var struct3507_2 models.Struct3507
-			struct3507_2.OrgName = miConfig.OrgName
-			struct3507_2.AccessKey = miConfig.AccessKey
-			struct3507_2.RequestUrl = miConfig.Url
-			struct3507_2.SecretKey = miConfig.SecretKey
-			struct3507_2.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-			struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			var respJSON2 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes2, _ := json.Marshal(respJSON2)
+			if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-			struct3507_2.Url = miConfig.Url
-			struct3507_2.AppId = miConfig.Cainfo
-			struct3507_2.AppSecret = miConfig.AppSecret
-			struct3507_2.Enckey = miConfig.EncKey
-			struct3507_2.SignKey = miConfig.SignKey
-			struct3507_2.SecretKey = miConfig.SecretKey
+			if res.Infcode != -1 {
+				item.IsPc = 0
+				err2 := service.SaveW(item)
+				if err2 == nil {
+					var struct3507_2 models.Struct3507
+					struct3507_2.OrgName = miConfig.OrgName
+					struct3507_2.AccessKey = miConfig.AccessKey
+					struct3507_2.RequestUrl = miConfig.Url
+					struct3507_2.Opter = roles.UserName
+					struct3507_2.SecretKey = miConfig.SecretKey
+					struct3507_2.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+					struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+					struct3507_2.Url = miConfig.Url
+					struct3507_2.AppId = miConfig.Cainfo
+					struct3507_2.AppSecret = miConfig.AppSecret
+					struct3507_2.Enckey = miConfig.EncKey
+					struct3507_2.SignKey = miConfig.SignKey
+					struct3507_2.SecretKey = miConfig.SecretKey
+					struct3507_2.FixmedinsBchno = item.Bchno
+					struct3507_2.InvDataType = "2"
+					result11, result22, _ := service.FJyb3507(struct3507_2)
+					saveLog(result11, result22, "3507", "3507")
+
+					var respJSON3 map[string]interface{}
+					if err := json.Unmarshal([]byte(string(result11)), &respJSON3); err != nil {
+						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					userJSONBytes3, _ := json.Marshal(respJSON3)
+					if err := json.Unmarshal(userJSONBytes3, &res2); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					if res2.Infcode != -1 {
+						item.IsBg = 0
+						item.Bchno = ""
+						item.PcDate = ""
+						service.SaveW(item)
+					} else {
+						err = append(err, "删除"+item.BaseDrugLib.DrugName+"变更失败,失败原因："+res.ErrMsg)
+					}
+				}
+			} else {
+				err = append(err, "删除"+item.BaseDrugLib.DrugName+"盘存失败,失败原因："+res.ErrMsg)
+			}
 
-			struct3507_2.FixmedinsBchno = ""
-			struct3507_2.InvDataType = "2"
-			service.FJyb3507(struct3507_2)
 		}
 		if item.IsPc == 1 && item.IsBg == 0 {
+
+			var res FJ3507Result
 			var struct3507 models.Struct3507
+			struct3507.FixmedinsBchno = item.Bchno
+			struct3507.InvDataType = "2"
+			struct3507.Opter = roles.UserName
 			struct3507.OrgName = miConfig.OrgName
 			struct3507.AccessKey = miConfig.AccessKey
 			struct3507.RequestUrl = miConfig.Url
 			struct3507.SecretKey = miConfig.SecretKey
 			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-
 			struct3507.Url = miConfig.Url
 			struct3507.AppId = miConfig.Cainfo
 			struct3507.AppSecret = miConfig.AppSecret
 			struct3507.Enckey = miConfig.EncKey
 			struct3507.SignKey = miConfig.SignKey
 			struct3507.SecretKey = miConfig.SecretKey
-			struct3507.FixmedinsBchno = ""
-			struct3507.InvDataType = "1"
-			service.FJyb3507(struct3507)
+			result, result1, _ := service.FJyb3507(struct3507)
+			saveLog(result, result1, "3507", "3507")
+
+			var respJSON3 map[string]interface{}
+			if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			userJSONBytes3, _ := json.Marshal(respJSON3)
+			if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode != -1 {
+				item.IsBg = 0
+				item.Bchno = ""
+				item.PcDate = ""
+				service.SaveW(item)
+			} else {
+				err = append(err, "删除"+item.BaseDrugLib.DrugName+"变更失败,失败原因："+res.ErrMsg)
+			}
 		}
 
 	}
+	if len(err) == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除盘存变更成功",
+		})
+
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         err,
+		})
+
+	}
 
 }
 
@@ -7606,7 +7758,6 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 	//psn_record, _ := service.GetP(id)
 	psn_info, _ := service.GetPsnByPatientId(patient_id)
 
-
 	//psn_record, _ := service.GetPsnNCDSRecordById(id)
 	//
 	//if psn_record.ID == 0 {
@@ -7845,7 +7996,7 @@ func (c *HisApiController) GetPsnNcdsInfo() {
 			return
 		}
 
-	}  else if miConfig.MdtrtareaAdmvs == "420902" {
+	} else if miConfig.MdtrtareaAdmvs == "420902" {
 		p, _ := service.GetHisPatientById(patient_id)
 
 		api := miConfig.Url + "/hbyb/5301?psn_no=" + p.PsnNo +
@@ -8531,10 +8682,6 @@ func (c *HisApiController) ReadCard() {
 					infoStr := string(Iinfos)
 					idetinfoStr := string(Idetinfos)
 
-
-
-
-
 					var rf []*ResultFive
 					json.Unmarshal([]byte(infoStr), &rf)
 
@@ -8583,29 +8730,22 @@ func (c *HisApiController) ReadCard() {
 						}
 					}
 
-
-
-
-
-
 					psn := &models.HisPsn{
 						PsnNo: res.Output.Baseinfo.PsnNo,
 
-						PatientId: patient.ID,
-						Certno:    res.Output.Baseinfo.Certno,
-						Gend:        res.Output.Baseinfo.Gend,
-						Naty:        res.Output.Baseinfo.Naty,
-						PsnCertType: res.Output.Baseinfo.PsnCertType,
-						PsnName:     res.Output.Baseinfo.PsnName,
-						Idetinfo:    idetinfoStr,
-						Insuinfo:    infoStr,
-						UserOrgId:   c.GetAdminUserInfo().CurrentOrgId,
+						PatientId:     patient.ID,
+						Certno:        res.Output.Baseinfo.Certno,
+						Gend:          res.Output.Baseinfo.Gend,
+						Naty:          res.Output.Baseinfo.Naty,
+						PsnCertType:   res.Output.Baseinfo.PsnCertType,
+						PsnName:       res.Output.Baseinfo.PsnName,
+						Idetinfo:      idetinfoStr,
+						Insuinfo:      infoStr,
+						UserOrgId:     c.GetAdminUserInfo().CurrentOrgId,
 						InsuplcAdmdvs: insuplc_admdvs,
-
 					}
 					service.CreateHisPsn(psn)
 
-
 					for _, item := range rf {
 						if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
 							insutypes = append(insutypes, item)
@@ -10351,13 +10491,13 @@ func (c *HisApiController) ReadCard() {
 						PatientId: patient.ID,
 						Certno:    res.Output.Baseinfo.Certno,
 
-						Gend:        res.Output.Baseinfo.Gend,
-						Naty:        res.Output.Baseinfo.Naty,
-						PsnCertType: res.Output.Baseinfo.PsnCertType,
-						PsnName:     res.Output.Baseinfo.PsnName,
-						Idetinfo:    idetinfoStr,
-						Insuinfo:    infoStr,
-						UserOrgId:   c.GetAdminUserInfo().CurrentOrgId,
+						Gend:          res.Output.Baseinfo.Gend,
+						Naty:          res.Output.Baseinfo.Naty,
+						PsnCertType:   res.Output.Baseinfo.PsnCertType,
+						PsnName:       res.Output.Baseinfo.PsnName,
+						Idetinfo:      idetinfoStr,
+						Insuinfo:      infoStr,
+						UserOrgId:     c.GetAdminUserInfo().CurrentOrgId,
 						InsuplcAdmdvs: insuplc_admdvs,
 					}
 					service.CreateHisPsn(psn)
@@ -11913,16 +12053,16 @@ func (c *HisApiController) ReadCard() {
 						}
 					}
 					psn := &models.HisPsn{
-						PsnNo: res.Output.Baseinfo.PsnNo,
-						PatientId: patient.ID,
-						Certno:    res.Output.Baseinfo.Certno,
-						Gend:        res.Output.Baseinfo.Gend,
-						Naty:        res.Output.Baseinfo.Naty,
-						PsnCertType: res.Output.Baseinfo.PsnCertType,
-						PsnName:     res.Output.Baseinfo.PsnName,
-						Idetinfo:    idetinfoStr,
-						Insuinfo:    infoStr,
-						UserOrgId:   c.GetAdminUserInfo().CurrentOrgId,
+						PsnNo:         res.Output.Baseinfo.PsnNo,
+						PatientId:     patient.ID,
+						Certno:        res.Output.Baseinfo.Certno,
+						Gend:          res.Output.Baseinfo.Gend,
+						Naty:          res.Output.Baseinfo.Naty,
+						PsnCertType:   res.Output.Baseinfo.PsnCertType,
+						PsnName:       res.Output.Baseinfo.PsnName,
+						Idetinfo:      idetinfoStr,
+						Insuinfo:      infoStr,
+						UserOrgId:     c.GetAdminUserInfo().CurrentOrgId,
 						InsuplcAdmdvs: insuplc_admdvs,
 					}
 					service.CreateHisPsn(psn)
@@ -17085,6 +17225,22 @@ type ResultSix struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+
+type FJ3507Result struct {
+	Cainfo      interface{} `json:"cainfo"`
+	ErrMsg      string      `json:"err_msg"`
+	InfRefmsgid string      `json:"inf_refmsgid"`
+	Infcode     int64       `json:"infcode"`
+	Output      struct {
+		retRslt string `json:"retRslt"`
+		msgRslt string `json:"msgRslt"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnMsg     interface{} `json:"warn_msg"`
+}
+
 type Result2406 struct {
 	Cainfo      interface{} `json:"cainfo"`
 	ErrMsg      string      `json:"err_msg"`
@@ -19358,7 +19514,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 				infocode = resThree.Infcode
 
-			}  else if miConfig.MdtrtareaAdmvs == "420902" {
+			} else if miConfig.MdtrtareaAdmvs == "420902" {
 				hb_doctor_info, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, patientPrescription.DoctorId)
 				//if strings.Contains(insuplc_admdvs_temp, "4202") {
 				//	insuplc_admdvs_temp =
@@ -19375,10 +19531,9 @@ func (c *HisApiController) GetRegisterInfo() {
 				utils.ErrorLog("解析失败：%v", hb_doctor_info.DoctorNumber)
 				utils.ErrorLog("解析失败：%v", PsnNo)
 
-				utils.ErrorLog("解析失败：%v", department.Number )
-				utils.ErrorLog("解析失败：%v", department.Name )
-				utils.ErrorLog("解析失败：%v",  roles.UserName)
-
+				utils.ErrorLog("解析失败：%v", department.Number)
+				utils.ErrorLog("解析失败：%v", department.Name)
+				utils.ErrorLog("解析失败：%v", roles.UserName)
 
 				api := miConfig.Url + "hbyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + hb_doctor_info.UserName + "&fixmedins_code=" + miConfig.Code +
@@ -20445,7 +20600,7 @@ func (c *HisApiController) GetUploadInfo() {
 				return
 			}
 
-		}else if miConfig.MdtrtareaAdmvs == "421182" {
+		} else if miConfig.MdtrtareaAdmvs == "421182" {
 
 			data := make(map[string]interface{})
 			client := &http.Client{}
@@ -20944,7 +21099,7 @@ func (c *HisApiController) GetUploadInfo() {
 						return
 					}
 
-				}  else if miConfig.MdtrtareaAdmvs == "420902" {
+				} else if miConfig.MdtrtareaAdmvs == "420902" {
 
 					bytesData, _ := json.Marshal(data)
 					req, _ := http.NewRequest("POST", miConfig.Url+"hbyb/2204", bytes.NewReader(bytesData))
@@ -20973,7 +21128,7 @@ func (c *HisApiController) GetUploadInfo() {
 						return
 					}
 
-				}else if miConfig.MdtrtareaAdmvs == "421182" {
+				} else if miConfig.MdtrtareaAdmvs == "421182" {
 
 					bytesData, _ := json.Marshal(data)
 					req, _ := http.NewRequest("POST", miConfig.Url+"hbyb/2204", bytes.NewReader(bytesData))
@@ -21585,7 +21740,7 @@ func (c *HisApiController) GetUploadInfo() {
 								reg_type = 110104
 							}
 
-							api := miConfig.Url+ "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
+							api := miConfig.Url + "hbyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 								his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 								"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
 								"&insuplc_admdvs=" + his.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
@@ -21640,7 +21795,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 							}
 
-						}  else if miConfig.MdtrtareaAdmvs == "421182" {
+						} else if miConfig.MdtrtareaAdmvs == "421182" {
 							if reg_type == 11 && his.Insutype == "390" {
 								reg_type = 110104
 							}
@@ -22605,7 +22760,7 @@ func (c *HisApiController) GetUploadInfo() {
 					return
 				}
 
-			}else if miConfig.MdtrtareaAdmvs == "420902" {
+			} else if miConfig.MdtrtareaAdmvs == "420902" {
 				if reg_type == 11 && his.Insutype == "390" {
 					reg_type = 110104
 				}
@@ -24378,7 +24533,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					return
 				}
 
-			}else if miConfig.MdtrtareaAdmvs == "420902" {
+			} else if miConfig.MdtrtareaAdmvs == "420902" {
 				bytesData, _ := json.Marshal(data)
 				req, _ := http.NewRequest("POST", miConfig.Url+"hbyb/2204", bytes.NewReader(bytesData))
 				resp, _ := client.Do(req)
@@ -24406,7 +24561,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					return
 				}
 
-			}  else if miConfig.MdtrtareaAdmvs == "421182" {
+			} else if miConfig.MdtrtareaAdmvs == "421182" {
 				bytesData, _ := json.Marshal(data)
 				req, _ := http.NewRequest("POST", miConfig.Url+"hbyb/2204", bytes.NewReader(bytesData))
 				resp, _ := client.Do(req)
@@ -26299,7 +26454,7 @@ func (c *HisApiController) Refund() {
 				return
 			}
 
-		}  else if miConfig.MdtrtareaAdmvs == "421182" {
+		} else if miConfig.MdtrtareaAdmvs == "421182" {
 			api3 := miConfig.Url + "hbyb/2208?psn_no=" + order.PsnNo +
 				"&mdtrt_id=" + order.MdtrtId + "&setl_id=" + order.SetlId + "&doctor=" + roles.UserName + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
 				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
@@ -28409,7 +28564,7 @@ func (c *HisApiController) GetCheckAccount() {
 				AcctPay:          acct_pay,
 				FixmedinsSetlCnt: fixmedins_setl_cnt,
 			}
-			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams, fmt.Sprintf("%.4f", medfee_sumamt), fmt.Sprintf("%.4f", fund_pay_sumamt),fmt.Sprintf("%.4f", acct_pay))
+			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams, fmt.Sprintf("%.4f", medfee_sumamt), fmt.Sprintf("%.4f", fund_pay_sumamt), fmt.Sprintf("%.4f", acct_pay))
 			fmt.Println(requestLog)
 			fmt.Println(result)
 			fmt.Println(err_msg)
@@ -28495,7 +28650,7 @@ func (c *HisApiController) GetCheckAccount() {
 				AcctPay:          acct_pay,
 				FixmedinsSetlCnt: fixmedins_setl_cnt,
 			}
-			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams, fmt.Sprintf("%.4f", medfee_sumamt), fmt.Sprintf("%.4f", fund_pay_sumamt),fmt.Sprintf("%.4f", acct_pay))
+			result, requestLog, err_msg := service.FJyb3201(baseParams, businessParams, fmt.Sprintf("%.4f", medfee_sumamt), fmt.Sprintf("%.4f", fund_pay_sumamt), fmt.Sprintf("%.4f", acct_pay))
 			fmt.Println(requestLog)
 			fmt.Println(result)
 			fmt.Println(err_msg)
@@ -29844,7 +29999,7 @@ func (c *HisApiController) GetSettleAccounts() {
 				return
 			}
 
-		}else if miConfig.MdtrtareaAdmvs == "421182" {
+		} else if miConfig.MdtrtareaAdmvs == "421182" {
 
 			api := miConfig.Url + "hbyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +

models/new_stock_models.go

@@ -261,11 +261,10 @@ type NewDrugWarehouseInfo struct {
 	SecondWarehouseInfoId     int64  `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	IsCheck                   int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 
-	IsPc int64 `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
-	IsBg int64 `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
-	Bchno string `gorm:"column:bchno" json:"bchno" form:"bchno"`
-
-
+	IsPc   int64  `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
+	IsBg   int64  `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
+	Bchno  string `gorm:"column:bchno" json:"bchno" form:"bchno"`
+	PcDate string `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
 }
 
 func (NewDrugWarehouseInfo) TableName() string {

service/fj_service.go

@@ -1006,7 +1006,7 @@ func FJyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 }
 
 // 医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
-func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams, med string, fund string,acct string) (string, string, string) {
+func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams, med string, fund string, acct string) (string, string, string) {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -1040,7 +1040,7 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = med                                  //医疗费总额
 	inputData["fund_pay_sumamt"] = fund                               //基金支付总额
-	inputData["acct_pay"] = acct                    //个人账户支付金额
+	inputData["acct_pay"] = acct                                      //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
 	inputData["refd_setl_flag"] = "0"                                 // 就诊 ID（来自2201接口返回）
 
@@ -3069,19 +3069,19 @@ func FJyb3502(struct3502 models.Struct3502) (string, string, string) {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
-	inputMessage["infno"] = "3502"                      // 交易编码
-	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
-	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
+	inputMessage["infno"] = "3502"                              // 交易编码
+	inputData["med_list_codg"] = struct3502.MedListCodg         // 定点医药机构目录编号
+	inputData["inv_chg_type"] = struct3502.InvChgType           // 定点医药机构目录编号
 	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
 	inputData["fixmedins_hilist_name"] = struct3502.OrgName     // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
 	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
 	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
 	inputData["rx_flag"] = struct3502.RxFlag                    //
-	inputData["inv_chg_time"] = struct3502.InvChgTime // 人员编号 （来自1101接口返回）
-	inputData["inv_chg_opter_name"] = ""              // 人员编号 （来自1101接口返回）
-	inputData["memo"] = struct3502.Memo               // 人员编号 （来自1101接口返回）
-	inputData["trdn_flag"] = ""                       // 人员编号 （来自1101接口返回）
+	inputData["inv_chg_time"] = struct3502.InvChgTime           // 人员编号 （来自1101接口返回）
+	inputData["inv_chg_opter_name"] = ""                        // 人员编号 （来自1101接口返回）
+	inputData["memo"] = struct3502.Memo                         // 人员编号 （来自1101接口返回）
+	inputData["trdn_flag"] = ""                                 // 人员编号 （来自1101接口返回）
 	druginputData["drug_trac_codg"] = "12345678912345678901"
 	inputData["drug_trac_info"] = druginputData
 	input["invinfo"] = inputData
@@ -3246,9 +3246,9 @@ func FJyb3507(struct3507 models.Struct3507) (string, string, string) {
 	inputMessage := SetFjInputMessage(nonce, timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Url, struct3507.AppId, struct3507.AppSecret, struct3507.SignKey, struct3507.Enckey)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "3507"                          // 交易编码
-	inputData["fixmedins_bchno"] = struct3507.FixmedinsCode // 人员编号 （来自1101接口返回）
-	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
+	inputMessage["infno"] = "3507"                           // 交易编码
+	inputData["fixmedins_bchno"] = struct3507.FixmedinsBchno // 人员编号 （来自1101接口返回）
+	inputData["inv_data_type"] = struct3507.InvDataType      // 人员编号 （来自1101接口返回）
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -3268,3 +3268,8 @@ func FJyb3507(struct3507 models.Struct3507) (string, string, string) {
 	return output, requestLog, err_msg
 
 }
+
+func SaveW(w *models.NewDrugWarehouseInfo) (err error) {
+	err = writeDb.Save(&w).Error
+	return
+}