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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true
@@ -156,8 +156,8 @@ front_end_domain = "http://xt.test.sgjyun.com/#"
 
 org_id = 4
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
-#gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
+#gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/"
+gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 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://10.87.67.83:8080/mbs-hi-intf/web/api/webservices/hb/interface/"

controllers/sg/his_api_controller.go

@@ -11,7 +11,7 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
+	//"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"io"
 	"io/ioutil"
@@ -47,7 +47,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
 	//beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
 
-	beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
+	//beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
 
 	//beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
 
@@ -113,9 +113,9 @@ func (c *HisApiController) CheckCardPWD() {
 		})
 		return
 	} else {
-		if res.Output.Baseinfo.CheckStat == "0" {
+		if res.Output.Result.CheckStat == "0" {
 			var msg string
-			switch res.Output.Baseinfo.CardStat {
+			switch res.Output.Result.CardStat {
 			case "00":
 				msg = "未激活"
 				break
@@ -177,169 +177,169 @@ func (c *HisApiController) CheckCardPWD() {
 
 }
 
-func (c *HisApiController) ReadCard() {
-	id_card_type, _ := c.GetInt64("id_card_type")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	certificates, _ := c.GetInt64("certificates")
-
-	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
-	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	if initFlag == 0 {
-		c.TestGetBasBaseInit()
-	}
-	switch id_card_type {
-	case 1:
-		basStr := c.GetBasBaseInfo()
-		if len(basStr) == 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-			return
-		}
-		fmt.Println(basStr)
-		bas := strings.Split(basStr, "|")
-		basNumber := bas[2]
-		fmt.Println(basNumber)
-		card_sn := bas[3]
-		fmt.Println(card_sn)
-		result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
-		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 ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		if res.Infcode == 0 {
-			patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-			if err == gorm.ErrRecordNotFound {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-				return
-			} else if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"patient": patient,
-					"number":  basNumber,
-				})
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
-		break
-	case 2:
-		SFZStr := c.GetSFZBaseInfo()
-		id_card_str := strings.Split(SFZStr, "^")
-		id_card_number := id_card_str[0]
-		card_sn := ""
-		result := service.Gdyb1101B(id_card_number, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
-		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 ResultTwo
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-
-		if res.Infcode == 0 {
-			patient, err := service.GetPatientByNumber(id_card_number, c.GetAdminUserInfo().CurrentOrgId)
-			if err == gorm.ErrRecordNotFound {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-				return
-			} else if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-				return
-
-			} else {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"patient": patient,
-					"number":  id_card_number,
-				})
-			}
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
-		}
-
-		break
-	case 3:
-		break
-	}
-
-}
+//func (c *HisApiController) ReadCard() {
+//	id_card_type, _ := c.GetInt64("id_card_type")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	certificates, _ := c.GetInt64("certificates")
+//
+//	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+//	if initFlag == 0 {
+//		c.TestGetBasBaseInit()
+//	}
+//	switch id_card_type {
+//	case 1:
+//		basStr := c.GetBasBaseInfo()
+//		if len(basStr) == 0 {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+//			return
+//		}
+//		fmt.Println(basStr)
+//		bas := strings.Split(basStr, "|")
+//		basNumber := bas[2]
+//		fmt.Println(basNumber)
+//		card_sn := bas[3]
+//		fmt.Println(card_sn)
+//		result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
+//		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 ResultTwo
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//
+//		if res.Infcode == 0 {
+//			patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
+//			if err == gorm.ErrRecordNotFound {
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+//				return
+//			} else if err != nil {
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+//				return
+//
+//			} else {
+//				c.ServeSuccessJSON(map[string]interface{}{
+//					"patient": patient,
+//					"number":  basNumber,
+//				})
+//			}
+//		} else {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+//			return
+//		}
+//		break
+//	case 2:
+//		SFZStr := c.GetSFZBaseInfo()
+//		id_card_str := strings.Split(SFZStr, "^")
+//		id_card_number := id_card_str[0]
+//		card_sn := ""
+//		result := service.Gdyb1101B(id_card_number, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
+//		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 ResultTwo
+//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+//			utils.ErrorLog("解析失败：%v", err)
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//			return
+//		}
+//
+//		if res.Infcode == 0 {
+//			patient, err := service.GetPatientByNumber(id_card_number, c.GetAdminUserInfo().CurrentOrgId)
+//			if err == gorm.ErrRecordNotFound {
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+//				return
+//			} else if err != nil {
+//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+//				return
+//
+//			} else {
+//				c.ServeSuccessJSON(map[string]interface{}{
+//					"patient": patient,
+//					"number":  id_card_number,
+//				})
+//			}
+//		} else {
+//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+//			return
+//		}
+//
+//		break
+//	case 3:
+//		break
+//	}
+//
+//}
 
 var initFlag int64 = 0
 
-func (c *HisApiController) TestGetBasBaseInit() {
-	DllDef := syscall.MustLoadDLL("SSCard.dll")
-	Iinit := DllDef.MustFindProc("Init")
-	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
-	if ret != 0 {
-		fmt.Println("SSCard的报错原因:", err)
-		fmt.Println("SSCard的运算结果为:", ret)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-		return
-	}
-
-	result := int(ret)
-	fmt.Println("SSCard的运算结果为1:", result)
-	initFlag = 1
-	return
-}
-
-func (c *HisApiController) GetSFZBaseInfo() string {
-	DllDef := syscall.MustLoadDLL("SSCard.dll")
-	readCard := DllDef.MustFindProc("ReadSFZ")
-	if readCard == nil {
-		fmt.Println("readcard is nil")
-		readCard = DllDef.MustFindProc("ReadSFZ")
-	}
-
-	str := make([]byte, 256)
-	str1 := make([]byte, 256)
-	r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
-
-	fmt.Println(r)
-	return string(str)
-}
-
-func (c *HisApiController) GetBasBaseInfo() string {
-	DllDef := syscall.MustLoadDLL("SSCard.dll")
-	readCard := DllDef.MustFindProc("ReadCardBas")
-	if readCard == nil {
-		fmt.Println("readcard is nil")
-		readCard = DllDef.MustFindProc("ReadCardBas")
-	}
-
-	str := make([]byte, 1024)
-	str1 := make([]byte, 1024)
-	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
-
-	fmt.Println(string(str1))
-	fmt.Println(string(str))
+//func (c *HisApiController) TestGetBasBaseInit() {
+//	DllDef := syscall.MustLoadDLL("SSCard.dll")
+//	Iinit := DllDef.MustFindProc("Init")
+//	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
+//	if ret != 0 {
+//		fmt.Println("SSCard的报错原因:", err)
+//		fmt.Println("SSCard的运算结果为:", ret)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+//		return
+//	}
+//
+//	result := int(ret)
+//	fmt.Println("SSCard的运算结果为1:", result)
+//	initFlag = 1
+//	return
+//}
 
-	if ret2 != 0 {
-		return ""
-	}
-	return string(str)
+//func (c *HisApiController) GetSFZBaseInfo() string {
+//	DllDef := syscall.MustLoadDLL("SSCard.dll")
+//	readCard := DllDef.MustFindProc("ReadSFZ")
+//	if readCard == nil {
+//		fmt.Println("readcard is nil")
+//		readCard = DllDef.MustFindProc("ReadSFZ")
+//	}
+//
+//	str := make([]byte, 256)
+//	str1 := make([]byte, 256)
+//	r, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), IntPtr(1024), (uintptr)(unsafe.Pointer(&str1[0])), IntPtr(1024))
+//
+//	fmt.Println(r)
+//	return string(str)
+//}
 
-}
+//func (c *HisApiController) GetBasBaseInfo() string {
+//	DllDef := syscall.MustLoadDLL("SSCard.dll")
+//	readCard := DllDef.MustFindProc("ReadCardBas")
+//	if readCard == nil {
+//		fmt.Println("readcard is nil")
+//		readCard = DllDef.MustFindProc("ReadCardBas")
+//	}
+//
+//	str := make([]byte, 1024)
+//	str1 := make([]byte, 1024)
+//	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
+//
+//	fmt.Println(string(str1))
+//	fmt.Println(string(str))
+//
+//	if ret2 != 0 {
+//		return ""
+//	}
+//	return string(str)
+//
+//}
 
 func prttostr(vcode uintptr) string {
 	var vbyte []byte
@@ -1082,16 +1082,16 @@ func (c *HisApiController) GetHisPatientInfo() {
 //	return string(str), nil
 //}
 
-func CardInit() int {
-	DllTestDef := syscall.MustLoadDLL("SSCard.dll")
-	add := DllTestDef.MustFindProc("Init")
-	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
-	if err != nil {
-		fmt.Println("SSCard的运算结果为:", ret)
-	}
-	result := int(ret)
-	return result
-}
+//func CardInit() int {
+//	DllTestDef := syscall.MustLoadDLL("SSCard.dll")
+//	add := DllTestDef.MustFindProc("Init")
+//	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
+//	if err != nil {
+//		fmt.Println("SSCard的运算结果为:", ret)
+//	}
+//	result := int(ret)
+//	return result
+//}
 
 //func CardInit() int {
 //	ret, _, err := add.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
@@ -1593,13 +1593,13 @@ type Result90991 struct {
 	InfRefmsgid string `json:"inf_refmsgid"`
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
-		Baseinfo struct {
+		Result struct {
 			PsnNo     string `json:"psn_no"`
 			CardStat  string `json:"card_stat"`
 			Certno    string `json:"certno"`
 			PsnName   string `json:"psn_name"`
 			CheckStat string `json:"check_stat"`
-		} `json:"baseinfo"`
+		} `json:"result"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
@@ -2162,7 +2162,7 @@ func (c *HisApiController) GetUploadInfo() {
 						SettleAccountsDate:    recordDateTime,
 						Ctime:                 time.Now().Unix(),
 						Mtime:                 time.Now().Unix(),
-						Status:                1,
+						Status:                0,
 						Number:                chrg_bchno,
 						Infcode:               res.Infcode,
 						WarnMsg:               res.WarnMsg,
@@ -2365,6 +2365,7 @@ func (c *HisApiController) GetUploadInfo() {
 						} else {
 							order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
 							order.OrderStatus = 2
+							order.Status = 1
 							order.MdtrtId = res.Output.Setlinfo.MdtrtID
 							order.SetlId = res.Output.Setlinfo.SetlID
 							order.PsnNo = res.Output.Setlinfo.PsnNo
@@ -3342,7 +3343,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 					SettleAccountsDate:  recordDateTime,
 					Ctime:               time.Now().Unix(),
 					Mtime:               time.Now().Unix(),
-					Status:              1,
+					Status:              0,
 					Number:              chrg_bchno,
 					Infcode:             res.Infcode,
 					WarnMsg:             res.WarnMsg,
@@ -3536,6 +3537,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
 						order.OrderStatus = 1
 						order.IsPre = 1
+						order.Status = 1
 						order.MdtrtId = res.Output.Setlinfo.MdtrtID
 						order.SetlId = res.Output.Setlinfo.SetlID
 						order.PsnNo = res.Output.Setlinfo.PsnNo
@@ -4032,7 +4034,7 @@ func (c *HisApiController) RefundDetail() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	his, _ := service.GetNewVMHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)

service/his_service.go

@@ -477,8 +477,8 @@ func GetVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (inf
 	return
 }
 
-func GetNewVMHisPatientInfo(org_id int64, patient_id int64, record_date int64) (info models.VMHisPatient, err error) {
-	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, patient_id).First(&info).Error
+func GetNewVMHisPatientInfo(org_id int64, his_patient_id int64, record_date int64) (info models.VMHisPatient, err error) {
+	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND id = ?", org_id, record_date, his_patient_id).First(&info).Error
 	return
 }
 
@@ -710,7 +710,7 @@ func GetMedicalInsuranceConfig(org_id int64) (medicalInsuranceConfig models.Medi
 }
 
 func UpdataOrderStatus(id int64, number string, user_org_id int64, log string, result string) (err error) {
-	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "refund_request_log": log, "refund_log": result}).Error
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "refund_request_log": log, "refund_log": result, "status": 0}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 	return