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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9504
+org_id = 10265
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -54,13 +54,13 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 #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://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
+#gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
-#gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
-#gdyb_paasid = "sg03_prd"
+gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid="zh_prd_yjyy"
-gdyb_paasid = "sz_prd_yjyy"
+#gdyb_paasid = "sz_prd_yjyy"
 #gdyb_paasid = "zq_prd_yjyy"
 
 

controllers/zh/zh_his_api_controller.go

@@ -672,9 +672,14 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 
 	//InsuplcAdmdvs = res2.Output.
 
+	if social_type != 0 {
+
+	} else {
+
+	}
+
 	Iinfos, _ := json.Marshal(res2.Output.Iinfo)
 	infoStr := string(Iinfos)
-	fmt.Println(infoStr)
 
 	var rf []*ResultFive
 	json.Unmarshal([]byte(infoStr), &rf)
@@ -770,7 +775,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 		timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 		var struct2401 service.Struct2401
 		struct2401.PsnNo = res2.Output.Baseinfo.PsnNo
-		struct2401.Insutype = strconv.FormatInt(int64(social_type), 10)
+		struct2401.Insutype = insutype
 		struct2401.MdtrtCertType = "02"
 		struct2401.MdtrtCertNo = res2.Output.Baseinfo.Certno
 		if miConfig.Code == "H15049901371" {

service/his_service.go

@@ -502,17 +502,13 @@ func CreateOrderInfo(order *models.HisOrderInfo) (err error) {
 	err = writeDb.Create(&order).Error
 	return
 }
-
 func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
 	return
-
 }
-
 func FindHisPatientPrescriptionInfo(org_id int64, his_patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ?", org_id, record_date, his_patient_id).First(&info).Error
 	return
-
 }
 
 func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
@@ -523,7 +519,6 @@ func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date
 func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	err = writeDb.Save(&info).Error
 	return
-
 }
 
 func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int64, end_time int64, doctor_id int64, keywords string) (order []*models.HisOrder, err error, total int64) {
@@ -572,47 +567,43 @@ func UpDatePrescriptionOrderStatus(user_org_id int64, ids []int64) (err error) {
 
 func UpDatePrescriptionInfoNumber(user_org_id int64, id int64, number string, record_time int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND record_date = ?", user_org_id, id, record_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 2, "mtime": time.Now().Unix()}).Error
-
 	return
 }
 
 func UpDateHisPrescriptionInfoNumber(user_org_id int64, his_patient_id int64, number string, record_time int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND his_patient_id = ? AND record_date = ?", user_org_id, his_patient_id, record_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 2, "mtime": time.Now().Unix()}).Error
-
 	return
 }
 
 type HisOrder struct {
-	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate    int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                int64   `gorm:"column:status" json:"status" form:"status"`
-	Number                string  `gorm:"column:number" json:"number" form:"number"`
-	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	MedfeeSumamt          float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	OrderStatus           float64 `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	PayWay                int64   `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
-	PayPrice              float64 `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
-	PayCardNo             string  `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
-	DiscountPrice         float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
-	PreferentialPrice     float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
-	RealityPrice          float64 `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
-	FoundPrice            float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
-	MedicalInsurancePrice float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
-	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
-	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                int64   `gorm:"column:modify" json:"modify" form:"modify"`
-	IsPre                 int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
-
-	SzChargeInfo            string `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
-	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
-	SzMedicineInsuranceInfo string `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
-
-	MzNumber      string `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
-	OrgSetlNumber string `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId            int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate      int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedfeeSumamt            float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	OrderStatus             float64 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PayWay                  int64   `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice                float64 `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo               string  `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice           float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice       float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice            float64 `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice              float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice   float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice            float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                  int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	IsPre                   int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	SzChargeInfo            string  `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo           string  `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo string  `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	MzNumber                string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber           string  `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`