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

controllers/sg/his_api_controller.go

@@ -2007,6 +2007,34 @@ func (c *HisApiController) GetUploadInfo() {
 	var start_time int64
 	var end_time int64
 
+	//if adminUser.CurrentOrgId == 10106{
+	//	if len(fapiao_code) == 0{
+	//		fapiao_code = "144072080589"
+	//	}
+	//	if len(fapiao_number) == 0{
+	//		order, _ := service.GetLastHisOrder(adminUser.CurrentOrgId)
+	//		if order.ID == 0{
+	//			fapiao_number = "00001520"
+	//		}else{
+	//			//fapiao_code = "00001520"
+	//			fpNumber, _ := strconv.Atoi(order.FaPiaoNumber)
+	//			var zero string
+	//			if fpNumber >= 1000{
+	//				zero = "0000" + strconv.Itoa(fpNumber)
+	//			}else if fpNumber >= 10000{
+	//				zero = "000" + strconv.Itoa(fpNumber)
+	//			} else if fpNumber >= 100000{
+	//				zero = "00" + strconv.Itoa(fpNumber)
+	//			} else if fpNumber >= 1000000{
+	//				zero = "0" + strconv.Itoa(fpNumber)
+	//			}else {
+	//				zero =  strconv.Itoa(fpNumber)
+	//			}
+	//			fapiao_number = zero
+	//		}
+	//	}
+	//}
+
 	data := make(map[string]interface{})
 	if settle_accounts_type == 1 { //日结
 		prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
@@ -2336,6 +2364,7 @@ func (c *HisApiController) GetUploadInfo() {
 					order.HifesPay = res.Output.Setlinfo.HifesPay
 					order.HifobPay = res.Output.Setlinfo.HifobPay
 					order.MafPay = res.Output.Setlinfo.MafPay
+					order.HifmiPay = res.Output.Setlinfo.HifmiPay
 					order.OthPay = res.Output.Setlinfo.OthPay
 					order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
 					order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt

service/gdyb_service.go

@@ -234,17 +234,17 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-	tempTime := time.Unix(timestamp, 0)
-	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	//tempTime := time.Unix(timestamp, 0)
+	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2201"        // 交易编码
-	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["insutype"] = insutype      // 险种类型（来自1101接口返回）
-	inputData["begntime"] = timeFormatOne // 开始时间
+	inputMessage["infno"] = "2201"                // 交易编码
+	inputData["psn_no"] = psnNo                   // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype              // 险种类型（来自1101接口返回）
+	inputData["begntime"] = "2021-03-28 12:20:30" // 开始时间
 
 	//if id_card_type == 1 {
 	//	inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型

service/his_service.go

@@ -1193,3 +1193,8 @@ func GetDeviceNumberByID(bed_id int64, org_id int64) (device_number models.Devic
 func UpdateHisPatientStatus(his *models.VMHisPatient) {
 	writeDb.Save(&his)
 }
+
+func GetLastHisOrder(org_id int64) (his models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2", org_id).Last(&his).Error
+	return
+}