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

controllers/sg/his_api_controller.go

@@ -718,6 +718,9 @@ func (c *HisApiController) GetSettleList() {
 	}
 	struct4101.SetlBegnDate = order.SetlTime
 	struct4101.SetlEndDate = order.SetlTime
+	time_arr := strings.Split(order.SetlTime, " ")
+	struct4101.AdmTime = time_arr[0]
+	struct4101.AdmEndTime = time_arr[0]
 
 	var rf []CustomFundPay
 	json.Unmarshal([]byte(order.SetlDetail), &rf)

controllers/zh/zh_his_api_controller.go

@@ -1612,7 +1612,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 							customs = append(customs, cus)
 						}
 					} else if subItem.Type == 3 {
-						if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 {
+						if len(subItem.GoodInfo.MedicalInsuranceNumber) > 0 && subItem.GoodInfo.IsUser != 1 {
 							cnt, _ := strconv.ParseFloat(subItem.Count, 64)
 
 							cus := &models.NewCustom{

models/good_models.go

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

models/his_models.go

@@ -1194,6 +1194,7 @@ type MyGoodInformation struct {
 	ProductionType              string `gorm:"column:production_type" json:"production_type" form:"production_type"`
 	SpecialMedical              string `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
 	IsMark                      int64  `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	IsUser                      int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (MyGoodInformation) TableName() string {

models/stock_models.go

@@ -257,6 +257,7 @@ type WarehousingGoodInfo struct {
 	Manufacturers     Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
 	Dealers           Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	BuyPrice          float64      `gorm:"column:buy_price" json:"buy_price"`
+	IsUser            int64        `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (WarehousingGoodInfo) TableName() string {

models/stock_query_models.go

@@ -7,6 +7,7 @@ type StockInfo struct {
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
 	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id"`
 	GoodUnit          int64  `gorm:"column:good_unit" json:"good_unit"`
+	IsUser            int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 
 	QueryWarehousingInfo  []QueryWarehousingInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehousing_info"`
 	QuerySalesReturnInfo  []QuerySalesReturnInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_sales_return_info"`

service/gdyb_service.go

@@ -2826,6 +2826,8 @@ type Struct4101 struct {
 	CustomStruct       []CustomStruct
 	OpspdiseinfoStruct []OpspdiseinfoStruct
 	IteminfoStruct     []IteminfoStruct
+	AdmTime            string
+	AdmEndTime         string
 }
 
 //
@@ -2889,10 +2891,10 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
 	inputData["adm_way"] = ""                                 // 入院途径  必填
 	inputData["trt_type"] = ""                                // 治疗类别  必填
-	inputData["adm_time"] = ""                                // 入院时间  必填
+	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
 	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
 	inputData["refldept_dept"] = ""                           // 转科科别  必填
-	inputData["dscg_time"] = ""                               // 出院时间  必填
+	inputData["dscg_time"] = struct4101.AdmEndTime            // 出院时间  必填
 	inputData["dscg_caty"] = struct4101.AdmCaty               // 出院科别  必填
 	inputData["act_ipt_days"] = ""                            // 实际住院天数  必填
 	inputData["otp_wm_dise"] = ""                             // 门（急） 诊西医诊断  必填