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

controllers/sg/his_api_controller.go

@@ -3643,6 +3643,7 @@ func (c *HisApiController) GetUploadDiag() {
 }
 
 type QueryResult struct {
+	ID             int64
 	Name           string
 	Code           string
 	List_type_code string
@@ -3663,6 +3664,7 @@ func (c *HisApiController) GetCheckCode() {
 		drugs, _ := service.GetBatchDrugList(ids)
 		for _, item := range drugs {
 			result := QueryResult{
+				ID:             item.ID,
 				Name:           item.DrugName,
 				Code:           item.MedicalInsuranceNumber,
 				List_type_code: item.MedicalInsuranceNumber,
@@ -3675,6 +3677,7 @@ func (c *HisApiController) GetCheckCode() {
 
 		for _, item := range goods {
 			result := QueryResult{
+				ID:             item.ID,
 				Name:           item.GoodName,
 				Code:           item.MedicalInsuranceNumber,
 				List_type_code: item.MedicalInsuranceNumber,
@@ -3685,6 +3688,7 @@ func (c *HisApiController) GetCheckCode() {
 		projects, _ := service.GetBathchMyPorjecgList(ids)
 		for _, item := range projects {
 			result := QueryResult{
+				ID:             item.ID,
 				Name:           item.ProjectName,
 				Code:           item.MedicalCode,
 				List_type_code: item.MedicalCode,
@@ -3724,6 +3728,33 @@ func (c *HisApiController) GetCheckCode() {
 			} else {
 				fmt.Println(err)
 			}
+
+			userJSONBytes, _ := json.Marshal(dat)
+			var res ResultSix
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == 0 {
+				if record_type == 1 {
+					service.UpdateBaseDrugById(item.ID)
+				} else if record_type == 2 {
+					service.UpdateGoodInformaitonByDetail(item.ID)
+				} else if record_type == 3 {
+					service.UpdateProjectById(item.ID)
+				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": 0,
+					"msg":         "目录对照成功",
+				})
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
+
+			}
 		}
 	}
 }
@@ -3742,6 +3773,7 @@ func (c *HisApiController) UnCheckCode() {
 		drugs, _ := service.GetBatchDrugList(ids)
 		for _, item := range drugs {
 			result := QueryResult{
+				ID:             item.ID,
 				Name:           item.DrugName,
 				Code:           item.MedicalInsuranceNumber,
 				List_type_code: item.MedicalInsuranceNumber,
@@ -3754,6 +3786,7 @@ func (c *HisApiController) UnCheckCode() {
 
 		for _, item := range goods {
 			result := QueryResult{
+				ID:             item.ID,
 				Name:           item.GoodName,
 				Code:           item.MedicalInsuranceNumber,
 				List_type_code: item.MedicalInsuranceNumber,
@@ -3764,6 +3797,7 @@ func (c *HisApiController) UnCheckCode() {
 		projects, _ := service.GetBathchMyPorjecgList(ids)
 		for _, item := range projects {
 			result := QueryResult{
+				ID:             item.ID,
 				Name:           item.ProjectName,
 				Code:           item.MedicalCode,
 				List_type_code: item.MedicalCode,
@@ -3798,16 +3832,41 @@ func (c *HisApiController) UnCheckCode() {
 		for _, item := range queryResult {
 
 			result := service.Gdyb3302(baseParams, item.Name, item.Code, item.List_type_code)
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
+			var dat2 map[string]interface{}
+			if err := json.Unmarshal([]byte(result), &dat2); err == nil {
+				fmt.Println(dat2)
 			} else {
 				fmt.Println(err)
 			}
-		}
 
-	}
+			userJSONBytes, _ := json.Marshal(dat2)
+			var res ResultSix
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			if res.Infcode == 0 {
+				if record_type == 1 {
+					service.UpdateDrugByIdDetail(item.ID)
+				} else if record_type == 2 {
+					service.UpdateGoodInfoById(item.ID)
 
+				} else if record_type == 3 {
+					service.UpdateMyProjectById(item.ID)
+				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": 0,
+					"msg":         "撤销目录对照成功",
+				})
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
+			}
+		}
+	}
 }
 func (c *HisApiController) GetPatientInfo() {
 	id_card_no := c.GetString("id_card_no")

service/gdyb_service.go

@@ -1699,7 +1699,7 @@ func Gdyb2503(psnNo string, insutype string, org_name string, doctor string, fix
 	inputData["begndate"] = timeFormatTwo          // 医师编码
 	inputData["tel"] = ""                          // 医师编码
 	inputData["addr"] = ""                         // 医师编码
-	inputData["enddate"] = ""                      // 医师编码
+	inputData["enddate"] = "2099-12-31"            // 医师编码
 
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入