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

controllers/sg/his_api_controller.go

@@ -4076,9 +4076,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 	sickConfig, _ := service.FindSickById(sick_type)
 
-	if tempOrder.ID == 0 {
-		tempOrder, _ = service.GetTodayHisOrder(adminUser.CurrentOrgId, id, recordDateTime, his.Number)
-	}
+	//if tempOrder.ID == 0 {
+	//	tempOrder, _ = service.GetTodayHisOrder(adminUser.CurrentOrgId, id, recordDateTime, his.Number)
+	//}
 
 	if tempOrder.ID == 0 {
 		var result string

service/gdyb_service.go

@@ -2128,6 +2128,7 @@ func Gdyb2001(baseParams models.BaseParams, psn_no string, insutype string, med_
 	inputMessage["infno"] = "2001" // 交易编码
 	inputData["psn_no"] = psn_no
 	inputData["insutype"] = insutype
+	inputData["fixmedins_code"] = baseParams.FixmedinsCode
 	inputData["med_type"] = med_type
 	inputData["begntime"] = "2021-01-01 00:00:00"
 	input["data"] = inputData